Merge branch 'develop' into refactor/#98-redesign_write_routine

# Conflicts:
#	presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

Author: l5x5l

app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Theme.Bitnagil">
             <intent-filter>

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -8,14 +8,17 @@ import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import com.threegap.bitnagil.navigation.home.HomeNavHost
 import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer
+import com.threegap.bitnagil.presentation.guide.GuideScreenContainer
 import com.threegap.bitnagil.presentation.login.LoginScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
 import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
+import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
 import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
+import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer
 import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer
 import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel
 import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg
@@ -111,15 +114,24 @@ fun MainNavHost(
                         ),
                     )
                 },
+                navigateToGuide = {
+                    navigator.navController.navigate(Route.Guide) {
+                        launchSingleTop = true
+                    }
+                },
                 navigateToRegisterRoutine = { routineId ->
                     navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))
                 },
-                navigateToEditRoutine = { routineId ->
-                    navigator.navController.navigate(Route.WriteRoutine(routineId = routineId, isRegister = false))
-                },
                 navigateToEmotion = {
                     navigator.navController.navigate(Route.Emotion)
                 },
+                navigateToRoutineList = { selectedDate ->
+                    navigator.navController.navigate(
+                        Route.RoutineList(selectedDate = selectedDate),
+                    ) {
+                        launchSingleTop = true
+                    }
+                },
             )
         }
 
@@ -166,6 +178,9 @@ fun MainNavHost(
                         }
                     }
                 },
+                navigateToWithdrawal = {
+                    navigator.navController.navigate(Route.Withdrawal)
+                },
             )
         }
 
@@ -223,5 +238,42 @@ fun MainNavHost(
                 },
             )
         }
+
+        composable<Route.Withdrawal> {
+            WithdrawalScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+                navigateToLogin = {
+                    navigator.navController.navigate(Route.Login) {
+                        popUpTo(0) {
+                            inclusive = true
+                        }
+                    }
+                },
+            )
+        }
+
+        composable<Route.RoutineList> {
+            RoutineListScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+            )
+        }
+
+        composable<Route.Guide> {
+            GuideScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+            )
+        }
     }
 }

app/src/main/java/com/threegap/bitnagil/MainScreen.kt

@@ -1,11 +1,11 @@
 package com.threegap.bitnagil
 
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -18,7 +18,7 @@ fun MainScreen(
 ) {
     Scaffold(
         modifier = modifier.fillMaxSize(),
-        contentWindowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Bottom),
+        contentWindowInsets = WindowInsets.navigationBars.exclude(WindowInsets.ime),
         containerColor = BitnagilTheme.colors.white,
     ) { innerPadding ->
         MainNavHost(

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -39,4 +39,13 @@ sealed interface Route {
 
     @Serializable
     data object Emotion : Route
+
+    @Serializable
+    data object Withdrawal : Route
+
+    @Serializable
+    data class RoutineList(val selectedDate: String) : Route
+
+    @Serializable
+    data object Guide : Route
 }

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -30,27 +31,34 @@ fun HomeBottomNavigationBar(
 ) {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .background(color = BitnagilTheme.colors.white)
-            .height(62.dp)
-            .padding(horizontal = 16.dp, vertical = 7.dp),
-        horizontalArrangement = Arrangement.spacedBy(10.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        HomeRoute.entries.map { homeRoute ->
-            HomeBottomNavigationItem(
-                modifier = Modifier.weight(1f),
-                icon = homeRoute.icon,
-                title = homeRoute.title,
-                onClick = {
-                    navController.navigate(homeRoute.route) {
-                        popUpTo(0) { inclusive = true }
-                    }
-                },
-                selected = navBackStackEntry?.destination?.route == homeRoute.route,
-            )
+    Column {
+        HorizontalDivider(
+            modifier = Modifier.fillMaxWidth(),
+            thickness = 1.dp,
+            color = BitnagilTheme.colors.coolGray98,
+        )
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = BitnagilTheme.colors.white)
+                .height(62.dp)
+                .padding(horizontal = 16.dp, vertical = 7.dp),
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            HomeRoute.entries.map { homeRoute ->
+                HomeBottomNavigationItem(
+                    modifier = Modifier.weight(1f),
+                    icon = homeRoute.icon,
+                    title = homeRoute.title,
+                    onClick = {
+                        navController.navigate(homeRoute.route) {
+                            popUpTo(0) { inclusive = true }
+                        }
+                    },
+                    selected = navBackStackEntry?.destination?.route == homeRoute.route,
+                )
+            }
         }
     }
 }

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

@@ -39,9 +39,10 @@ fun HomeNavHost(
     navigateToOnBoarding: () -> Unit,
     navigateToNotice: () -> Unit,
     navigateToQnA: () -> Unit,
+    navigateToGuide: () -> Unit,
     navigateToRegisterRoutine: (String?) -> Unit,
-    navigateToEditRoutine: (String) -> Unit,
     navigateToEmotion: () -> Unit,
+    navigateToRoutineList: (String) -> Unit,
 ) {
     val navigator = rememberHomeNavigator()
     var showFloatingOverlay by remember { mutableStateOf(false) }
@@ -63,11 +64,14 @@ fun HomeNavHost(
                 ) {
                     composable(HomeRoute.Home.route) {
                         HomeScreenContainer(
+                            navigateToGuide = navigateToGuide,
                             navigateToRegisterRoutine = {
                                 navigateToRegisterRoutine(null)
                             },
-                            navigateToEditRoutine = navigateToEditRoutine,
                             navigateToEmotion = navigateToEmotion,
+                            navigateToRoutineList = { selectedDate ->
+                                navigateToRoutineList(selectedDate)
+                            },
                         )
                     }
 
@@ -102,11 +106,6 @@ fun HomeNavHost(
 
             BitnagilFloatingActionMenu(
                 actions = listOf(
-                    FloatingActionItem(
-                        icon = R.drawable.ic_report,
-                        text = "제보하기",
-                        onClick = { GlobalBitnagilToast.showWarning("제보하기 기능은 추후 제공될 예정입니다.") },
-                    ),
                     FloatingActionItem(
                         icon = R.drawable.ic_routine_add,
                         text = "루틴 등록",

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/color/BitnagilColors.kt

@@ -15,6 +15,7 @@ data class BitnagilColors(
     val purple10: Color = Purple10,
     val green10: Color = Green10,
     val pink10: Color = Pink10,
+    val yellow10: Color = Yellow10,
     val progressBarGradientStartColor: Color = ProgressBarGradientStartColor,
     val progressBarGradientEndColor: Color = ProgressBarGradientEndColor,
     val homeGradientStartColor: Color = HomeGradientStartColor,

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/color/Color.kt

@@ -11,6 +11,7 @@ val SkyBlue10 = Color(0xFFDBF1FF)
 val Purple10 = Color(0xFFE6E2FF)
 val Green10 = Color(0xFFE6F5C6)
 val Pink10 = Color(0xFFFEE3E9)
+val Yellow10 = Color(0xFFFFF5C7)
 val ProgressBarGradientStartColor = Color(0xFFA9CFFF)
 val ProgressBarGradientEndColor = Color(0xFFFFCDB3)
 val HomeGradientStartColor = Color(0xFFFFEADF)