A fully functional Android app built entirely with Kotlin and Jetpack Compose
Add NavigationSuiteScaffold
Alex Vanyo3fb6df7c3310
diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txtindex 8a4bff7ab..198aee7a3 100644--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt@@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.8.0androidx.activity:activity-ktx:1.8.0androidx.activity:activity:1.8.0androidx.annotation:annotation-experimental:1.4.0-androidx.annotation:annotation-jvm:1.7.1-androidx.annotation:annotation:1.7.1+androidx.annotation:annotation-jvm:1.8.0-rc01+androidx.annotation:annotation:1.8.0-rc01androidx.appcompat:appcompat-resources:1.6.1androidx.arch.core:core-common:2.2.0androidx.arch.core:core-runtime:2.2.0@@ -12,14 +12,18 @@ androidx.browser:browser:1.8.0androidx.collection:collection-jvm:1.4.0androidx.collection:collection-ktx:1.4.0androidx.collection:collection:1.4.0-androidx.compose.animation:animation-android:1.6.3-androidx.compose.animation:animation-core-android:1.6.3-androidx.compose.animation:animation-core:1.6.3-androidx.compose.animation:animation:1.6.3-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.animation:animation-android:1.7.0-alpha08+androidx.compose.animation:animation-core-android:1.7.0-alpha08+androidx.compose.animation:animation-core:1.7.0-alpha08+androidx.compose.animation:animation:1.7.0-alpha08+androidx.compose.foundation:foundation-android:1.7.0-alpha08+androidx.compose.foundation:foundation-layout-android:1.7.0-alpha08+androidx.compose.foundation:foundation-layout:1.7.0-alpha08+androidx.compose.foundation:foundation:1.7.0-alpha08+androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive:1.0.0-alpha12+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha07+androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha07androidx.compose.material3:material3-android:1.2.1androidx.compose.material3:material3:1.2.1androidx.compose.material:material-icons-core-android:1.6.3@@ -28,45 +32,52 @@ androidx.compose.material:material-icons-extended-android:1.6.3androidx.compose.material:material-icons-extended:1.6.3androidx.compose.material:material-ripple-android:1.6.3androidx.compose.material:material-ripple:1.6.3-androidx.compose.runtime:runtime-android:1.6.3-androidx.compose.runtime:runtime-saveable-android:1.6.3-androidx.compose.runtime:runtime-saveable:1.6.3-androidx.compose.runtime:runtime:1.6.3-androidx.compose.ui:ui-android:1.6.3-androidx.compose.ui:ui-geometry-android:1.6.3-androidx.compose.ui:ui-geometry:1.6.3-androidx.compose.ui:ui-graphics-android:1.6.3-androidx.compose.ui:ui-graphics:1.6.3-androidx.compose.ui:ui-text-android:1.6.3-androidx.compose.ui:ui-text:1.6.3-androidx.compose.ui:ui-tooling-preview-android:1.6.3-androidx.compose.ui:ui-tooling-preview:1.6.3-androidx.compose.ui:ui-unit-android:1.6.3-androidx.compose.ui:ui-unit:1.6.3-androidx.compose.ui:ui-util-android:1.6.3-androidx.compose.ui:ui-util:1.6.3-androidx.compose.ui:ui:1.6.3+androidx.compose.runtime:runtime-android:1.7.0-alpha08+androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha08+androidx.compose.runtime:runtime-saveable:1.7.0-alpha08+androidx.compose.runtime:runtime:1.7.0-alpha08+androidx.compose.ui:ui-android:1.7.0-alpha08+androidx.compose.ui:ui-geometry-android:1.7.0-alpha08+androidx.compose.ui:ui-geometry:1.7.0-alpha08+androidx.compose.ui:ui-graphics-android:1.7.0-alpha08+androidx.compose.ui:ui-graphics:1.7.0-alpha08+androidx.compose.ui:ui-text-android:1.7.0-alpha08+androidx.compose.ui:ui-text:1.7.0-alpha08+androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha08+androidx.compose.ui:ui-tooling-preview:1.7.0-alpha08+androidx.compose.ui:ui-unit-android:1.7.0-alpha08+androidx.compose.ui:ui-unit:1.7.0-alpha08+androidx.compose.ui:ui-util-android:1.7.0-alpha08+androidx.compose.ui:ui-util:1.7.0-alpha08+androidx.compose.ui:ui:1.7.0-alpha08androidx.compose:compose-bom:2024.02.02androidx.concurrent:concurrent-futures:1.1.0-androidx.core:core-ktx:1.12.0-androidx.core:core:1.12.0+androidx.core:core-ktx:1.13.1+androidx.core:core:1.13.1androidx.customview:customview-poolingcontainer:1.0.0androidx.customview:customview:1.0.0androidx.emoji2:emoji2:1.3.0androidx.exifinterface:exifinterface:1.3.7androidx.fragment:fragment:1.5.1+androidx.graphics:graphics-path:1.0.1androidx.interpolator:interpolator:1.0.0-androidx.lifecycle:lifecycle-common-java8:2.7.0-androidx.lifecycle:lifecycle-common:2.7.0-androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0-androidx.lifecycle:lifecycle-livedata-core:2.7.0-androidx.lifecycle:lifecycle-livedata:2.7.0-androidx.lifecycle:lifecycle-process:2.7.0-androidx.lifecycle:lifecycle-runtime-ktx:2.7.0-androidx.lifecycle:lifecycle-runtime:2.7.0-androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0-androidx.lifecycle:lifecycle-viewmodel:2.7.0+androidx.lifecycle:lifecycle-common-java8:2.8.0-rc01+androidx.lifecycle:lifecycle-common-jvm:2.8.0-rc01+androidx.lifecycle:lifecycle-common:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata-core:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata:2.8.0-rc01+androidx.lifecycle:lifecycle-process:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-compose:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01androidx.loader:loader:1.0.0androidx.metrics:metrics-performance:1.0.0-alpha04androidx.profileinstaller:profileinstaller:1.3.1@@ -79,6 +90,10 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0androidx.vectordrawable:vectordrawable:1.1.0androidx.versionedparcelable:versionedparcelable:1.1.1androidx.viewpager:viewpager:1.0.0+androidx.window.extensions.core:core:1.0.0+androidx.window:window-core-android:1.3.0-beta01+androidx.window:window-core:1.3.0-beta01+androidx.window:window:1.3.0-beta01com.google.accompanist:accompanist-drawablepainter:0.32.0com.google.code.findbugs:jsr305:3.0.2com.google.dagger:dagger-lint-aar:2.51@@ -94,10 +109,10 @@ io.coil-kt:coil-compose-base:2.6.0io.coil-kt:coil-compose:2.6.0io.coil-kt:coil:2.6.0javax.inject:javax.inject:1-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0-org.jetbrains.kotlin:kotlin-stdlib:1.9.22+org.jetbrains.kotlin:kotlin-stdlib:1.9.23org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex 1703b0c36..31e4529ff 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -1,9 +1,9 @@-androidx.activity:activity-compose:1.8.0-androidx.activity:activity-ktx:1.8.0-androidx.activity:activity:1.8.0+androidx.activity:activity-compose:1.8.2+androidx.activity:activity-ktx:1.8.2+androidx.activity:activity:1.8.2androidx.annotation:annotation-experimental:1.4.0-androidx.annotation:annotation-jvm:1.8.0-beta01-androidx.annotation:annotation:1.8.0-beta01+androidx.annotation:annotation-jvm:1.8.0-rc01+androidx.annotation:annotation:1.8.0-rc01androidx.appcompat:appcompat-resources:1.6.1androidx.appcompat:appcompat:1.6.1androidx.arch.core:core-common:2.2.0@@ -13,20 +13,22 @@ androidx.browser:browser:1.8.0androidx.collection:collection-jvm:1.4.0androidx.collection:collection-ktx:1.4.0androidx.collection:collection:1.4.0-androidx.compose.animation:animation-android:1.7.0-alpha06-androidx.compose.animation:animation-core-android:1.7.0-alpha06-androidx.compose.animation:animation-core:1.7.0-alpha06-androidx.compose.animation:animation:1.7.0-alpha06-androidx.compose.foundation:foundation-android:1.7.0-alpha06-androidx.compose.foundation:foundation-layout-android:1.7.0-alpha06-androidx.compose.foundation:foundation-layout:1.7.0-alpha06-androidx.compose.foundation:foundation:1.7.0-alpha06-androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha10-androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-alpha10-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.animation:animation-android:1.7.0-alpha08+androidx.compose.animation:animation-core-android:1.7.0-alpha08+androidx.compose.animation:animation-core:1.7.0-alpha08+androidx.compose.animation:animation:1.7.0-alpha08+androidx.compose.foundation:foundation-android:1.7.0-alpha08+androidx.compose.foundation:foundation-layout-android:1.7.0-alpha08+androidx.compose.foundation:foundation-layout:1.7.0-alpha08+androidx.compose.foundation:foundation:1.7.0-alpha08+androidx.compose.material3.adaptive:adaptive-android:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive-layout:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-alpha12+androidx.compose.material3.adaptive:adaptive:1.0.0-alpha12+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.0.0-alpha07+androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha07androidx.compose.material3:material3-android:1.2.1androidx.compose.material3:material3-window-size-class-android:1.2.1androidx.compose.material3:material3-window-size-class:1.2.1@@ -37,30 +39,30 @@ androidx.compose.material:material-icons-extended-android:1.6.3androidx.compose.material:material-icons-extended:1.6.3androidx.compose.material:material-ripple-android:1.6.3androidx.compose.material:material-ripple:1.6.3-androidx.compose.runtime:runtime-android:1.7.0-alpha06-androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha06-androidx.compose.runtime:runtime-saveable:1.7.0-alpha06+androidx.compose.runtime:runtime-android:1.7.0-alpha08+androidx.compose.runtime:runtime-saveable-android:1.7.0-alpha08+androidx.compose.runtime:runtime-saveable:1.7.0-alpha08androidx.compose.runtime:runtime-tracing:1.0.0-beta01-androidx.compose.runtime:runtime:1.7.0-alpha06-androidx.compose.ui:ui-android:1.7.0-alpha06-androidx.compose.ui:ui-geometry-android:1.7.0-alpha06-androidx.compose.ui:ui-geometry:1.7.0-alpha06-androidx.compose.ui:ui-graphics-android:1.7.0-alpha06-androidx.compose.ui:ui-graphics:1.7.0-alpha06-androidx.compose.ui:ui-text-android:1.7.0-alpha06-androidx.compose.ui:ui-text:1.7.0-alpha06-androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha06-androidx.compose.ui:ui-tooling-preview:1.7.0-alpha06-androidx.compose.ui:ui-unit-android:1.7.0-alpha06-androidx.compose.ui:ui-unit:1.7.0-alpha06-androidx.compose.ui:ui-util-android:1.7.0-alpha06-androidx.compose.ui:ui-util:1.7.0-alpha06-androidx.compose.ui:ui:1.7.0-alpha06+androidx.compose.runtime:runtime:1.7.0-alpha08+androidx.compose.ui:ui-android:1.7.0-alpha08+androidx.compose.ui:ui-geometry-android:1.7.0-alpha08+androidx.compose.ui:ui-geometry:1.7.0-alpha08+androidx.compose.ui:ui-graphics-android:1.7.0-alpha08+androidx.compose.ui:ui-graphics:1.7.0-alpha08+androidx.compose.ui:ui-text-android:1.7.0-alpha08+androidx.compose.ui:ui-text:1.7.0-alpha08+androidx.compose.ui:ui-tooling-preview-android:1.7.0-alpha08+androidx.compose.ui:ui-tooling-preview:1.7.0-alpha08+androidx.compose.ui:ui-unit-android:1.7.0-alpha08+androidx.compose.ui:ui-unit:1.7.0-alpha08+androidx.compose.ui:ui-util-android:1.7.0-alpha08+androidx.compose.ui:ui-util:1.7.0-alpha08+androidx.compose.ui:ui:1.7.0-alpha08androidx.compose:compose-bom:2024.02.02androidx.concurrent:concurrent-futures:1.1.0-androidx.core:core-ktx:1.12.0+androidx.core:core-ktx:1.13.1androidx.core:core-splashscreen:1.0.1-androidx.core:core:1.12.0+androidx.core:core:1.13.1androidx.cursoradapter:cursoradapter:1.0.0androidx.customview:customview-poolingcontainer:1.0.0androidx.customview:customview:1.0.0@@ -74,32 +76,33 @@ androidx.emoji2:emoji2-views-helper:1.3.0androidx.emoji2:emoji2:1.3.0androidx.exifinterface:exifinterface:1.3.7androidx.fragment:fragment:1.5.1-androidx.graphics:graphics-path:1.0.0-beta02+androidx.graphics:graphics-path:1.0.1androidx.hilt:hilt-common:1.1.0androidx.hilt:hilt-navigation-compose:1.2.0androidx.hilt:hilt-navigation:1.2.0androidx.hilt:hilt-work:1.1.0androidx.interpolator:interpolator:1.0.0androidx.legacy:legacy-support-core-utils:1.0.0-androidx.lifecycle:lifecycle-common-java8:2.8.0-alpha04-androidx.lifecycle:lifecycle-common-jvm:2.8.0-alpha04-androidx.lifecycle:lifecycle-common:2.8.0-alpha04-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-alpha04-androidx.lifecycle:lifecycle-livedata-core:2.8.0-alpha04-androidx.lifecycle:lifecycle-livedata:2.8.0-alpha04-androidx.lifecycle:lifecycle-process:2.8.0-alpha04-androidx.lifecycle:lifecycle-runtime-android:2.8.0-alpha04-androidx.lifecycle:lifecycle-runtime-compose:2.8.0-alpha04-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-alpha04-androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-alpha04-androidx.lifecycle:lifecycle-runtime:2.8.0-alpha04-androidx.lifecycle:lifecycle-service:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-alpha04-androidx.lifecycle:lifecycle-viewmodel:2.8.0-alpha04+androidx.lifecycle:lifecycle-common-java8:2.8.0-rc01+androidx.lifecycle:lifecycle-common-jvm:2.8.0-rc01+androidx.lifecycle:lifecycle-common:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata-core:2.8.0-rc01+androidx.lifecycle:lifecycle-livedata:2.8.0-rc01+androidx.lifecycle:lifecycle-process:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-compose:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-runtime:2.8.0-rc01+androidx.lifecycle:lifecycle-service:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-android:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-rc01+androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01androidx.loader:loader:1.0.0androidx.localbroadcastmanager:localbroadcastmanager:1.0.0androidx.metrics:metrics-performance:1.0.0-alpha04@@ -129,9 +132,9 @@ androidx.vectordrawable:vectordrawable:1.1.0androidx.versionedparcelable:versionedparcelable:1.1.1androidx.viewpager:viewpager:1.0.0androidx.window.extensions.core:core:1.0.0-androidx.window:window-core-android:1.3.0-alpha03-androidx.window:window-core:1.3.0-alpha03-androidx.window:window:1.3.0-alpha03+androidx.window:window-core-android:1.3.0-beta01+androidx.window:window-core:1.3.0-beta01+androidx.window:window:1.3.0-beta01androidx.work:work-runtime-ktx:2.9.0androidx.work:work-runtime:2.9.0com.caverock:androidsvg-aar:1.4@@ -203,10 +206,10 @@ io.coil-kt:coil-svg:2.6.0io.coil-kt:coil:2.6.0javax.inject:javax.inject:1org.checkerframework:checker-qual:3.12.0-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0-org.jetbrains.kotlin:kotlin-stdlib:1.9.22+org.jetbrains.kotlin:kotlin-stdlib:1.9.23org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0diff --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.ktindex c9cc64120..93c674bcc 100644--- 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.StringResimport androidx.compose.ui.test.assertCountEqualsimport androidx.compose.ui.test.assertIsOnimport androidx.compose.ui.test.assertIsSelected-import androidx.compose.ui.test.hasAnyAncestorimport androidx.compose.ui.test.hasTestTagimport androidx.compose.ui.test.hasTextimport 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.ktdeleted file mode 100644index 03cf653ae..000000000--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt+++ /dev/null@@ -1,247 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.ui--import androidx.compose.foundation.layout.BoxWithConstraints-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi-import androidx.compose.material3.windowsizeclass.WindowSizeClass-import androidx.compose.runtime.Composable-import androidx.compose.ui.test.DeviceConfigurationOverride-import androidx.compose.ui.test.ForcedSize-import androidx.compose.ui.test.assertIsDisplayed-import androidx.compose.ui.test.junit4.createAndroidComposeRule-import androidx.compose.ui.test.onNodeWithTag-import androidx.compose.ui.unit.Dp-import androidx.compose.ui.unit.DpSize-import androidx.compose.ui.unit.dp-import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository-import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor-import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor-import com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule-import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository-import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository-import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity-import dagger.hilt.android.testing.BindValue-import dagger.hilt.android.testing.HiltAndroidRule-import dagger.hilt.android.testing.HiltAndroidTest-import org.junit.Before-import org.junit.Rule-import org.junit.Test-import org.junit.rules.TemporaryFolder-import javax.inject.Inject--/**- * Tests that the navigation UI is rendered correctly on different screen sizes.- */-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)-@HiltAndroidTest-class NavigationUiTest {-- /**- * Manages the components' state and is used to perform injection on your test- */- @get:Rule(order = 0)- val hiltRule = HiltAndroidRule(this)-- /**- * Create a temporary folder used to create a Data Store file. This guarantees that- * the file is removed in between each test, preventing a crash.- */- @BindValue- @get:Rule(order = 1)- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-- /**- * Grant [android.Manifest.permission.POST_NOTIFICATIONS] permission.- */- @get:Rule(order = 2)- val postNotificationsPermission = GrantPostNotificationsPermissionRule()-- /**- * Use a test activity to set the content on.- */- @get:Rule(order = 3)- val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()-- val userNewsResourceRepository = CompositeUserNewsResourceRepository(- newsRepository = TestNewsRepository(),- userDataRepository = TestUserDataRepository(),- )-- @Inject- lateinit var networkMonitor: NetworkMonitor-- @Inject- lateinit var timeZoneMonitor: TimeZoneMonitor-- @Before- fun setup() {- hiltRule.inject()- }-- @Test- fun compactWidth_compactHeight_showsNavigationBar() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 400.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()- }-- @Test- fun mediumWidth_compactHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 400.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Test- fun expandedWidth_compactHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 400.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Test- fun compactWidth_mediumHeight_showsNavigationBar() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 500.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()- }-- @Test- fun mediumWidth_mediumHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 500.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Test- fun expandedWidth_mediumHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 500.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Test- fun compactWidth_expandedHeight_showsNavigationBar() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 1000.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()- }-- @Test- fun mediumWidth_expandedHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 1000.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Test- fun expandedWidth_expandedHeight_showsNavigationRail() {- composeTestRule.setContent {- DeviceConfigurationOverride(- DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 1000.dp)),- ) {- BoxWithConstraints {- NiaApp(fakeAppState(maxWidth, maxHeight))- }- }- }-- composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()- composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()- }-- @Composable- private fun fakeAppState(maxWidth: Dp, maxHeight: Dp) = rememberNiaAppState(- windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(maxWidth, maxHeight)),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )-}diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.ktindex 7c9dfcc7a..c2c74458d 100644--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt@@ -16,15 +16,11 @@package com.google.samples.apps.nowinandroid.ui-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi-import androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.rememberimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.test.junit4.createComposeRule-import androidx.compose.ui.unit.DpSize-import androidx.compose.ui.unit.dpimport androidx.navigation.NavHostControllerimport androidx.navigation.compose.ComposeNavigatorimport androidx.navigation.compose.composable@@ -43,7 +39,6 @@ import kotlinx.datetime.TimeZoneimport org.junit.Ruleimport org.junit.Testimport kotlin.test.assertEquals-import kotlin.test.assertFalseimport kotlin.test.assertTrue/**@@ -52,7 +47,6 @@ import kotlin.test.assertTrue* Note: This could become an unit test if Robolectric is added to the project and the Context* is faked.*/-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)class NiaAppStateTest {@get:Rule@@ -79,7 +73,6 @@ class NiaAppStateTest {NiaAppState(navController = navController,coroutineScope = backgroundScope,- windowSizeClass = getCompactWindowClass(),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -102,7 +95,6 @@ class NiaAppStateTest {fun niaAppState_destinations() = runTest {composeTestRule.setContent {state = rememberNiaAppState(- windowSizeClass = getCompactWindowClass(),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -115,64 +107,12 @@ class NiaAppStateTest {assertTrue(state.topLevelDestinations[2].name.contains("interests", true))}- @Test- fun niaAppState_showBottomBar_compact() = runTest {- composeTestRule.setContent {- state = NiaAppState(- navController = NavHostController(LocalContext.current),- coroutineScope = backgroundScope,- windowSizeClass = getCompactWindowClass(),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )- }-- assertTrue(state.shouldShowBottomBar)- assertFalse(state.shouldShowNavRail)- }-- @Test- fun niaAppState_showNavRail_medium() = runTest {- composeTestRule.setContent {- state = NiaAppState(- navController = NavHostController(LocalContext.current),- coroutineScope = backgroundScope,- windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )- }-- assertTrue(state.shouldShowNavRail)- assertFalse(state.shouldShowBottomBar)- }-- @Test- fun niaAppState_showNavRail_large() = runTest {- composeTestRule.setContent {- state = NiaAppState(- navController = NavHostController(LocalContext.current),- coroutineScope = backgroundScope,- windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )- }-- assertTrue(state.shouldShowNavRail)- assertFalse(state.shouldShowBottomBar)- }-@Testfun niaAppState_whenNetworkMonitorIsOffline_StateIsOffline() = runTest(UnconfinedTestDispatcher()) {composeTestRule.setContent {state = NiaAppState(navController = NavHostController(LocalContext.current),coroutineScope = backgroundScope,- windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -193,7 +133,6 @@ class NiaAppStateTest {state = NiaAppState(navController = NavHostController(LocalContext.current),coroutineScope = backgroundScope,- windowSizeClass = getCompactWindowClass(),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -207,8 +146,6 @@ class NiaAppStateTest {state.currentTimeZone.value,)}-- private fun getCompactWindowClass() = WindowSizeClass.calculateFromSize(DpSize(500.dp, 300.dp))}@Composablediff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.ktindex ad95c297f..2f8572102 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -23,8 +23,7 @@ import androidx.activity.compose.setContentimport androidx.activity.enableEdgeToEdgeimport androidx.activity.viewModelsimport androidx.compose.foundation.isSystemInDarkTheme-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.DisposableEffect@@ -58,7 +57,6 @@ import javax.inject.Injectprivate const val TAG = "MainActivity"-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)@AndroidEntryPointclass MainActivity : ComponentActivity() {@@ -134,7 +132,6 @@ class MainActivity : ComponentActivity() {}val appState = rememberNiaAppState(- windowSizeClass = calculateWindowSizeClass(this),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -151,6 +148,7 @@ class MainActivity : ComponentActivity() {androidTheme = shouldUseAndroidTheme(uiState),disableDynamicTheming = shouldDisableDynamicTheming(uiState),) {+ @OptIn(ExperimentalMaterial3AdaptiveApi::class)NiaApp(appState)}}diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex 4c8232a26..218ea8625 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.uiimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column-import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.WindowInsetsimport androidx.compose.foundation.layout.WindowInsetsSidesimport androidx.compose.foundation.layout.consumeWindowInsets@@ -26,7 +25,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.onlyimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.safeDrawing-import androidx.compose.foundation.layout.safeDrawingPaddingimport androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon@@ -39,6 +37,9 @@ import androidx.compose.material3.SnackbarHostStateimport androidx.compose.material3.SnackbarResult.ActionPerformedimport androidx.compose.material3.Textimport androidx.compose.material3.TopAppBarDefaults+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi+import androidx.compose.material3.adaptive.WindowAdaptiveInfo+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue@@ -63,10 +64,7 @@ import androidx.navigation.NavDestination.Companion.hierarchyimport com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRail-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailItem+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationSuiteScaffoldimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAppBarimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors@@ -76,8 +74,13 @@ import com.google.samples.apps.nowinandroid.navigation.NiaNavHostimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationimport com.google.samples.apps.nowinandroid.feature.settings.R as settingsR+@OptIn(ExperimentalMaterial3AdaptiveApi::class)@Composable-fun NiaApp(appState: NiaAppState, modifier: Modifier = Modifier) {+fun NiaApp(+ appState: NiaAppState,+ modifier: Modifier = Modifier,+ windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),+) {val shouldShowGradientBackground =appState.currentTopLevelDestination == TopLevelDestination.FOR_YOUvar showSettingsDialog by rememberSaveable { mutableStateOf(false) }@@ -111,13 +114,18 @@ fun NiaApp(appState: NiaAppState, modifier: Modifier = Modifier) {showSettingsDialog = showSettingsDialog,onSettingsDismissed = { showSettingsDialog = false },onTopAppBarActionClick = { showSettingsDialog = true },+ windowAdaptiveInfo = windowAdaptiveInfo,)}}}@Composable-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)+@OptIn(+ ExperimentalMaterial3Api::class,+ ExperimentalComposeUiApi::class,+ ExperimentalMaterial3AdaptiveApi::class,+)internal fun NiaApp(appState: NiaAppState,snackbarHostState: SnackbarHostState,@@ -125,59 +133,69 @@ internal fun NiaApp(onSettingsDismissed: () -> Unit,onTopAppBarActionClick: () -> Unit,modifier: Modifier = Modifier,+ windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),) {val unreadDestinations by appState.topLevelDestinationsWithUnreadResources.collectAsStateWithLifecycle()+ val currentDestination = appState.currentDestinationif (showSettingsDialog) {SettingsDialog(onDismiss = { onSettingsDismissed() },)}- Scaffold(- modifier = modifier.semantics {- testTagsAsResourceId = true- },- containerColor = Color.Transparent,- contentColor = MaterialTheme.colorScheme.onBackground,- contentWindowInsets = WindowInsets(0, 0, 0, 0),- snackbarHost = { SnackbarHost(snackbarHostState) },- bottomBar = {- if (appState.shouldShowBottomBar) {- NiaBottomBar(- destinations = appState.topLevelDestinations,- destinationsWithUnreadResources = unreadDestinations,- onNavigateToDestination = appState::navigateToTopLevelDestination,- currentDestination = appState.currentDestination,- modifier = Modifier.testTag("NiaBottomBar"),++ NiaNavigationSuiteScaffold(+ navigationSuiteItems = {+ appState.topLevelDestinations.forEach { destination ->+ val hasUnread = unreadDestinations.contains(destination)+ val selected = currentDestination+ .isTopLevelDestinationInHierarchy(destination)+ item(+ selected = selected,+ onClick = { appState.navigateToTopLevelDestination(destination) },+ icon = {+ Icon(+ imageVector = destination.unselectedIcon,+ contentDescription = null,+ )+ },+ selectedIcon = {+ Icon(+ imageVector = destination.selectedIcon,+ contentDescription = null,+ )+ },+ label = { Text(stringResource(destination.iconTextId)) },+ modifier =+ Modifier+ .testTag("NiaNavItem")+ .then(if (hasUnread) Modifier.notificationDot() else Modifier),)}},- ) { padding ->- Row(- Modifier- .fillMaxSize()- .padding(padding)- .consumeWindowInsets(padding)- .windowInsetsPadding(- WindowInsets.safeDrawing.only(- WindowInsetsSides.Horizontal,+ windowAdaptiveInfo = windowAdaptiveInfo,+ ) {+ Scaffold(+ modifier = modifier.semantics {+ testTagsAsResourceId = true+ },+ containerColor = Color.Transparent,+ contentColor = MaterialTheme.colorScheme.onBackground,+ contentWindowInsets = WindowInsets(0, 0, 0, 0),+ snackbarHost = { SnackbarHost(snackbarHostState) },+ ) { padding ->+ Column(+ Modifier+ .fillMaxSize()+ .padding(padding)+ .consumeWindowInsets(padding)+ .windowInsetsPadding(+ WindowInsets.safeDrawing.only(+ WindowInsetsSides.Horizontal,+ ),),- ),- ) {- if (appState.shouldShowNavRail) {- NiaNavRail(- destinations = appState.topLevelDestinations,- destinationsWithUnreadResources = unreadDestinations,- onNavigateToDestination = appState::navigateToTopLevelDestination,- currentDestination = appState.currentDestination,- modifier = Modifier- .testTag("NiaNavRail")- .safeDrawingPadding(),- )- }-- Column(Modifier.fillMaxSize()) {+ ) {// Show the top app bar on top level destinations.val destination = appState.currentTopLevelDestinationval shouldShowTopAppBar = destination != null@@ -220,80 +238,10 @@ internal fun NiaApp(},)}- }-- // TODO: We may want to add padding or spacer when the snackbar is shown so that- // content doesn't display behind it.- }- }-}--@Composable-private fun NiaNavRail(- destinations: List<TopLevelDestination>,- destinationsWithUnreadResources: Set<TopLevelDestination>,- onNavigateToDestination: (TopLevelDestination) -> Unit,- currentDestination: NavDestination?,- modifier: Modifier = Modifier,-) {- NiaNavigationRail(modifier = modifier) {- destinations.forEach { destination ->- val selected = currentDestination.isTopLevelDestinationInHierarchy(destination)- val hasUnread = destinationsWithUnreadResources.contains(destination)- NiaNavigationRailItem(- selected = selected,- onClick = { onNavigateToDestination(destination) },- icon = {- Icon(- imageVector = destination.unselectedIcon,- contentDescription = null,- )- },- selectedIcon = {- Icon(- imageVector = destination.selectedIcon,- contentDescription = null,- )- },- label = { Text(stringResource(destination.iconTextId)) },- modifier = if (hasUnread) Modifier.notificationDot() else Modifier,- )- }- }-}-@Composable-private fun NiaBottomBar(- destinations: List<TopLevelDestination>,- destinationsWithUnreadResources: Set<TopLevelDestination>,- onNavigateToDestination: (TopLevelDestination) -> Unit,- currentDestination: NavDestination?,- modifier: Modifier = Modifier,-) {- NiaNavigationBar(- modifier = modifier,- ) {- destinations.forEach { destination ->- val hasUnread = destinationsWithUnreadResources.contains(destination)- val selected = currentDestination.isTopLevelDestinationInHierarchy(destination)- NiaNavigationBarItem(- selected = selected,- onClick = { onNavigateToDestination(destination) },- icon = {- Icon(- imageVector = destination.unselectedIcon,- contentDescription = null,- )- },- selectedIcon = {- Icon(- imageVector = destination.selectedIcon,- contentDescription = null,- )- },- label = { Text(stringResource(destination.iconTextId)) },- modifier = if (hasUnread) Modifier.notificationDot() else Modifier,- )+ // TODO: We may want to add padding or spacer when the snackbar is shown so that+ // content doesn't display behind it.+ }}}}diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex b653d8910..519603579 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -16,8 +16,6 @@package com.google.samples.apps.nowinandroid.ui-import androidx.compose.material3.windowsizeclass.WindowSizeClass-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.runtime.Composableimport androidx.compose.runtime.Stableimport androidx.compose.runtime.remember@@ -55,7 +53,6 @@ import kotlinx.datetime.TimeZone@Composablefun rememberNiaAppState(- windowSizeClass: WindowSizeClass,networkMonitor: NetworkMonitor,userNewsResourceRepository: UserNewsResourceRepository,timeZoneMonitor: TimeZoneMonitor,@@ -66,7 +63,6 @@ fun rememberNiaAppState(return remember(navController,coroutineScope,- windowSizeClass,networkMonitor,userNewsResourceRepository,timeZoneMonitor,@@ -74,7 +70,6 @@ fun rememberNiaAppState(NiaAppState(navController = navController,coroutineScope = coroutineScope,- windowSizeClass = windowSizeClass,networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,@@ -86,7 +81,6 @@ fun rememberNiaAppState(class NiaAppState(val navController: NavHostController,coroutineScope: CoroutineScope,- val windowSizeClass: WindowSizeClass,networkMonitor: NetworkMonitor,userNewsResourceRepository: UserNewsResourceRepository,timeZoneMonitor: TimeZoneMonitor,@@ -103,12 +97,6 @@ class NiaAppState(else -> null}- val shouldShowBottomBar: Boolean- get() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact-- val shouldShowNavRail: Boolean- get() = !shouldShowBottomBar-val isOffline = networkMonitor.isOnline.map(Boolean::not).stateIn(diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.ktindex 32bdfe9d9..1cca5a13a 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt@@ -16,8 +16,9 @@package com.google.samples.apps.nowinandroid.ui-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi-import androidx.compose.material3.windowsizeclass.WindowSizeClass+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi+import androidx.compose.material3.adaptive.Posture+import androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.ui.platform.LocalInspectionModeimport androidx.compose.ui.test.DeviceConfigurationOverride@@ -27,6 +28,7 @@ import androidx.compose.ui.test.onRootimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dp+import androidx.window.core.layout.WindowSizeClassimport com.github.takahirom.roborazzi.captureRoboImageimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository@@ -57,7 +59,6 @@ import javax.inject.Inject/*** Tests that the navigation UI is rendered correctly on different screen sizes.*/-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)@RunWith(RobolectricTestRunner::class)@GraphicsMode(GraphicsMode.Mode.NATIVE)// Configure Robolectric to use a very large screen size that can fit all of the test sizes.@@ -122,6 +123,7 @@ class NiaAppScreenSizesScreenshotTests {TimeZone.setDefault(TimeZone.getTimeZone("UTC"))}+ @OptIn(ExperimentalMaterial3AdaptiveApi::class)private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) {composeTestRule.setContent {CompositionLocalProvider(@@ -132,14 +134,20 @@ class NiaAppScreenSizesScreenshotTests {) {NiaTheme {val fakeAppState = rememberNiaAppState(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(width, height),- ),networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,)- NiaApp(fakeAppState)+ NiaApp(+ fakeAppState,+ windowAdaptiveInfo = WindowAdaptiveInfo(+ windowSizeClass = WindowSizeClass.compute(+ width.value,+ height.value,+ ),+ windowPosture = Posture(),+ ),+ )}}}@@ -162,20 +170,20 @@ class NiaAppScreenSizesScreenshotTests {}@Test- fun mediumWidth_compactHeight_showsNavigationRail() {+ fun mediumWidth_compactHeight_showsNavigationBar() {testNiaAppScreenshotWithSize(610.dp,400.dp,- "mediumWidth_compactHeight_showsNavigationRail",+ "mediumWidth_compactHeight_showsNavigationBar",)}@Test- fun expandedWidth_compactHeight_showsNavigationRail() {+ fun expandedWidth_compactHeight_showsNavigationBar() {testNiaAppScreenshotWithSize(900.dp,400.dp,- "expandedWidth_compactHeight_showsNavigationRail",+ "expandedWidth_compactHeight_showsNavigationBar",)}diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.ktindex ab67f8399..6f12dd620 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt@@ -19,8 +19,9 @@ package com.google.samples.apps.nowinandroid.uiimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.material3.SnackbarDuration.Indefiniteimport androidx.compose.material3.SnackbarHostState-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi-import androidx.compose.material3.windowsizeclass.WindowSizeClass+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi+import androidx.compose.material3.adaptive.Posture+import androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.ui.platform.LocalInspectionMode@@ -31,6 +32,7 @@ import androidx.compose.ui.test.onRootimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dp+import androidx.window.core.layout.WindowSizeClassimport com.github.takahirom.roborazzi.captureRoboImageimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository@@ -63,7 +65,6 @@ import javax.inject.Inject/*** Tests that the Snackbar is correctly displayed on different screen sizes.*/-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)@RunWith(RobolectricTestRunner::class)@GraphicsMode(GraphicsMode.Mode.NATIVE)// Configure Robolectric to use a very large screen size that can fit all of the test sizes.@@ -191,6 +192,7 @@ class SnackbarScreenshotTests {}}+ @OptIn(ExperimentalMaterial3AdaptiveApi::class)private fun testSnackbarScreenshotWithSize(snackbarHostState: SnackbarHostState,width: Dp,@@ -210,16 +212,26 @@ class SnackbarScreenshotTests {DeviceConfigurationOverride.ForcedSize(DpSize(width, height)),) {BoxWithConstraints {- val appState = rememberNiaAppState(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )NiaTheme {- NiaApp(appState, snackbarHostState, false, {}, {})+ val appState = rememberNiaAppState(+ networkMonitor = networkMonitor,+ userNewsResourceRepository = userNewsResourceRepository,+ timeZoneMonitor = timeZoneMonitor,+ )+ NiaApp(+ appState = appState,+ snackbarHostState = snackbarHostState,+ showSettingsDialog = false,+ onSettingsDismissed = {},+ onTopAppBarActionClick = {},+ windowAdaptiveInfo = WindowAdaptiveInfo(+ windowSizeClass = WindowSizeClass.compute(+ maxWidth.value,+ maxHeight.value,+ ),+ windowPosture = Posture(),+ ),+ )}}}diff --git a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.pngindex 011a97e37..c15bd46d4 100644Binary files a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png differdiff --git a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.pngindex 279efe6d0..2ae1cd48c 100644Binary files a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png differdiff --git a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.pngindex 0754d5b35..a8f4150c8 100644Binary files a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png differdiff --git a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.pngnew file mode 100644index 000000000..a7d21036fBinary files /dev/null and b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png differdiff --git a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.pngdeleted file mode 100644index f4dfb09aa..000000000Binary files a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png and /dev/null differdiff --git a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.pngnew file mode 100644index 000000000..94c0fc25dBinary files /dev/null and b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png differdiff --git a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.pngdeleted file mode 100644index 5ed3d9445..000000000Binary files a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png and /dev/null differdiff --git a/app/src/testDemo/screenshots/snackbar_compact_medium.png b/app/src/testDemo/screenshots/snackbar_compact_medium.pngindex 147c9ce6b..116520db1 100644Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium.png and b/app/src/testDemo/screenshots/snackbar_compact_medium.png differdiff --git a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.pngindex 2767ff9b5..417f355fb 100644Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png and b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png differdiff --git a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png b/app/src/testDemo/screenshots/snackbar_expanded_expanded.pngindex 5360d68de..4997a83af 100644Binary files a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png and b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png differdiff --git a/app/src/testDemo/screenshots/snackbar_medium_medium.png b/app/src/testDemo/screenshots/snackbar_medium_medium.pngindex b60112101..36fffa9c6 100644Binary files a/app/src/testDemo/screenshots/snackbar_medium_medium.png and b/app/src/testDemo/screenshots/snackbar_medium_medium.png differdiff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.ktsindex cf3e4c51f..c4d92b0f7 100644--- a/core/designsystem/build.gradle.kts+++ b/core/designsystem/build.gradle.kts@@ -34,6 +34,8 @@ dependencies {api(libs.androidx.compose.foundation.layout)api(libs.androidx.compose.material.iconsExtended)api(libs.androidx.compose.material3)+ api(libs.androidx.compose.material3.adaptive)+ api(libs.androidx.compose.material3.navigationSuite)api(libs.androidx.compose.runtime)api(libs.androidx.compose.ui.util)diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.ktindex 59f4f48a2..4ac19b482 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt@@ -23,10 +23,20 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.NavigationBarimport androidx.compose.material3.NavigationBarItemimport androidx.compose.material3.NavigationBarItemDefaults+import androidx.compose.material3.NavigationDrawerItemDefaultsimport androidx.compose.material3.NavigationRailimport androidx.compose.material3.NavigationRailItemimport androidx.compose.material3.NavigationRailItemDefaultsimport androidx.compose.material3.Text+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi+import androidx.compose.material3.adaptive.WindowAdaptiveInfo+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo+import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffoldDefaults+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScopeimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color@@ -165,6 +175,101 @@ fun NiaNavigationRail()}+/**+ * Now in Android navigation suite scaffold with item and content slots.+ * Wraps Material 3 [NavigationSuiteScaffold].+ *+ * @param modifier Modifier to be applied to the navigation suite scaffold.+ * @param navigationSuiteItems A slot to display multiple items via [NiaNavigationSuiteScope].+ * @param windowAdaptiveInfo The window adaptive info.+ * @param content The app content inside the scaffold.+ */+@OptIn(+ ExperimentalMaterial3AdaptiveNavigationSuiteApi::class,+ ExperimentalMaterial3AdaptiveApi::class,+)+@Composable+fun NiaNavigationSuiteScaffold(+ navigationSuiteItems: NiaNavigationSuiteScope.() -> Unit,+ modifier: Modifier = Modifier,+ windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),+ content: @Composable () -> Unit,+) {+ val layoutType = NavigationSuiteScaffoldDefaults+ .calculateFromAdaptiveInfo(windowAdaptiveInfo)+ val navigationSuiteItemColors = NavigationSuiteItemColors(+ navigationBarItemColors = NavigationBarItemDefaults.colors(+ selectedIconColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedIconColor = NiaNavigationDefaults.navigationContentColor(),+ selectedTextColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedTextColor = NiaNavigationDefaults.navigationContentColor(),+ indicatorColor = NiaNavigationDefaults.navigationIndicatorColor(),+ ),+ navigationRailItemColors = NavigationRailItemDefaults.colors(+ selectedIconColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedIconColor = NiaNavigationDefaults.navigationContentColor(),+ selectedTextColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedTextColor = NiaNavigationDefaults.navigationContentColor(),+ indicatorColor = NiaNavigationDefaults.navigationIndicatorColor(),+ ),+ navigationDrawerItemColors = NavigationDrawerItemDefaults.colors(+ selectedIconColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedIconColor = NiaNavigationDefaults.navigationContentColor(),+ selectedTextColor = NiaNavigationDefaults.navigationSelectedItemColor(),+ unselectedTextColor = NiaNavigationDefaults.navigationContentColor(),+ ),+ )++ NavigationSuiteScaffold(+ navigationSuiteItems = {+ NiaNavigationSuiteScope(+ navigationSuiteScope = this,+ navigationSuiteItemColors = navigationSuiteItemColors,+ ).run(navigationSuiteItems)+ },+ layoutType = layoutType,+ containerColor = Color.Transparent,+ navigationSuiteColors = NavigationSuiteDefaults.colors(+ navigationBarContentColor = NiaNavigationDefaults.navigationContentColor(),+ navigationRailContainerColor = Color.Transparent,+ ),+ modifier = modifier,+ ) {+ content()+ }+}++/**+ * A wrapper around [NavigationSuiteScope] to declare navigation items.+ */+@OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class)+class NiaNavigationSuiteScope internal constructor(+ private val navigationSuiteScope: NavigationSuiteScope,+ private val navigationSuiteItemColors: NavigationSuiteItemColors,+) {+ fun item(+ selected: Boolean,+ onClick: () -> Unit,+ modifier: Modifier = Modifier,+ icon: @Composable () -> Unit,+ selectedIcon: @Composable () -> Unit = icon,+ label: @Composable (() -> Unit)? = null,+ ) = navigationSuiteScope.item(+ selected = selected,+ onClick = onClick,+ icon = {+ if (selected) {+ selectedIcon()+ } else {+ icon()+ }+ },+ label = label,+ colors = navigationSuiteItemColors,+ modifier = modifier,+ )+}+@ThemePreviews@Composablefun NiaNavigationBarPreview() {diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.pngindex 74309056f..570474cc1 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png and b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.pngindex ac0065cc7..022ea15eb 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.pngindex 0133bc71a..0a7be72c2 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.pngindex 2f1d9767c..ddc43ab6a 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.pngindex d90547cd8..071ab0a04 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.pngindex 142051d68..7170dec31 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png differdiff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.pngindex 6949a8908..6829b0f78 100644Binary files a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.pngindex 92d2978e0..f362c445d 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.png and b/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.pngindex 0e6aedd53..8d02e5985 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.png and b/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.pngindex 88b6ce240..e6f6a527a 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.png and b/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.pngindex 1972b1ca2..f5ca39c3a 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.pngindex 16df589f9..7a3f99d7c 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.pngindex d28704e49..3a14048b5 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.pngindex c2a01f2d8..97458f73b 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png differdiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 6bc85e10e..e6f5e2c90 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -7,10 +7,11 @@ androidTools = "31.3.0"androidxActivity = "1.8.0"androidxAppCompat = "1.6.1"androidxBrowser = "1.8.0"+androidxComposeAlpha = "1.7.0-alpha08"androidxComposeBom = "2024.02.02"-androidxComposeCompiler = "1.5.8"-androidxComposeUiTest = "1.7.0-alpha06"-androidxComposeMaterial3Adaptive = "1.0.0-alpha10"+androidxComposeCompiler = "1.5.12"+androidxComposeMaterial3Adaptive = "1.0.0-alpha12"+androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha07"androidxComposeRuntimeTracing = "1.0.0-beta01"androidxCore = "1.12.0"androidxCoreSplashscreen = "1.0.1"@@ -42,11 +43,11 @@ hilt = "2.51"hiltExt = "1.1.0"jacoco = "0.8.7"junit4 = "4.13.2"-kotlin = "1.9.22"+kotlin = "1.9.23"kotlinxCoroutines = "1.8.0"kotlinxDatetime = "0.5.0"kotlinxSerializationJson = "1.6.3"-ksp = "1.9.22-1.0.18"+ksp = "1.9.23-1.0.20"moduleGraph = "2.5.0"okhttp = "4.12.0"protobuf = "3.25.2"@@ -68,17 +69,18 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", versionandroidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" }androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }-androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxComposeAlpha" }androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }+androidx-compose-material3-navigationSuite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite", version.ref = "androidxComposeMaterial3AdaptiveNavigationSuite" }androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }-androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeUiTest" }+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeAlpha" }androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }