Merge pull request #101 from YAPP-Github/ui/#100-mypage-redesing

[Ui/#100] 마이페이지, 설정 화면 리디자인 변경 사항 반영

Author: wjdrjs00

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,
+                )
+            }
         }
     }
 }

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

@@ -110,6 +110,16 @@ data class BitnagilTextButtonColor(
             pressedTextColor = BitnagilTheme.colors.navy500,
             disabledTextColor = BitnagilTheme.colors.navy500,
         )
+
+        @Composable
+        fun cancel(): BitnagilTextButtonColor = BitnagilTextButtonColor(
+            defaultBackgroundColor = BitnagilTheme.colors.coolGray97,
+            pressedBackgroundColor = BitnagilTheme.colors.coolGray97,
+            disabledBackgroundColor = BitnagilTheme.colors.coolGray97,
+            defaultTextColor = BitnagilTheme.colors.coolGray40,
+            pressedTextColor = BitnagilTheme.colors.coolGray40,
+            disabledTextColor = BitnagilTheme.colors.coolGray40,
+        )
     }
 }
 

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilOptionButton.kt

@@ -31,14 +31,14 @@ fun BitnagilOptionButton(
     ) {
         Text(
             text = title,
-            color = BitnagilTheme.colors.black,
-            style = BitnagilTheme.typography.body1Regular,
+            color = BitnagilTheme.colors.coolGray10,
+            style = BitnagilTheme.typography.body1Medium,
             modifier = Modifier.weight(1f),
         )
 
         BitnagilIcon(
-            id = R.drawable.ic_right_arrow_20,
-            tint = BitnagilTheme.colors.black,
+            id = R.drawable.ic_chevron_right_md,
+            tint = BitnagilTheme.colors.coolGray10,
             modifier = Modifier.padding(10.dp),
         )
     }