From 6b122b1704fa19d71710f41f957df2a797092b00 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Wed, 1 Feb 2023 16:23:28 -0800 Subject: [PATCH 1/2] Use only width to determine navigation UI Change-Id: Icad00b9a3eecac9762f6c6b7c3790e8cf1c161d6 --- .../samples/apps/nowinandroid/ui/NavigationUiTest.kt | 12 ++++++------ .../samples/apps/nowinandroid/ui/NiaAppState.kt | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) 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 From 2728d899f0b2b273e89e7eb49aa55efe34dea676 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Thu, 2 Feb 2023 08:10:26 -0800 Subject: [PATCH 2/2] Remove unused import Change-Id: I426995db727995c7af6d34082593b078756a3f9d --- .../java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt | 1 - 1 file changed, 1 deletion(-) 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 88f5b2782..6f929530c 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 @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.ui -import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.runtime.Composable