From 090e994ed24023f8022917432c170cf4f848e7c1 Mon Sep 17 00:00:00 2001
From: uiel <parkuiery@gmail.com>
Date: Sat, 4 Jan 2025 11:25:22 +0900
Subject: [PATCH] =?UTF-8?q?refactor=20::=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aliens/dms/kmp/ui/BottomNavigationBar.kt | 117 +++++++++---------
1 file changed, 60 insertions(+), 57 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/team/aliens/dms/kmp/ui/BottomNavigationBar.kt b/composeApp/src/commonMain/kotlin/team/aliens/dms/kmp/ui/BottomNavigationBar.kt
index 1eb9a59..3e37ad5 100644
--- a/composeApp/src/commonMain/kotlin/team/aliens/dms/kmp/ui/BottomNavigationBar.kt
+++ b/composeApp/src/commonMain/kotlin/team/aliens/dms/kmp/ui/BottomNavigationBar.kt
@@ -3,15 +3,16 @@ package team.aliens.dms.kmp.ui
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.BottomAppBar
+import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.NavigationBarItemColors
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import androidx.navigation.compose.currentBackStackEntryAsState
@@ -33,64 +34,66 @@ fun BottomNavigationBar(
navController: NavController = rememberNavController(),
) {
val selectedRoute = navController.currentBackStackEntryAsState().value?.destination?.route
- BottomAppBar(
- modifier = Modifier
- .fillMaxHeight(0.08f)
- .graphicsLayer {
- clip = true
- shape = RoundedCornerShape(
- topStart = 24.dp,
- topEnd = 24.dp,
+
+ Column {
+ HorizontalDivider(
+ modifier = Modifier.fillMaxWidth(),
+ thickness = 1.dp,
+ color = DmsTheme.colors.surface,
+ )
+ BottomAppBar(
+ modifier = Modifier
+ .fillMaxHeight(0.08f),
+ contentColor = DmsTheme.colors.background,
+ containerColor = DmsTheme.colors.background,
+ ) {
+ bottomMenus.forEach {
+ val selected = selectedRoute == it.route
+ val color by animateColorAsState(
+ targetValue = if (selected) {
+ DmsTheme.colors.inversePrimary
+ } else {
+ DmsTheme.colors.inverseSurface
+ },
)
- shadowElevation = 20f
- },
- contentColor = DmsTheme.colors.onBackground,
- containerColor = DmsTheme.colors.onBackground,
- ) {
- bottomMenus.forEach {
- val selected = selectedRoute == it.route
- val color by animateColorAsState(
- targetValue = if (selected) {
- DmsTheme.colors.onBackground
- } else {
- DmsTheme.colors.inverseSurface
- },
- )
- NavigationBarItem(
- selected = selected,
- onClick = {
- if (!selected) {
- navController.navigate(it.route) {
- launchSingleTop = true
- restoreState = true
+ NavigationBarItem(
+ selected = selected,
+ onClick = {
+ if (!selected) {
+ navController.navigate(it.route) {
+ launchSingleTop = true
+ restoreState = true
+ }
+ }
+ },
+ icon = {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Icon(
+ painter = painterResource(resource = if (selected) it.selectedIcon else it.icon),
+ contentDescription = it.route,
+ tint = color,
+ )
+ DmsText(
+ text = it.title,
+ style = DmsTypography.Body3,
+ color = color,
+ )
}
- }
- },
- icon = {
- Column {
- Icon(
- painter = painterResource(resource = if (selected) it.selectedIcon else it.icon),
- contentDescription = it.route,
- tint = color,
- )
- DmsText(
- text = it.title,
- style = DmsTypography.Button4,
- color = color,
- )
- }
- },
- colors = NavigationBarItemColors(
- selectedIconColor = DmsTheme.colors.onBackground,
- selectedTextColor = DmsTheme.colors.onBackground,
- selectedIndicatorColor = DmsTheme.colors.onBackground,
- unselectedIconColor = DmsTheme.colors.inverseSurface,
- unselectedTextColor = DmsTheme.colors.inverseSurface,
- disabledIconColor = DmsTheme.colors.inverseSurface,
- disabledTextColor = DmsTheme.colors.inverseSurface,
- ),
- )
+ },
+ colors = NavigationBarItemColors(
+ selectedIconColor = DmsTheme.colors.inversePrimary,
+ selectedTextColor = DmsTheme.colors.inversePrimary,
+ selectedIndicatorColor = DmsTheme.colors.background,
+ unselectedIconColor = DmsTheme.colors.inverseSurface,
+ unselectedTextColor = DmsTheme.colors.inverseSurface,
+ disabledIconColor = DmsTheme.colors.inverseSurface,
+ disabledTextColor = DmsTheme.colors.inverseSurface,
+ ),
+ )
+ }
}
}
}