[Feature/#97] 루틴 리스트 화면 구현

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

@@ -12,10 +12,12 @@ 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
@@ -114,9 +116,6 @@ fun MainNavHost(
                 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)
                 },
@@ -166,6 +165,9 @@ fun MainNavHost(
                         }
                     }
                 },
+                navigateToWithdrawal = {
+                    navigator.navController.navigate(Route.Withdrawal)
+                },
             )
         }
 
@@ -223,5 +225,32 @@ 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()
+                    }
+                },
+            )
+        }
     }
 }

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

@@ -38,4 +38,10 @@ sealed interface Route {
 
     @Serializable
     data object Emotion : Route
+
+    @Serializable
+    data object Withdrawal : Route
+
+    @Serializable
+    data object RoutineList : 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

@@ -40,7 +40,6 @@ fun HomeNavHost(
     navigateToNotice: () -> Unit,
     navigateToQnA: () -> Unit,
     navigateToRegisterRoutine: (String?) -> Unit,
-    navigateToEditRoutine: (String) -> Unit,
     navigateToEmotion: () -> Unit,
 ) {
     val navigator = rememberHomeNavigator()
@@ -66,7 +65,6 @@ fun HomeNavHost(
                             navigateToRegisterRoutine = {
                                 navigateToRegisterRoutine(null)
                             },
-                            navigateToEditRoutine = navigateToEditRoutine,
                             navigateToEmotion = navigateToEmotion,
                         )
                     }
@@ -102,11 +100,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)

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilFloatingButton.kt

@@ -10,7 +10,6 @@ import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -22,13 +21,12 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.threegap.bitnagil.designsystem.BitnagilTheme
@@ -40,22 +38,22 @@ fun BitnagilFloatingButton(
     @DrawableRes id: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    isActive: Boolean = false,
+    colors: BitnagilFloatingButtonColor = BitnagilFloatingButtonColor.default(),
 ) {
     Box(
         contentAlignment = Alignment.Center,
         modifier = modifier
             .background(
-                color = BitnagilTheme.colors.navy500,
+                color = if (isActive) colors.activeIconBackgroundColor else colors.defaultIconBackgroundColor,
                 shape = CircleShape,
             )
             .size(52.dp)
             .clickableWithoutRipple { onClick() },
     ) {
-        Image(
-            imageVector = ImageVector.vectorResource(id),
-            contentDescription = null,
-            colorFilter = ColorFilter.tint(BitnagilTheme.colors.white),
-            modifier = Modifier.size(24.dp),
+        BitnagilIcon(
+            id = id,
+            tint = if (isActive) colors.activeIconColor else colors.defaultIconColor,
         )
     }
 }
@@ -66,8 +64,9 @@ fun BitnagilFloatingActionMenu(
     isExpanded: Boolean,
     onToggle: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
-    @DrawableRes defaultIcon: Int = R.drawable.ic_plus,
+    @DrawableRes defaultIcon: Int = R.drawable.ic_add,
     @DrawableRes activeIcon: Int = R.drawable.ic_close,
+    colors: BitnagilFloatingButtonColor = BitnagilFloatingButtonColor.default(),
 ) {
     Box(modifier = modifier) {
         AnimatedVisibility(
@@ -102,7 +101,7 @@ fun BitnagilFloatingActionMenu(
                     ),
             ) {
                 Column(
-                    modifier = Modifier.padding(vertical = 16.dp, horizontal = 22.dp),
+                    modifier = Modifier.padding(16.dp),
                     verticalArrangement = Arrangement.spacedBy(24.dp),
                 ) {
                     actions.forEach { action ->
@@ -125,6 +124,8 @@ fun BitnagilFloatingActionMenu(
             BitnagilFloatingButton(
                 id = if (isExpanded) activeIcon else defaultIcon,
                 onClick = { onToggle(!isExpanded) },
+                isActive = isExpanded,
+                colors = colors,
             )
         }
     }
@@ -136,6 +137,24 @@ data class FloatingActionItem(
     val onClick: () -> Unit,
 )
 
+@Immutable
+data class BitnagilFloatingButtonColor(
+    val defaultIconColor: Color,
+    val defaultIconBackgroundColor: Color,
+    val activeIconColor: Color,
+    val activeIconBackgroundColor: Color,
+) {
+    companion object {
+        @Composable
+        fun default() = BitnagilFloatingButtonColor(
+            defaultIconColor = BitnagilTheme.colors.white,
+            defaultIconBackgroundColor = BitnagilTheme.colors.orange500,
+            activeIconColor = BitnagilTheme.colors.coolGray30,
+            activeIconBackgroundColor = BitnagilTheme.colors.white,
+        )
+    }
+}
+
 @Composable
 private fun FloatingActionMenuItem(
     @DrawableRes icon: Int,
@@ -159,12 +178,13 @@ private fun FloatingActionMenuItem(
         BitnagilIcon(
             id = icon,
             tint = null,
+            modifier = Modifier.size(24.dp),
         )
 
         Text(
             text = text,
-            style = BitnagilTheme.typography.subtitle1Medium,
-            color = BitnagilTheme.colors.navy500,
+            style = BitnagilTheme.typography.body2Medium,
+            color = BitnagilTheme.colors.coolGray30,
         )
     }
 }
@@ -174,17 +194,12 @@ private fun FloatingActionMenuItem(
 private fun BitnagilFloatingButtonPreview() {
     Column {
         BitnagilFloatingButton(
-            id = R.drawable.ic_plus,
+            id = R.drawable.ic_add,
             onClick = {},
         )
 
         BitnagilFloatingActionMenu(
             actions = listOf(
-                FloatingActionItem(
-                    icon = R.drawable.ic_report,
-                    text = "제보하기",
-                    onClick = {},
-                ),
                 FloatingActionItem(
                     icon = R.drawable.ic_routine_add,
                     text = "루틴 등록",