diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9eb09dc4..c83e7954 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,12 @@
+
+
(R.layout.activity_main) {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(binding.root)
- moveToPage()
- }
-
- private fun moveToPage() {
- binding.btnOnBoarding.setOnClickListener {
- startActivity()
- }
- }
-}
diff --git a/app/src/main/java/sopt/uni/presentation/SplashActivity.kt b/app/src/main/java/sopt/uni/presentation/SplashActivity.kt
index e8ad64db..fc007117 100644
--- a/app/src/main/java/sopt/uni/presentation/SplashActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/SplashActivity.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import sopt.uni.R
import sopt.uni.databinding.ActivitySplashBinding
+import sopt.uni.presentation.home.HomeActivity
import sopt.uni.util.binding.BindingActivity
import sopt.uni.util.extension.startActivity
@@ -18,7 +19,7 @@ class SplashActivity : BindingActivity(R.layout.activity_
lifecycleScope.launch {
delay(2000)
- startActivity()
+ startActivity()
overridePendingTransition(0, 0)
finish()
}
diff --git a/app/src/main/java/sopt/uni/presentation/home/HomeActivity.kt b/app/src/main/java/sopt/uni/presentation/home/HomeActivity.kt
new file mode 100644
index 00000000..d6f2be90
--- /dev/null
+++ b/app/src/main/java/sopt/uni/presentation/home/HomeActivity.kt
@@ -0,0 +1,43 @@
+package sopt.uni.presentation.home
+
+import android.os.Bundle
+import dagger.hilt.android.AndroidEntryPoint
+import sopt.uni.R
+import sopt.uni.databinding.ActivityHomeBinding
+import sopt.uni.presentation.HistoryMainActivity
+import sopt.uni.presentation.shortgame.CreateShortGameActivity
+import sopt.uni.presentation.wish.WishActivity
+import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.startActivity
+
+@AndroidEntryPoint
+class HomeActivity : BindingActivity(R.layout.activity_home) {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(binding.root)
+
+ moveToHistory()
+ moveToShortGame()
+ moveToWish()
+ }
+
+ private fun moveToShortGame() {
+ binding.clShortGame.setOnSingleClickListener {
+ startActivity()
+ finish()
+ }
+ }
+
+ private fun moveToWish() {
+ binding.clWishBanner.setOnSingleClickListener {
+ startActivity()
+ }
+ }
+
+ private fun moveToHistory() {
+ binding.llGameHistory.setOnSingleClickListener {
+ startActivity()
+ }
+ }
+}
diff --git a/app/src/main/java/sopt/uni/presentation/invite/DdayActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/DdayActivity.kt
index ef494059..a8feec38 100644
--- a/app/src/main/java/sopt/uni/presentation/invite/DdayActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/invite/DdayActivity.kt
@@ -5,11 +5,28 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.databinding.ActivityDDayBinding
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.startActivity
@AndroidEntryPoint
class DdayActivity : BindingActivity(R.layout.activity_d_day) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
+
+ moveToShareInviteCode()
+ moveToPrevPage()
+ }
+
+ private fun moveToShareInviteCode() {
+ binding.btnNext.setOnSingleClickListener {
+ startActivity()
+ }
+ }
+
+ private fun moveToPrevPage() {
+ binding.ivBackArrow.setOnSingleClickListener {
+ finish()
+ }
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/invite/EnterInviteCodeActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/EnterInviteCodeActivity.kt
index e8954f62..c47e021d 100644
--- a/app/src/main/java/sopt/uni/presentation/invite/EnterInviteCodeActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/invite/EnterInviteCodeActivity.kt
@@ -5,6 +5,7 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.databinding.ActivityEnterInviteCodeBinding
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
@AndroidEntryPoint
class EnterInviteCodeActivity :
@@ -12,5 +13,13 @@ class EnterInviteCodeActivity :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
+
+ moveToPrevPage()
+ }
+
+ private fun moveToPrevPage() {
+ binding.ivBackArrow.setOnSingleClickListener {
+ finish()
+ }
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/invite/InviteHubActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/InviteHubActivity.kt
index 6e89d190..5901423b 100644
--- a/app/src/main/java/sopt/uni/presentation/invite/InviteHubActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/invite/InviteHubActivity.kt
@@ -5,11 +5,35 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.databinding.ActivityInviteHubBinding
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.startActivity
@AndroidEntryPoint
class InviteHubActivity : BindingActivity(R.layout.activity_invite_hub) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
+
+ moveToEnterDday()
+ moveToEnterInviteCode()
+ moveToPrevPage()
+ }
+
+ private fun moveToEnterDday() {
+ binding.btnSendInviteCod.setOnSingleClickListener() {
+ startActivity()
+ }
+ }
+
+ private fun moveToEnterInviteCode() {
+ binding.btnEnterInviteCode.setOnSingleClickListener() {
+ startActivity()
+ }
+ }
+
+ private fun moveToPrevPage() {
+ binding.ivBackArrow.setOnSingleClickListener {
+ finish()
+ }
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt
index 1969d9a5..6d6625ee 100644
--- a/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt
@@ -5,11 +5,28 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.databinding.ActivityNicknameBinding
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.startActivity
@AndroidEntryPoint
class NickNameActivity : BindingActivity(R.layout.activity_nickname) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
+
+ moveToInviteHub()
+ moveToPrevPage()
+ }
+
+ private fun moveToInviteHub() {
+ binding.btnNext.setOnSingleClickListener() {
+ startActivity()
+ }
+ }
+
+ private fun moveToPrevPage() {
+ binding.ivBackArrow.setOnSingleClickListener {
+ finish()
+ }
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/invite/ShareInviteCodeActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/ShareInviteCodeActivity.kt
index 3c875c5f..85147884 100644
--- a/app/src/main/java/sopt/uni/presentation/invite/ShareInviteCodeActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/invite/ShareInviteCodeActivity.kt
@@ -5,6 +5,7 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.databinding.ActivityShareInviteCodeBinding
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
@AndroidEntryPoint
class ShareInviteCodeActivity :
@@ -12,5 +13,13 @@ class ShareInviteCodeActivity :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
+
+ moveToPrevPage()
+ }
+
+ private fun moveToPrevPage() {
+ binding.ivBackArrow.setOnSingleClickListener {
+ finish()
+ }
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/onboarding/OnBoardingActivity.kt b/app/src/main/java/sopt/uni/presentation/onboarding/OnBoardingActivity.kt
index 8895e4ce..722b8ca8 100644
--- a/app/src/main/java/sopt/uni/presentation/onboarding/OnBoardingActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/onboarding/OnBoardingActivity.kt
@@ -6,7 +6,10 @@ import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.R
import sopt.uni.data.entity.onboarding.onBoardingList
import sopt.uni.databinding.ActivityOnBoardingBinding
+import sopt.uni.presentation.login.LoginActivity
import sopt.uni.util.binding.BindingActivity
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.startActivity
@AndroidEntryPoint
class OnBoardingActivity :
@@ -17,6 +20,7 @@ class OnBoardingActivity :
setAdaptor()
changeSkipText()
+ moveToLogin()
}
private fun setAdaptor() {
@@ -42,4 +46,10 @@ class OnBoardingActivity :
},
)
}
+
+ private fun moveToLogin() {
+ binding.tvSkip.setOnSingleClickListener {
+ startActivity()
+ }
+ }
}
diff --git a/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt b/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
index dd1cce5f..bcdd2f80 100644
--- a/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
@@ -1,17 +1,15 @@
package sopt.uni.presentation.wish
import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import sopt.uni.R
import sopt.uni.databinding.ActivityWishBinding
+import sopt.uni.util.binding.BindingActivity
-class WishActivity : AppCompatActivity() {
- lateinit var binding: ActivityWishBinding
+class WishActivity : BindingActivity(R.layout.activity_wish) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = ActivityWishBinding.inflate(layoutInflater)
setContentView(binding.root)
val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_wish)
diff --git a/app/src/main/res/drawable/bg_heart_btn.xml b/app/src/main/res/drawable/bg_heart_btn.xml
new file mode 100644
index 00000000..6226dd4c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_heart_btn.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_home_banner.xml b/app/src/main/res/drawable/bg_home_banner.xml
new file mode 100644
index 00000000..b66db1d7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_home_banner.xml
@@ -0,0 +1,11 @@
+
+
+ -
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/bg_home_d_day.xml b/app/src/main/res/drawable/bg_home_d_day.xml
new file mode 100644
index 00000000..e78b0022
--- /dev/null
+++ b/app/src/main/res/drawable/bg_home_d_day.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_home_score_board.xml b/app/src/main/res/drawable/bg_home_score_board.xml
new file mode 100644
index 00000000..b63ba7d2
--- /dev/null
+++ b/app/src/main/res/drawable/bg_home_score_board.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_profile.xml b/app/src/main/res/drawable/bg_profile.xml
new file mode 100644
index 00000000..656a1673
--- /dev/null
+++ b/app/src/main/res/drawable/bg_profile.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_heart_empty.xml b/app/src/main/res/drawable/ic_heart_empty.xml
new file mode 100644
index 00000000..c0a37020
--- /dev/null
+++ b/app/src/main/res/drawable/ic_heart_empty.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_heart_filled.xml b/app/src/main/res/drawable/ic_heart_filled.xml
new file mode 100644
index 00000000..2fc75673
--- /dev/null
+++ b/app/src/main/res/drawable/ic_heart_filled.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
index e8713e9c..858f60ed 100644
--- a/app/src/main/res/drawable/ic_person.xml
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -1,9 +1,9 @@
+ android:width="17dp"
+ android:height="20dp"
+ android:viewportWidth="17"
+ android:viewportHeight="20">
+ android:pathData="M13.754,12C14.996,12 16.003,13.007 16.003,14.249V14.824C16.003,15.719 15.684,16.583 15.102,17.263C13.533,19.096 11.145,20.001 8,20.001C4.854,20.001 2.468,19.096 0.902,17.262C0.322,16.583 0.004,15.719 0.004,14.826V14.249C0.004,13.007 1.01,12 2.252,12H13.754ZM13.754,13.5H2.252C1.839,13.5 1.504,13.835 1.504,14.249V14.826C1.504,15.362 1.695,15.88 2.043,16.288C3.296,17.755 5.262,18.501 8,18.501C10.738,18.501 12.706,17.755 13.962,16.287C14.311,15.88 14.503,15.361 14.503,14.824V14.249C14.503,13.835 14.168,13.5 13.754,13.5ZM8,0.005C10.761,0.005 13,2.243 13,5.005C13,7.766 10.761,10.005 8,10.005C5.239,10.005 3,7.766 3,5.005C3,2.243 5.239,0.005 8,0.005ZM8,1.505C6.067,1.505 4.5,3.072 4.5,5.005C4.5,6.938 6.067,8.505 8,8.505C9.933,8.505 11.5,6.938 11.5,5.005C11.5,3.072 9.933,1.505 8,1.505Z"
+ android:fillColor="#ffffff"/>
diff --git a/app/src/main/res/drawable/ic_sparkle_home.xml b/app/src/main/res/drawable/ic_sparkle_home.xml
new file mode 100644
index 00000000..8e72fcfd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sparkle_home.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/score_board.png b/app/src/main/res/drawable/score_board.png
new file mode 100644
index 00000000..3bc44086
Binary files /dev/null and b/app/src/main/res/drawable/score_board.png differ
diff --git a/app/src/main/res/drawable/temp_imagecard.png b/app/src/main/res/drawable/temp_imagecard.png
new file mode 100644
index 00000000..84c7ce6d
Binary files /dev/null and b/app/src/main/res/drawable/temp_imagecard.png differ
diff --git a/app/src/main/res/layout/activity_d_day.xml b/app/src/main/res/layout/activity_d_day.xml
index d2a56c5e..df2432da 100644
--- a/app/src/main/res/layout/activity_d_day.xml
+++ b/app/src/main/res/layout/activity_d_day.xml
@@ -21,16 +21,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_d_day_description" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_invite_hub.xml b/app/src/main/res/layout/activity_invite_hub.xml
index d2127296..cb6438c8 100644
--- a/app/src/main/res/layout/activity_invite_hub.xml
+++ b/app/src/main/res/layout/activity_invite_hub.xml
@@ -11,6 +11,16 @@
android:layout_height="match_parent"
android:background="@color/white">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_nickname.xml b/app/src/main/res/layout/activity_nickname.xml
index b261ce54..1d09a23c 100644
--- a/app/src/main/res/layout/activity_nickname.xml
+++ b/app/src/main/res/layout/activity_nickname.xml
@@ -22,17 +22,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
+
+
+
+
+
+ android:layout_height="match_parent"
+ android:background="@color/Gray_100">
-
+ app:layout_constraintTop_toBottomOf="parent">
-
+
-
+
-
+
+ android:layout_height="match_parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/cl_wish_title">
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..2011bcc8
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 158dp
+ 49dp
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 328353c4..264e79d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,19 @@
카카오 로그인
Google계정으로 로그인
+ 000-000-000
+ user profile
+ 커플 스코어
+ 승부 히스토리
+ go to history
+ D+100
+ 무
+ 패
+ 승
+ 승부하기
+ 승부를 겨루고 소원권을 얻어보세요
+ heart
+ 한판 승부
취소
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9230eb56..757238a2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-
+
+
\ No newline at end of file