Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
}
Expand Down
18 changes: 0 additions & 18 deletions core/designsystem/src/main/res/drawable/ic_modal_warning.xml

This file was deleted.

Loading