💄 Properly remove edge-to-edge without black bars (#817)

LeoColman · Jan 27, 2025 · 5abb37d · 5abb37d
1 parent 32e3238
commit 5abb37d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/kotlin/br/com/colman/petals/navigation/Page.kt b/app/src/main/kotlin/br/com/colman/petals/navigation/Page.kt
@@ -83,9 +83,7 @@ fun BottomNavigationBar(navController: NavHostController) {
   val navBackStackEntry by navController.currentBackStackEntryAsState()
   val currentRoute = navBackStackEntry?.destination?.route
 
-  BottomNavigation(
-    Modifier.padding(bottom = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding())
-  ) {
+  BottomNavigation(WindowInsets(bottom = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding())) {
     Page.entries.forEach { page ->
       BottomNavigationItem(
         modifier = Modifier.testTag(page.name),

diff --git a/app/src/main/kotlin/br/com/colman/petals/navigation/TopAppBar.kt b/app/src/main/kotlin/br/com/colman/petals/navigation/TopAppBar.kt
@@ -25,6 +25,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.SpaceBetween
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -60,7 +61,7 @@ import org.koin.compose.koinInject
 @Composable
 fun MyTopAppBar(navController: NavController, options: (@Composable () -> Unit)? = null) {
   TopAppBar(
-    Modifier.padding(top = WindowInsets.systemBars.asPaddingValues().calculateTopPadding())
+    contentPadding = PaddingValues(top = WindowInsets.systemBars.asPaddingValues().calculateTopPadding())
   ) {
     Box(
       Modifier.padding(16.dp).height(56.dp).fillMaxWidth()