Skip to content

Update navigation bar background #1042

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
tunjid merged 1 commit into from
Feb 25, 2026
+25 −1
Merged

Update navigation bar background #1042

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
26 changes: 25 additions & 1 deletion scaffold/src/commonMain/kotlin/com/tunjid/heron/scaffold/scaffold/PaneNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.compose.animation.BoundsTransform
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.compose.animation.animateBounds
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.snap
import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideInVertically
Expand All @@ -31,6 +32,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Badge
import androidx.compose.material3.BadgedBox
import androidx.compose.material3.BottomAppBarDefaults
Expand All @@ -42,8 +44,10 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.contentColorFor
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.Shape
import androidx.compose.ui.layout.LookaheadScope
import androidx.compose.ui.unit.dp
import com.tunjid.heron.ui.UiTokens
Expand Down Expand Up @@ -125,8 +129,9 @@ internal fun AppState.PaneNavigationBar(
modifier = modifier
.fillMaxWidth()
.animateBounds(lookaheadScope = this@LookaheadScope),
color = BottomAppBarDefaults.containerColor,
color = BottomAppBarDefaults.containerColor.copy(alpha = BackgroundAlpha),
contentColor = contentColorFor(BottomAppBarDefaults.containerColor),
shape = navigationBarShape(prefersCompactBottomNav),
) {
Row(
modifier = Modifier
Expand Down Expand Up @@ -225,9 +230,28 @@ fun Modifier.bottomNavigationSharedBounds(
}
}

@Composable
fun navigationBarShape(
prefersCompactBottomNav: Boolean,
): Shape {
val topCornerSize by animateDpAsState(
if (prefersCompactBottomNav) CompactCornerSize else RegularCornerSize,
)

return RoundedCornerShape(
topStart = topCornerSize,
topEnd = topCornerSize,
)
}

private data object NavigationBarSharedElementKey
private data object NavigationRailSharedElementKey

private val CompactCornerSize = 0.dp
private val RegularCornerSize = 16.dp

private const val MaxBadgeCount = 100L

private const val BackgroundAlpha = 0.98f

private val NavigationRailBoundsTransform = BoundsTransform { _, _ -> snap() }