Skip to content

Fix navigation bar insets for three-button navigation #4

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

Open
flowing-water1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix navigation bar insets for three-button navigation #4

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
2 changes: 2 additions & 0 deletions app/src/main/java/app/codeg/android/feature/main/MainShell.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.animation.fadeOut
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Bolt
Expand Down Expand Up @@ -400,6 +401,7 @@ private fun CodegBottomBar(
// what actually makes the tabs continuous with the content above them.
containerColor = Color.Transparent,
tonalElevation = 0.dp,
modifier = Modifier.navigationBarsPadding(),
) {
HomeTab.entries.forEach { tab ->
val selected = currentRoute == tab.route
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/app/codeg/android/feature/sessiondetail/SessionDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
Expand Down Expand Up @@ -222,7 +223,10 @@ fun SessionDetailScreen(
)
},
bottomBar = {
Column(Modifier.imePadding()) {
// The activity draws edge-to-edge. Consume both the IME and the
// three-button/navigation gesture inset so the composer never sits
// underneath system navigation controls.
Column(Modifier.imePadding().navigationBarsPadding()) {
ui.pendingPermission?.let { p ->
PermissionRequestCard(
parsed = p.parsed,
Expand Down