diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index 0ab9af436..b9135ed42 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.2 androidx.activity:activity-ktx:1.8.2 androidx.activity:activity:1.8.2 androidx.annotation:annotation-experimental:1.4.0 -androidx.annotation:annotation-jvm:1.8.0-rc01 -androidx.annotation:annotation:1.8.0-rc01 +androidx.annotation:annotation-jvm:1.8.0 +androidx.annotation:annotation:1.8.0 androidx.appcompat:appcompat-resources:1.6.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 @@ -12,44 +12,44 @@ androidx.browser:browser:1.8.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 -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-alpha07 -androidx.compose.material3:material3-android:1.2.1 -androidx.compose.material3:material3:1.2.1 +androidx.compose.animation:animation-android:1.7.0-beta01 +androidx.compose.animation:animation-core-android:1.7.0-beta01 +androidx.compose.animation:animation-core:1.7.0-beta01 +androidx.compose.animation:animation:1.7.0-beta01 +androidx.compose.foundation:foundation-android:1.7.0-beta01 +androidx.compose.foundation:foundation-layout-android:1.7.0-beta01 +androidx.compose.foundation:foundation-layout:1.7.0-beta01 +androidx.compose.foundation:foundation:1.7.0-beta01 +androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive:1.0.0-beta01 +androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01 +androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01 +androidx.compose.material3:material3-android:1.3.0-beta01 +androidx.compose.material3:material3:1.3.0-beta01 androidx.compose.material:material-icons-core-android:1.6.3 androidx.compose.material:material-icons-core:1.6.3 androidx.compose.material:material-icons-extended-android:1.6.3 androidx.compose.material:material-icons-extended:1.6.3 -androidx.compose.material:material-ripple-android:1.6.3 -androidx.compose.material:material-ripple: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-alpha08 +androidx.compose.material:material-ripple-android:1.7.0-beta01 +androidx.compose.material:material-ripple:1.7.0-beta01 +androidx.compose.runtime:runtime-android:1.7.0-beta01 +androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01 +androidx.compose.runtime:runtime-saveable:1.7.0-beta01 +androidx.compose.runtime:runtime:1.7.0-beta01 +androidx.compose.ui:ui-android:1.7.0-beta01 +androidx.compose.ui:ui-geometry-android:1.7.0-beta01 +androidx.compose.ui:ui-geometry:1.7.0-beta01 +androidx.compose.ui:ui-graphics-android:1.7.0-beta01 +androidx.compose.ui:ui-graphics:1.7.0-beta01 +androidx.compose.ui:ui-text-android:1.7.0-beta01 +androidx.compose.ui:ui-text:1.7.0-beta01 +androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01 +androidx.compose.ui:ui-tooling-preview:1.7.0-beta01 +androidx.compose.ui:ui-unit-android:1.7.0-beta01 +androidx.compose.ui:ui-unit:1.7.0-beta01 +androidx.compose.ui:ui-util-android:1.7.0-beta01 +androidx.compose.ui:ui-util:1.7.0-beta01 +androidx.compose.ui:ui:1.7.0-beta01 androidx.compose:compose-bom:2024.02.02 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.13.1 @@ -61,23 +61,23 @@ androidx.exifinterface:exifinterface:1.3.7 androidx.fragment:fragment:1.5.1 androidx.graphics:graphics-path:1.0.1 androidx.interpolator:interpolator:1.0.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-rc01 +androidx.lifecycle:lifecycle-common-java8:2.8.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.0 +androidx.lifecycle:lifecycle-common:2.8.0 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0 +androidx.lifecycle:lifecycle-livedata-core:2.8.0 +androidx.lifecycle:lifecycle-livedata:2.8.0 +androidx.lifecycle:lifecycle-process:2.8.0 +androidx.lifecycle:lifecycle-runtime-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-compose:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.0 +androidx.lifecycle:lifecycle-runtime:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0 +androidx.lifecycle:lifecycle-viewmodel:2.8.0 androidx.loader:loader:1.0.0 androidx.metrics:metrics-performance:1.0.0-alpha04 androidx.profileinstaller:profileinstaller:1.3.1 @@ -91,15 +91,15 @@ androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.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-beta01 +androidx.window:window-core-android:1.3.0-beta02 +androidx.window:window-core:1.3.0-beta02 +androidx.window:window:1.3.0-beta02 com.google.accompanist:accompanist-drawablepainter:0.32.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.dagger:dagger-lint-aar:2.51 -com.google.dagger:dagger:2.51 -com.google.dagger:hilt-android:2.51 -com.google.dagger:hilt-core:2.51 +com.google.dagger:dagger-lint-aar:2.51.1 +com.google.dagger:dagger:2.51.1 +com.google.dagger:hilt-android:2.51.1 +com.google.dagger:hilt-core:2.51.1 com.google.guava:listenablefuture:1.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.8.0 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 71b1fcd00..214ae5ca8 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.8.2 androidx.activity:activity-ktx:1.8.2 androidx.activity:activity:1.8.2 androidx.annotation:annotation-experimental:1.4.0 -androidx.annotation:annotation-jvm:1.8.0-rc01 -androidx.annotation:annotation:1.8.0-rc01 +androidx.annotation:annotation-jvm:1.8.0 +androidx.annotation:annotation:1.8.0 androidx.appcompat:appcompat-resources:1.6.1 androidx.appcompat:appcompat:1.6.1 androidx.arch.core:core-common:2.2.0 @@ -13,51 +13,51 @@ androidx.browser:browser:1.8.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 -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-alpha07 -androidx.compose.material3:material3-android:1.2.1 -androidx.compose.material3:material3-window-size-class-android:1.2.1 -androidx.compose.material3:material3-window-size-class:1.2.1 -androidx.compose.material3:material3:1.2.1 +androidx.compose.animation:animation-android:1.7.0-beta01 +androidx.compose.animation:animation-core-android:1.7.0-beta01 +androidx.compose.animation:animation-core:1.7.0-beta01 +androidx.compose.animation:animation:1.7.0-beta01 +androidx.compose.foundation:foundation-android:1.7.0-beta01 +androidx.compose.foundation:foundation-layout-android:1.7.0-beta01 +androidx.compose.foundation:foundation-layout:1.7.0-beta01 +androidx.compose.foundation:foundation:1.7.0-beta01 +androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta01 +androidx.compose.material3.adaptive:adaptive:1.0.0-beta01 +androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01 +androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01 +androidx.compose.material3:material3-android:1.3.0-beta01 +androidx.compose.material3:material3-window-size-class-android:1.3.0-beta01 +androidx.compose.material3:material3-window-size-class:1.3.0-beta01 +androidx.compose.material3:material3:1.3.0-beta01 androidx.compose.material:material-icons-core-android:1.6.3 androidx.compose.material:material-icons-core:1.6.3 androidx.compose.material:material-icons-extended-android:1.6.3 androidx.compose.material:material-icons-extended:1.6.3 -androidx.compose.material:material-ripple-android:1.6.3 -androidx.compose.material:material-ripple: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.material:material-ripple-android:1.7.0-beta01 +androidx.compose.material:material-ripple:1.7.0-beta01 +androidx.compose.runtime:runtime-android:1.7.0-beta01 +androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01 +androidx.compose.runtime:runtime-saveable:1.7.0-beta01 androidx.compose.runtime:runtime-tracing:1.0.0-beta01 -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-alpha08 +androidx.compose.runtime:runtime:1.7.0-beta01 +androidx.compose.ui:ui-android:1.7.0-beta01 +androidx.compose.ui:ui-geometry-android:1.7.0-beta01 +androidx.compose.ui:ui-geometry:1.7.0-beta01 +androidx.compose.ui:ui-graphics-android:1.7.0-beta01 +androidx.compose.ui:ui-graphics:1.7.0-beta01 +androidx.compose.ui:ui-text-android:1.7.0-beta01 +androidx.compose.ui:ui-text:1.7.0-beta01 +androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01 +androidx.compose.ui:ui-tooling-preview:1.7.0-beta01 +androidx.compose.ui:ui-unit-android:1.7.0-beta01 +androidx.compose.ui:ui-unit:1.7.0-beta01 +androidx.compose.ui:ui-util-android:1.7.0-beta01 +androidx.compose.ui:ui-util:1.7.0-beta01 +androidx.compose.ui:ui:1.7.0-beta01 androidx.compose:compose-bom:2024.02.02 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.13.1 @@ -83,26 +83,26 @@ androidx.hilt:hilt-navigation:1.2.0 androidx.hilt:hilt-work:1.1.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.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-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-rc01 +androidx.lifecycle:lifecycle-common-java8:2.8.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.0 +androidx.lifecycle:lifecycle-common:2.8.0 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0 +androidx.lifecycle:lifecycle-livedata-core:2.8.0 +androidx.lifecycle:lifecycle-livedata:2.8.0 +androidx.lifecycle:lifecycle-process:2.8.0 +androidx.lifecycle:lifecycle-runtime-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-compose:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.0 +androidx.lifecycle:lifecycle-runtime:2.8.0 +androidx.lifecycle:lifecycle-service:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0 +androidx.lifecycle:lifecycle-viewmodel:2.8.0 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-alpha04 @@ -132,9 +132,9 @@ androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.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-beta01 +androidx.window:window-core-android:1.3.0-beta02 +androidx.window:window-core:1.3.0-beta02 +androidx.window:window:1.3.0-beta02 androidx.work:work-runtime-ktx:2.9.0 androidx.work:work-runtime:2.9.0 com.caverock:androidsvg-aar:1.4 @@ -157,10 +157,10 @@ com.google.android.gms:play-services-oss-licenses:17.0.1 com.google.android.gms:play-services-stats:17.0.2 com.google.android.gms:play-services-tasks:18.0.2 com.google.code.findbugs:jsr305:3.0.2 -com.google.dagger:dagger-lint-aar:2.51 -com.google.dagger:dagger:2.51 -com.google.dagger:hilt-android:2.51 -com.google.dagger:hilt-core:2.51 +com.google.dagger:dagger-lint-aar:2.51.1 +com.google.dagger:dagger:2.51.1 +com.google.dagger:hilt-android:2.51.1 +com.google.dagger:hilt-core:2.51.1 com.google.errorprone:error_prone_annotations:2.11.0 com.google.firebase:firebase-abt:21.1.1 com.google.firebase:firebase-analytics-ktx:21.4.0 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.kt index 218ea8625..b47984ddb 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 @@ -219,13 +219,14 @@ internal fun NiaApp( } Box( - modifier = if (shouldShowTopAppBar) { - Modifier.consumeWindowInsets( - WindowInsets.safeDrawing.only(WindowInsetsSides.Top), - ) - } else { - Modifier - }, + // Workaround for https://issuetracker.google.com/338478720 + modifier = Modifier.consumeWindowInsets( + if (shouldShowTopAppBar) { + WindowInsets.safeDrawing.only(WindowInsetsSides.Top) + } else { + WindowInsets(0, 0, 0, 0) + }, + ), ) { NiaNavHost( appState = appState, diff --git a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png index c15bd46d4..912fca4c7 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png index 2ae1cd48c..e052b5920 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png index a8f4150c8..668d69146 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png index a7d21036f..1daf5ec34 100644 Binary files a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png index 94c0fc25d..4bc5d2b1c 100644 Binary files a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/snackbar_compact_medium.png b/app/src/testDemo/screenshots/snackbar_compact_medium.png index 116520db1..7676de40a 100644 Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium.png and b/app/src/testDemo/screenshots/snackbar_compact_medium.png differ diff --git a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png index 417f355fb..ff9ed7669 100644 Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png and b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png index 4d4b10caa..b2a0fb99c 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png index 589628199..8836faebc 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png index bfa5a8367..a4abd2d5b 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png index 6e951e42f..97bbb0892 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png index 3c1ab3d40..a526e36c7 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png index 391de3204..5e27d2497 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png index 6a342f7bd..f5671cb14 100644 Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png differ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0efadde8f..e0b938e75 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,10 +7,11 @@ androidTools = "31.4.0" androidxActivity = "1.8.2" androidxAppCompat = "1.6.1" androidxBrowser = "1.8.0" -androidxComposeAlpha = "1.7.0-alpha08" +androidxComposeAlpha = "1.7.0-beta01" androidxComposeBom = "2024.02.02" -androidxComposeMaterial3Adaptive = "1.0.0-alpha12" -androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha07" +androidxComposeCompiler = "1.5.12" +androidxComposeMaterial3Adaptive = "1.0.0-beta01" +androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0-beta01" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" @@ -38,7 +39,7 @@ firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.1" googleOss = "17.0.1" googleOssPlugin = "0.10.6" -hilt = "2.51" +hilt = "2.51.1" hiltExt = "1.1.0" jacoco = "0.8.7" junit4 = "4.13.2"