Skip to content

Commit 816a7b6

Browse files
committed
Replace manual navigation component switching with new NavigationSuiteScaffold
Change-Id: I54b402e28b6e1bd400c9f44644bd4dd35c98e723
1 parent aa8ce0e commit 816a7b6

File tree

10 files changed

+148
-533
lines changed

10 files changed

+148
-533
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ dependencies {
116116
implementation(libs.androidx.compose.runtime)
117117
implementation(libs.androidx.lifecycle.runtimeCompose)
118118
implementation(libs.androidx.compose.runtime.tracing)
119+
implementation(libs.androidx.compose.material3.adaptive) {
120+
this.isTransitive = false
121+
}
122+
implementation(libs.androidx.compose.material3.adaptive.navigation.suite) {
123+
this.isTransitive = false
124+
}
119125
implementation(libs.androidx.compose.material3.windowSizeClass)
120126
implementation(libs.androidx.hilt.navigation.compose)
121127
implementation(libs.androidx.navigation.compose)

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import androidx.annotation.StringRes
2020
import androidx.compose.ui.test.assertCountEquals
2121
import androidx.compose.ui.test.assertIsOn
2222
import androidx.compose.ui.test.assertIsSelected
23-
import androidx.compose.ui.test.hasAnyAncestor
24-
import androidx.compose.ui.test.hasTestTag
2523
import androidx.compose.ui.test.hasText
2624
import androidx.compose.ui.test.junit4.AndroidComposeTestRule
2725
import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -220,14 +218,6 @@ class NavigationTest {
220218
onNodeWithText(saved).performClick()
221219
onNodeWithContentDescription(settings).performClick()
222220
onNodeWithText(ok).performClick()
223-
224-
// Check that the saved screen is still visible and selected.
225-
onNode(
226-
hasText(saved) and
227-
hasAnyAncestor(
228-
hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
229-
),
230-
).assertIsSelected()
231221
}
232222
}
233223

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt

Lines changed: 0 additions & 268 deletions
This file was deleted.

0 commit comments

Comments
 (0)