U-is-Ni-in-Korea · taeheeL · Jul 15, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,12 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".presentation.home.HomeActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.UNIAOS.LightBlueStatusBar" />
+
         <activity
             android:name=".presentation.login.LoginActivity"
             android:exported="true"

diff --git a/app/src/main/java/sopt/uni/presentation/HistoryMainActivity.kt b/app/src/main/java/sopt/uni/presentation/HistoryMainActivity.kt
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import sopt.uni.R
 import sopt.uni.data.entity.history.HistoryList
 import sopt.uni.databinding.ActivityMainHistoryBinding
+import sopt.uni.presentation.home.HomeActivity
 import sopt.uni.util.binding.BindingActivity
 
 class HistoryMainActivity :
@@ -50,7 +51,7 @@ class HistoryMainActivity :
         binding.rvHistoryList.addItemDecoration(dividerItemDecoration)
 
         binding.historyMainBack.setOnClickListener {
-            val intent = Intent(this, MainActivity::class.java)
+            val intent = Intent(this, HomeActivity::class.java)
             startActivity(intent)
             finish()
         }

diff --git a/app/src/main/java/sopt/uni/presentation/MainActivity.kt b/app/src/main/java/sopt/uni/presentation/MainActivity.kt
diff --git 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<ActivitySplashBinding>(R.layout.activity_
 
         lifecycleScope.launch {
             delay(2000)
-            startActivity<MainActivity>()
+            startActivity<HomeActivity>()
             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
@@ -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<ActivityHomeBinding>(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<CreateShortGameActivity>()
+            finish()
+        }
+    }
+
+    private fun moveToWish() {
+        binding.clWishBanner.setOnSingleClickListener {
+            startActivity<WishActivity>()
+        }
+    }
+
+    private fun moveToHistory() {
+        binding.llGameHistory.setOnSingleClickListener {
+            startActivity<HistoryMainActivity>()
+        }
+    }
+}
diff --git 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<ActivityDDayBinding>(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<ShareInviteCodeActivity>()
+        }
+    }
+
+    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
@@ -5,12 +5,21 @@ 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 :
     BindingActivity<ActivityEnterInviteCodeBinding>(R.layout.activity_enter_invite_code) {
     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
@@ -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<ActivityInviteHubBinding>(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<DdayActivity>()
+        }
+    }
+
+    private fun moveToEnterInviteCode() {
+        binding.btnEnterInviteCode.setOnSingleClickListener() {
+            startActivity<EnterInviteCodeActivity>()
+        }
+    }
+
+    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
@@ -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<ActivityNicknameBinding>(R.layout.activity_nickname) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+
+        moveToInviteHub()
+        moveToPrevPage()
+    }
+
+    private fun moveToInviteHub() {
+        binding.btnNext.setOnSingleClickListener() {
+            startActivity<InviteHubActivity>()
+        }
+    }
+
+    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
@@ -5,12 +5,21 @@ 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 :
     BindingActivity<ActivityShareInviteCodeBinding>(R.layout.activity_share_invite_code) {
     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
@@ -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<LoginActivity>()
+        }
+    }
 }
diff --git 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<ActivityWishBinding>(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
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp" />
+    <solid android:color="@color/Gray_000" />
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_home_banner.xml b/app/src/main/res/drawable/bg_home_banner.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/Lightblue_50">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="20dp" />
+            <solid android:color="@color/Gray_000" />
+
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_home_d_day.xml b/app/src/main/res/drawable/bg_home_d_day.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="@color/Lightblue_500" />
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_home_score_board.xml b/app/src/main/res/drawable/bg_home_score_board.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="@color/Gray_000" />
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_profile.xml b/app/src/main/res/drawable/bg_profile.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <solid android:color="#40FFFFFF" />
+    <padding
+        android:bottom="6dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="6dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/ic_heart_empty.xml b/app/src/main/res/drawable/ic_heart_empty.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10.497,16.803L16.741,10.499C18.425,8.789 18.42,6.025 16.724,4.312C15.061,2.633 12.396,2.589 10.698,4.191C10.661,4.225 10.625,4.261 10.589,4.297L9.993,4.9L9.388,4.29C9.355,4.256 9.322,4.223 9.288,4.191C7.586,2.577 4.917,2.602 3.261,4.274C1.573,5.979 1.581,8.75 3.277,10.463L9.554,16.803C9.814,17.066 10.236,17.066 10.497,16.803ZM11.3,5C12.596,3.691 14.703,3.692 16.013,5.016C17.325,6.341 17.327,8.477 16.029,9.797L16.028,9.798L10.025,15.858L3.987,9.759C2.674,8.433 2.673,6.29 3.972,4.977C5.265,3.671 7.37,3.672 8.678,4.993L9.638,5.963C9.834,6.161 10.153,6.161 10.349,5.963L11.3,5Z"
+      android:fillColor="#E892B6"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_heart_filled.xml b/app/src/main/res/drawable/ic_heart_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M9.388,4.29C7.693,2.577 4.95,2.569 3.261,4.274C1.573,5.979 1.581,8.75 3.277,10.463L9.554,16.803C9.814,17.066 10.236,17.066 10.497,16.803L16.741,10.499C18.425,8.789 18.42,6.025 16.724,4.312C15.025,2.597 12.281,2.588 10.589,4.297L9.993,4.9L9.388,4.29Z"
+      android:fillColor="#E892B6"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="17dp"
+    android:height="20dp"
+    android:viewportWidth="17"
+    android:viewportHeight="20">
   <path
-      android:pathData="M17.754,14C18.996,14 20.003,15.007 20.003,16.249V16.824C20.003,17.719 19.684,18.583 19.102,19.263C17.533,21.096 15.145,22.001 12,22.001C8.854,22.001 6.468,21.096 4.902,19.262C4.322,18.583 4.004,17.719 4.004,16.826V16.249C4.004,15.007 5.01,14 6.252,14H17.754ZM17.754,15.5H6.252C5.839,15.5 5.504,15.835 5.504,16.249V16.826C5.504,17.362 5.695,17.88 6.043,18.288C7.296,19.755 9.262,20.501 12,20.501C14.738,20.501 16.706,19.755 17.962,18.287C18.311,17.88 18.503,17.361 18.503,16.824V16.249C18.503,15.835 18.168,15.5 17.754,15.5ZM12,2.005C14.761,2.005 17,4.243 17,7.005C17,9.766 14.761,12.005 12,12.005C9.239,12.005 7,9.766 7,7.005C7,4.243 9.239,2.005 12,2.005ZM12,3.505C10.067,3.505 8.5,5.072 8.5,7.005C8.5,8.938 10.067,10.505 12,10.505C13.933,10.505 15.5,8.938 15.5,7.005C15.5,5.072 13.933,3.505 12,3.505Z"
-      android:fillColor="#222222"/>
+      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"/>
 </vector>