Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Use only width to determine navigation UI

Alex Vanyob4de09d0b2c4
diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt
index ca20d4332..c498c03dd 100644
--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt
+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt
@@ -91,7 +91,7 @@ class NavigationUiTest {
}
@Test
- fun mediumWidth_compactHeight_showsNavigationBar() {
+ fun mediumWidth_compactHeight_showsNavigationRail() {
composeTestRule.setContent {
TestHarness(size = DpSize(610.dp, 400.dp)) {
BoxWithConstraints {
@@ -105,12 +105,12 @@ class NavigationUiTest {
}
}
- composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()
- composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()
+ composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
+ composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
}
@Test
- fun expandedWidth_compactHeight_showsNavigationBar() {
+ fun expandedWidth_compactHeight_showsNavigationRail() {
composeTestRule.setContent {
TestHarness(size = DpSize(900.dp, 400.dp)) {
BoxWithConstraints {
@@ -124,8 +124,8 @@ class NavigationUiTest {
}
}
- composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()
- composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()
+ composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
+ composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
}
@Test
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
index 51df525a0..88f5b2782 100644
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
@@ -87,8 +87,7 @@ class NiaAppState(
private set
val shouldShowBottomBar: Boolean
- get() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact ||
- windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact
+ get() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact
val shouldShowNavRail: Boolean
get() = !shouldShowBottomBar