Merge branch 'D83T-67' into main

presentation/src/main/java/com/d83t/bpm/presentation/ui/sign_up/SignUpActivity.kt

@@ -79,10 +79,9 @@ class SignUpActivity : BaseComponentActivity() {
     }
 
     override fun initUi() {
+        nicknameTextState.value = viewModel.kakaoUserInfo.second
         setContent {
             BPMTheme {
-                nicknameTextState.value = viewModel.kakaoUserInfo.second
-
                 SignUpActivityContent(
                     imageState = imageState,
                     nicknameTextState = nicknameTextState,

presentation/src/main/java/com/d83t/bpm/presentation/ui/splash/SplashActivity.kt

@@ -107,14 +107,14 @@ class SplashActivity : BaseComponentActivity() {
             kakaoLoginInstance.loginWithKakaoTalk(this) { loginInfo, error ->
                 if (error != null) {
                     // 로그인 실패
-                    showDebugToast("login failed! cause : ${error.message}")
+//                    showDebugToast("login failed! cause : ${error.message}")
                     showToast("로그인에 실패하였습니다. 다시 시도해 주세요.")
                 } else if (loginInfo != null) {
                     // 로그인 성공
                     kakaoLoginInstance.me { user, error ->
                         viewModel.setKakaoUserId(user?.id ?: 0L, user?.kakaoAccount?.profile?.nickname ?: "")
 //                        user?.id?.let { viewModel.setKakaoUserId(it) }
-                        showDebugToast("login succeed. user token : ${user?.id}")
+//                        showDebugToast("login succeed. user token : ${user?.id}")
                     }
                 }
             }

presentation/src/main/res/layout/fragment_home.xml

@@ -54,8 +54,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
-                        android:onClick="@{() -> vm.clickSchedule()}"
                         android:foreground="?android:attr/selectableItemBackground"
+                        android:onClick="@{() -> vm.clickSchedule()}"
                         app:cardBackgroundColor="@color/gray_02"
                         app:cardCornerRadius="12dp"
                         app:cardElevation="0dp"
@@ -262,8 +262,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:layout_marginEnd="100dp"
-                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintEnd_toStartOf="@id/guide_tab"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:tabIndicatorColor="@color/black"
@@ -286,9 +285,9 @@
                         android:layout_width="0dp"
                         android:layout_height="1dp"
                         android:background="@color/gray_10"
-                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/tab"/>
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tab" />
 
                     <androidx.viewpager2.widget.ViewPager2
                         android:id="@+id/pager"
@@ -301,6 +300,13 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tab" />
 
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/guide_tab"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_percent="0.8" />
+
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.constraintlayout.widget.ConstraintLayout>

presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

presentation/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>