Skip to content

chore(ui): have BottomBarContainer render using Modal #1128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Jul 23, 2026
Merged

chore(ui): have BottomBarContainer render using Modal #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ui/components/src/main/kotlin/com/getcode/ui/components/Modal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import com.getcode.theme.Brand
import com.getcode.theme.CodeTheme

@Composable
Expand Down
35 changes: 14 additions & 21 deletions ui/components/src/main/kotlin/com/getcode/ui/components/bars/BottomBarContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material.Icon
import androidx.compose.material.LocalContentColor
import androidx.compose.material.Text
Expand Down Expand Up @@ -56,6 +52,7 @@ import com.getcode.manager.SelectedBottomBarAction
import com.getcode.theme.CodeTheme
import com.getcode.theme.White
import com.getcode.theme.White50
import com.getcode.ui.components.Modal
import com.getcode.ui.core.addIf
import com.getcode.ui.core.rememberAnimationScale
import androidx.compose.foundation.clickable
Expand All @@ -69,7 +66,10 @@ import kotlinx.coroutines.launch
import kotlin.time.Duration.Companion.milliseconds

@Composable
fun BottomBarContainer(barMessages: BarMessages, onShown: (BottomBarManager.BottomBarMessage) -> Unit = {}) {
fun BottomBarContainer(
barMessages: BarMessages,
onShown: (BottomBarManager.BottomBarMessage) -> Unit = {}
) {
val scope = rememberCoroutineScope()
val bottomBarMessage by barMessages.bottomBar.collectAsStateWithLifecycle()
val bottomBarVisibleState = remember(bottomBarMessage?.id) { MutableTransitionState(false) }
Expand Down Expand Up @@ -203,24 +203,15 @@ fun BottomBarView(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.BottomCenter
) {
Column(
modifier = Modifier
.background(
bottomBarMessage.type.backgroundColor(),
CodeTheme.shapes.medium.copy(
bottomStart = CornerSize(0),
bottomEnd = CornerSize(0)
)
)
.fillMaxWidth()
.padding(top = CodeTheme.dimens.inset)
.padding(horizontal = CodeTheme.dimens.inset)
.windowInsetsPadding(WindowInsets.navigationBars),
verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x3)
Modal(
backgroundColor = bottomBarMessage.type.backgroundColor(),
) {
if (bottomBarMessage.title.isNotEmpty()) {
CompositionLocalProvider(LocalContentColor provides White) {
Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)
) {
Text(
style = CodeTheme.typography.textMedium,
text = bottomBarMessage.title
Expand Down Expand Up @@ -296,7 +287,8 @@ fun BottomBarView(

actions.fastForEachIndexed { index, action ->
CodeButton(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.addIf(index == actions.lastIndex) {
Modifier.padding(
bottom = when (action.style) {
Expand Down Expand Up @@ -327,6 +319,7 @@ fun BottomBarView(
BottomBarManager.BottomBarButtonStyle.Outlined -> Color.White
BottomBarManager.BottomBarButtonStyle.Text -> White50
}

BottomBarManager.BottomBarMessageType.WARNING -> Color.Black
BottomBarManager.BottomBarMessageType.INFO -> when (action.style) {
BottomBarManager.BottomBarButtonStyle.Text -> White50
Expand Down
Loading