Improvements

Change-Id: I365c759f8c4664ea07ed99cc06f77fec6bba3833

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt

@@ -193,11 +193,6 @@ fun NiaApp(
                     modifier = Modifier
                         .padding(padding)
                         .consumeWindowInsets(padding)
-                        .windowInsetsPadding(
-                            WindowInsets.safeDrawing.only(
-                                WindowInsetsSides.Horizontal,
-                            ),
-                        ),
                 )
             }
         }

core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/AdaptiveScaffold.kt

@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
@@ -55,6 +56,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
 import androidx.window.layout.WindowMetricsCalculator
 
 class AdaptiveScaffoldNavigationComponentColors internal constructor(
@@ -265,6 +267,7 @@ private fun <T> RailScaffold(
 
     Row(modifier = modifier) {
         NavigationRail(
+            modifier = Modifier.safeDrawingPadding(),
             containerColor = colors.railContainerColor,
         ) {
             navigationItems.forEach { item ->
@@ -291,7 +294,6 @@ private fun <T> RailScaffold(
             snackbarHost = snackbarHost,
             containerColor = colors.contentContainerColor,
             contentColor = colors.contentColor,
-            contentWindowInsets = contentWindowInsets,
         ) { padding ->
             content(padding)
         }
@@ -330,41 +332,42 @@ private fun <T> DrawerScaffold(
     )
 
     Row(modifier = modifier) {
-        Scaffold(
+        PermanentNavigationDrawer(
-            modifier = Modifier
+            drawerContent = {
-                .fillMaxHeight()
+                PermanentDrawerSheet(
-                .fillMaxWidth(weight),
+                    drawerContainerColor = colors.drawerContainerColor,
-            topBar = topBar,
+                ) {
-            snackbarHost = snackbarHost,
+                    navigationItems.forEach { item ->
-            containerColor = colors.contentContainerColor,
+                        NavigationDrawerItem(
-            contentColor = colors.contentColor,
+                            label = { navigationItemTitle(item, isItemSelected(item)) },
-            contentWindowInsets = contentWindowInsets,
+                            icon = { navigationItemIcon(item, isItemSelected(item)) },
-        ) { padding ->
+                            selected = isItemSelected(item),
-            PermanentNavigationDrawer(
+                            onClick = { onNavigationItemClick(item) },
-                drawerContent = {
+                            colors = NavigationDrawerItemDefaults.colors(
-                    PermanentDrawerSheet(
+                                selectedContainerColor = colors.selectedContainerColor,
-                        drawerContainerColor = colors.drawerContainerColor,
+                                unselectedContainerColor = colors.unselectedContainerColor,
-                    ) {
+                                selectedIconColor = colors.selectedIconColor,
-                        navigationItems.forEach { item ->
+                                unselectedIconColor = colors.unselectedIconColor,
-                            NavigationDrawerItem(
+                                selectedTextColor = colors.selectedTextColor,
-                                label = { navigationItemTitle(item, isItemSelected(item)) },
+                                unselectedTextColor = colors.unselectedTextColor,
-                                icon = { navigationItemIcon(item, isItemSelected(item)) },
+                            ),
-                                selected = isItemSelected(item),
+                            modifier = Modifier.padding(8.dp)
-                                onClick = { onNavigationItemClick(item) },
+                        )
-                                colors = NavigationDrawerItemDefaults.colors(
-                                    selectedContainerColor = colors.selectedContainerColor,
-                                    unselectedContainerColor = colors.unselectedContainerColor,
-                                    selectedIconColor = colors.selectedIconColor,
-                                    unselectedIconColor = colors.unselectedIconColor,
-                                    selectedTextColor = colors.selectedTextColor,
-                                    unselectedTextColor = colors.unselectedTextColor,
-                                ),
-                            )
-                        }
                     }
-                },
+                }
-                modifier = Modifier.padding(padding),
+            },
-            ) {
+            modifier = Modifier.safeDrawingPadding(),
+        ) {
+            Scaffold(
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .fillMaxWidth(weight),
+                topBar = topBar,
+                snackbarHost = snackbarHost,
+                containerColor = colors.contentContainerColor,
+                contentColor = colors.contentColor,
+                contentWindowInsets = contentWindowInsets,
+            ) { padding ->
                 content(padding)
             }
         }