Merge pull request #942 from android/feature/navigation-suite-scaffold

Replace manual navigation component switching with new NavigationSuiteScaffold
android · Nov 16, 2023 · 335a7ec · 335a7ec
2 parents aa8ce0e + f365e8b
commit 335a7ec
Show file tree

Hide file tree

Showing 22 changed files with 148 additions and 533 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -116,6 +116,12 @@ dependencies {
     implementation(libs.androidx.compose.runtime)
     implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.compose.runtime.tracing)
+    implementation(libs.androidx.compose.material3.adaptive) {
+        this.isTransitive = false
+    }
+    implementation(libs.androidx.compose.material3.adaptive.navigation.suite) {
+        this.isTransitive = false
+    }
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.navigation.compose)

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,8 +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
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -220,14 +218,6 @@ class NavigationTest {
             onNodeWithText(saved).performClick()
             onNodeWithContentDescription(settings).performClick()
             onNodeWithText(ok).performClick()
-
-            // Check that the saved screen is still visible and selected.
-            onNode(
-                hasText(saved) and
-                    hasAnyAncestor(
-                        hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
-                    ),
-            ).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