From 71fc07625ccfd55fc3d5d45a31dab7ac08033d79 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Fri, 21 Oct 2022 22:11:11 +0100
Subject: [PATCH] Add workaround for top app bar overlapping nav rail

---
 .../java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

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 b7f6f633e..30acd84cf 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
@@ -48,6 +48,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.compose.ui.zIndex
 import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavDestination
@@ -110,6 +111,11 @@ fun NiaApp(
                 val destination = appState.currentTopLevelDestination
                 if (destination != null) {
                     NiaTopAppBar(
+                        // When the nav rail is displayed, the top app bar will, by default
+                        // overlap it. This means that the top most item in the nav rail
+                        // won't be tappable. A workaround is to position the top app bar
+                        // behind the nav rail using zIndex.
+                        modifier = Modifier.zIndex(-1F),
                         titleRes = destination.titleTextId,
                         actionIcon = NiaIcons.Settings,
                         actionIconContentDescription = stringResource(