diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 56e265c45..972f95389 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -100,6 +100,7 @@ dependencies { implementation(libs.androidx.navigation.compose) implementation(libs.androidx.profileinstaller) implementation(libs.androidx.tracing.ktx) + implementation(libs.androidx.window.core) implementation(libs.kotlinx.coroutines.guava) implementation(libs.coil.kt) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 85adaf6fc..7cd6df2d2 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.8.0 androidx.activity:activity-ktx:1.8.0 androidx.activity:activity:1.8.0 androidx.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-beta01 +androidx.annotation:annotation:1.8.0-beta01 androidx.appcompat:appcompat-resources:1.6.1 androidx.appcompat:appcompat:1.6.1 androidx.arch.core:core-common:2.2.0 @@ -13,20 +13,20 @@ 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.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.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.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.material3.adaptive:adaptive-android:1.0.0-alpha08 -androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-alpha08 -androidx.compose.material3.adaptive:adaptive-layout:1.0.0-alpha08 -androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-alpha08 -androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-alpha08 -androidx.compose.material3.adaptive:adaptive:1.0.0-alpha08 +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.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 @@ -37,25 +37,25 @@ 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.6.3 -androidx.compose.runtime:runtime-saveable-android:1.6.3 -androidx.compose.runtime:runtime-saveable: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-tracing:1.0.0-beta01 -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: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:compose-bom:2024.02.02 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.12.0 @@ -74,26 +74,32 @@ androidx.emoji2:emoji2-views-helper:1.3.0 androidx.emoji2:emoji2:1.3.0 androidx.exifinterface:exifinterface:1.3.7 androidx.fragment:fragment:1.5.1 +androidx.graphics:graphics-path:1.0.0-beta02 androidx.hilt:hilt-common:1.1.0 androidx.hilt:hilt-navigation-compose:1.2.0 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.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-compose:2.7.0 -androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 -androidx.lifecycle:lifecycle-runtime:2.7.0 -androidx.lifecycle:lifecycle-service:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-compose: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-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.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-alpha04 @@ -123,9 +129,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-alpha02 -androidx.window:window-core:1.3.0-alpha02 -androidx.window:window:1.3.0-alpha02 +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.work:work-runtime-ktx:2.9.0 androidx.work:work-runtime:2.9.0 com.caverock:androidsvg-aar:1.4 diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 9ae76fff2..769e0a6e4 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -6,9 +6,9 @@ uses-permission: name='android.permission.ACCESS_NETWORK_STATE' uses-permission: name='android.permission.POST_NOTIFICATIONS' uses-permission: name='android.permission.WAKE_LOCK' uses-permission: name='com.google.android.c2dm.permission.RECEIVE' -uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE' uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED' uses-permission: name='android.permission.FOREGROUND_SERVICE' +uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE' uses-permission: name='com.google.samples.apps.nowinandroid.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION' application-label:'Now in Android' application-label-af:'Now in Android' @@ -105,9 +105,9 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml' application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml' application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml' launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity' label='' icon='' -uses-library-not-required:'android.ext.adservices' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' +uses-library-not-required:'android.ext.adservices' feature-group: label='' uses-feature: name='android.hardware.faketouch' uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps' @@ -119,3 +119,4 @@ supports-screens: 'small' 'normal' 'large' 'xlarge' supports-any-density: 'true' locales: '--_--' 'af' 'am' 'ar' 'as' 'az' 'be' 'bg' 'bn' 'bs' 'ca' 'cs' 'da' 'de' 'el' 'en-AU' 'en-CA' 'en-GB' 'en-IN' 'en-XC' 'es' 'es-US' 'et' 'eu' 'fa' 'fi' 'fr' 'fr-CA' 'gl' 'gu' 'hi' 'hr' 'hu' 'hy' 'in' 'is' 'it' 'iw' 'ja' 'ka' 'kk' 'km' 'kn' 'ko' 'ky' 'lo' 'lt' 'lv' 'mk' 'ml' 'mn' 'mr' 'ms' 'my' 'nb' 'ne' 'nl' 'or' 'pa' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'si' 'sk' 'sl' 'sq' 'sr' 'sr-Latn' 'sv' 'sw' 'ta' 'te' 'th' 'tl' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh-CN' 'zh-HK' 'zh-TW' 'zu' densities: '120' '160' '240' '320' '480' '640' '65534' +native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64' 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 aab864f5b..51c98cec6 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 @@ -179,6 +179,7 @@ internal fun NiaApp( Column(Modifier.fillMaxSize()) { // Show the top app bar on top level destinations. val destination = appState.currentTopLevelDestination + val shouldShowTopAppBar = destination != null if (destination != null) { NiaTopAppBar( titleRes = destination.titleTextId, @@ -207,6 +208,13 @@ internal fun NiaApp( duration = Short, ) == ActionPerformed }, + modifier = if (shouldShowTopAppBar) { + Modifier.consumeWindowInsets( + WindowInsets.safeDrawing.only(WindowInsetsSides.Top), + ) + } else { + Modifier + }, ) } diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt index 335f83371..4cc4345ef 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt @@ -76,7 +76,7 @@ internal fun InterestsListDetailScreen( selectedTopicId: String?, onTopicClick: (String) -> Unit, ) { - val listDetailNavigator = rememberListDetailPaneScaffoldNavigator() + val listDetailNavigator = rememberListDetailPaneScaffoldNavigator() BackHandler(listDetailNavigator.canNavigateBack()) { listDetailNavigator.navigateBack() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26da6907d..0aff27c8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidxAppCompat = "1.6.1" androidxBrowser = "1.8.0" androidxComposeBom = "2024.02.02" androidxComposeCompiler = "1.5.8" -androidxComposeMaterial3Adaptive = "1.0.0-alpha08" +androidxComposeMaterial3Adaptive = "1.0.0-alpha10" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" @@ -27,7 +27,7 @@ androidxTestRules = "1.5.0" androidxTestRunner = "1.5.2" androidxTracing = "1.3.0-alpha02" androidxUiAutomator = "2.2.0" -androidxWindowManager = "1.2.0" +androidxWindowManager = "1.3.0-alpha03" androidxWork = "2.9.0" coil = "2.6.0" dependencyGuard = "0.4.3" @@ -101,6 +101,7 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = " androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } androidx-tracing-ktx = { group = "androidx.tracing", name = "tracing-ktx", version.ref = "androidxTracing" } +androidx-window-core = { group = "androidx.window", name = "window-core", version.ref = "androidxWindowManager" } androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWork" } androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "androidxWork" } coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil" }