Merge pull request #1419 from android/av/fix-state-loss-with-workaround

Fix state loss with workaround
1 year ago · ee66ead1a9
parent f198fd485e 70404bf24c
commit ee66ead1a9
1 changed files with 8 additions and 7 deletions
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@ -219,13 +219,14 @@ internal fun NiaApp(
                }

                Box(
-                    modifier = if (shouldShowTopAppBar) {
-                        Modifier.consumeWindowInsets(
-                            WindowInsets.safeDrawing.only(WindowInsetsSides.Top),
-                        )
-                    } else {
-                        Modifier
-                    },
+                    // Workaround for https://issuetracker.google.com/338478720
+                    modifier = Modifier.consumeWindowInsets(
+                        if (shouldShowTopAppBar) {
+                            WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
+                        } else {
+                            WindowInsets(0, 0, 0, 0)
+                        },
+                    ),
                ) {
                    NiaNavHost(
                        appState = appState,