A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix large screen insets handling
Alex Vanyof84320e9a914
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.ktindex 474f4fff7..be8f0d614 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@@ -17,12 +17,17 @@package com.google.samples.apps.nowinandroid.uiimport androidx.annotation.StringRes+import androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.captionBarPadding+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.WindowInsetsSides+import androidx.compose.foundation.layout.consumedWindowInsetsimport androidx.compose.foundation.layout.fillMaxSize-import androidx.compose.foundation.layout.navigationBarsPadding+import androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.layout.statusBarsPadding+import androidx.compose.foundation.layout.safeDrawing+import androidx.compose.foundation.layout.safeDrawingPadding+import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.AutoStoriesimport androidx.compose.material.icons.filled.Bookmarks@@ -61,7 +66,7 @@ import com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.ui.ClearRippleThemeimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme-@OptIn(ExperimentalMaterial3Api::class)+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)@Composablefun NiaApp(windowSizeClass: WindowSizeClass) {NiaTheme {@@ -84,19 +89,29 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {}}) { padding ->- Surface(Modifier.fillMaxSize().statusBarsPadding()) {- Row {- if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact) {- NiANavRail(- navigationActions = navigationActions,- currentDestination = currentDestination+ Row(+ Modifier+ .fillMaxSize()+ .windowInsetsPadding(+ WindowInsets.safeDrawing.only(+ WindowInsetsSides.Horizontal)- }- NiaNavGraph(- navController = navController,- modifier = Modifier.padding(padding)+ )+ ) {+ if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact) {+ NiANavRail(+ navigationActions = navigationActions,+ currentDestination = currentDestination,+ modifier = Modifier.safeDrawingPadding())}++ NiaNavGraph(+ navController = navController,+ modifier = Modifier+ .padding(padding)+ .consumedWindowInsets(padding)+ )}}}@@ -105,9 +120,10 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {@Composableprivate fun NiANavRail(navigationActions: NiaNavigationActions,- currentDestination: NavDestination?+ currentDestination: NavDestination?,+ modifier: Modifier = Modifier,) {- NavigationRail {+ NavigationRail(modifier = modifier) {TOP_LEVEL_DESTINATIONS.forEach { destination ->val selected =currentDestination?.hierarchy?.any { it.route == destination.route } == true@@ -136,9 +152,11 @@ private fun NiABottomBar(Surface(color = MaterialTheme.colorScheme.surface) {CompositionLocalProvider(LocalRippleTheme provides ClearRippleTheme) {NavigationBar(- modifier = Modifier- .navigationBarsPadding()- .captionBarPadding(),+ modifier = Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(+ WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom+ )+ ),tonalElevation = 0.dp) {diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaNavGraph.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaNavGraph.ktindex 1650f5dbb..f721fa2e4 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaNavGraph.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaNavGraph.kt@@ -49,15 +49,16 @@ fun NiaNavGraph(NavHost(navController = navController,startDestination = startDestination,+ modifier = modifier,) {composable(NiaDestinations.FOR_YOU_ROUTE) {- ForYouRoute(modifier)+ ForYouRoute()}composable(NiaDestinations.EPISODES_ROUTE) {- Text("EPISODES", modifier)+ Text("EPISODES")}composable(NiaDestinations.SAVED_ROUTE) {- Text("SAVED", modifier)+ Text("SAVED")}navigation(startDestination = InterestsDestinations.INTERESTS_ROUTE,@@ -67,7 +68,6 @@ fun NiaNavGraph(InterestsRoute(navigateToTopic = { navController.navigate("$TOPIC_SCREEN/$it") },navigateToAuthor = { /* TO IMPLEMENT */ },- modifier = modifier)}composable(diff --git a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingScreen.kt b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingScreen.ktindex 54cddb113..49ec60549 100644--- a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingScreen.kt+++ b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingScreen.kt@@ -17,7 +17,13 @@package com.google.samples.apps.nowinandroid.feature.followingimport androidx.compose.foundation.layout.Column+import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.WindowInsetsSides+import androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.safeDrawing+import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.filled.Search@@ -72,6 +78,14 @@ fun FollowingScreen(modifier = modifier,horizontalAlignment = Alignment.CenterHorizontally) {+ Spacer(+ // TODO: Replace with windowInsetsTopHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Top)+ )+ )+NiaTopAppBar(titleRes = R.string.interests,navigationIcon = Icons.Filled.Search,diff --git a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/TabContent.kt b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/TabContent.ktindex 5bf0c5103..d47c2ade8 100644--- a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/TabContent.kt+++ b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/TabContent.kt@@ -16,7 +16,13 @@package com.google.samples.apps.nowinandroid.feature.following+import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.WindowInsetsSides+import androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.safeDrawing+import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.runtime.Composable@@ -48,6 +54,16 @@ fun TopicsTabContent()}}++ item {+ Spacer(+ // TODO: Replace with windowInsetsBottomHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ )+ )+ }}}@@ -73,5 +89,15 @@ fun AuthorsTabContent()}}++ item {+ Spacer(+ // TODO: Replace with windowInsetsBottomHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ )+ )+ }}}diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex 5eb97f677..9047b4741 100644--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -21,11 +21,17 @@ import android.net.Uriimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.WindowInsetsSidesimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightIn+import androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.safeDrawingimport androidx.compose.foundation.layout.width+import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.grid.GridCells.Fixedimport androidx.compose.foundation.lazy.grid.LazyHorizontalGrid@@ -103,6 +109,16 @@ fun ForYouScreen(LazyColumn(modifier = modifier.fillMaxSize()) {+ item {+ Spacer(+ // TODO: Replace with windowInsetsTopHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Top)+ )+ )+ }+item {NiaTopAppBar(titleRes = R.string.top_app_bar_title,@@ -200,6 +216,16 @@ fun ForYouScreen(}}}++ item {+ Spacer(+ // TODO: Replace with windowInsetsBottomHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ )+ )+ }}}diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktindex 9210ba167..bc940ba18 100644--- a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt+++ b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt@@ -22,9 +22,15 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.WindowInsetsSidesimport androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.safeDrawingimport androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.material.icons.Icons.Filledimport androidx.compose.material.icons.filled.ArrowBack@@ -79,6 +85,14 @@ internal fun TopicScreen(modifier = modifier,horizontalAlignment = Alignment.CenterHorizontally) {+ Spacer(+ // TODO: Replace with windowInsetsTopHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Top)+ )+ )+when (topicState) {Loading ->LoadingWheel(@@ -126,6 +140,14 @@ private fun TopicBody(name: String, description: String, news: NewsUiState) {)}TopicList(news, Modifier.padding(top = 24.dp))++ Spacer(+ // TODO: Replace with windowInsetsBottomHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ )+ )}}