Add NavigationSuiteScaffold

Change-Id: I36710d880bff381ed86c61632f2ab91902727775
android · May 6, 2024 · 18e6c9a · 18e6c9a
1 parent 3dd4240
commit 18e6c9a
Show file tree

Hide file tree

Showing 24 changed files with 248 additions and 484 deletions.
diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@@ -20,6 +20,10 @@ androidx.compose.foundation:foundation-android:1.6.3
 androidx.compose.foundation:foundation-layout-android:1.6.3
 androidx.compose.foundation:foundation-layout:1.6.3
 androidx.compose.foundation:foundation:1.6.3
+androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha10
+androidx.compose.material3.adaptive:adaptive:1.0.0-alpha10
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha05
+androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha05
 androidx.compose.material3:material3-android:1.2.1
 androidx.compose.material3:material3:1.2.1
 androidx.compose.material:material-icons-core-android:1.6.3
@@ -79,6 +83,10 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
+androidx.window.extensions.core:core:1.0.0
+androidx.window:window-core-android:1.3.0-alpha02
+androidx.window:window-core:1.3.0-alpha02
+androidx.window:window:1.3.0-alpha02
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.51

diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@ -27,6 +27,8 @@ androidx.compose.material3.adaptive:adaptive-layout:1.0.0-alpha10
 androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-alpha10
 androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-alpha10
 androidx.compose.material3.adaptive:adaptive:1.0.0-alpha10
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha05
+androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha05
 androidx.compose.material3:material3-android:1.2.1
 androidx.compose.material3:material3-window-size-class-android:1.2.1
 androidx.compose.material3:material3-window-size-class:1.2.1

diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
@@ -20,7 +20,6 @@ import androidx.annotation.StringRes
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
-import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -225,12 +224,7 @@ class NavigationTest {
             onNodeWithText(ok).performClick()
 
             // Check that the saved screen is still visible and selected.
-            onNode(
-                hasText(saved) and
-                    hasAnyAncestor(
-                        hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
-                    ),
-            ).assertIsSelected()
+            onNode(hasText(saved) and hasTestTag("NiaNavItem")).assertIsSelected()
         }
     }
 

diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt