From d91c1f44a37e74f1bfa4b04060eae8eefd4f7251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Moczkowski?= Date: Fri, 23 Jun 2023 16:07:38 +0200 Subject: [PATCH] Improvements Change-Id: I365c759f8c4664ea07ed99cc06f77fec6bba3833 --- .../samples/apps/nowinandroid/ui/NiaApp.kt | 5 -- .../nowinandroid/core/ui/AdaptiveScaffold.kt | 73 ++++++++++--------- 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index e63b076f0..fd2c1f0bd 100644 --- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/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, - ), - ), ) } } diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/AdaptiveScaffold.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/AdaptiveScaffold.kt index 8892f37f8..db982885c 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/AdaptiveScaffold.kt +++ b/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 RailScaffold( Row(modifier = modifier) { NavigationRail( + modifier = Modifier.safeDrawingPadding(), containerColor = colors.railContainerColor, ) { navigationItems.forEach { item -> @@ -291,7 +294,6 @@ private fun RailScaffold( snackbarHost = snackbarHost, containerColor = colors.contentContainerColor, contentColor = colors.contentColor, - contentWindowInsets = contentWindowInsets, ) { padding -> content(padding) } @@ -330,41 +332,42 @@ private fun DrawerScaffold( ) Row(modifier = modifier) { - Scaffold( - modifier = Modifier - .fillMaxHeight() - .fillMaxWidth(weight), - topBar = topBar, - snackbarHost = snackbarHost, - containerColor = colors.contentContainerColor, - contentColor = colors.contentColor, - contentWindowInsets = contentWindowInsets, - ) { padding -> - PermanentNavigationDrawer( - drawerContent = { - PermanentDrawerSheet( - drawerContainerColor = colors.drawerContainerColor, - ) { - navigationItems.forEach { item -> - NavigationDrawerItem( - label = { navigationItemTitle(item, isItemSelected(item)) }, - icon = { navigationItemIcon(item, isItemSelected(item)) }, - selected = isItemSelected(item), - onClick = { onNavigationItemClick(item) }, - colors = NavigationDrawerItemDefaults.colors( - selectedContainerColor = colors.selectedContainerColor, - unselectedContainerColor = colors.unselectedContainerColor, - selectedIconColor = colors.selectedIconColor, - unselectedIconColor = colors.unselectedIconColor, - selectedTextColor = colors.selectedTextColor, - unselectedTextColor = colors.unselectedTextColor, - ), - ) - } + PermanentNavigationDrawer( + drawerContent = { + PermanentDrawerSheet( + drawerContainerColor = colors.drawerContainerColor, + ) { + navigationItems.forEach { item -> + NavigationDrawerItem( + label = { navigationItemTitle(item, isItemSelected(item)) }, + icon = { navigationItemIcon(item, isItemSelected(item)) }, + selected = isItemSelected(item), + 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(8.dp) + ) } - }, - 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) } }