From 52713e4489e3d7c3ae8eec167b6fbaa7b466b362 Mon Sep 17 00:00:00 2001 From: songgyubin Date: Wed, 14 Aug 2024 22:27:23 +0900 Subject: [PATCH 1/2] Fix Overlap When Moving Between Tabs --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7047ac665e..ed6428e166 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ androidxHiltNavigationCompose = "1.2.0" androidxLifecycle = "2.8.3" androidxMacroBenchmark = "1.2.4" androidxMetrics = "1.0.0-alpha04" -androidxNavigation = "2.8.0-alpha06" +androidxNavigation = "2.8.0-beta06" androidxProfileinstaller = "1.3.1" androidxTestCore = "1.5.0" androidxTestExt = "1.1.5" From a8a8647c20b8db1a054e0fbc4ac7918a8703bd2c Mon Sep 17 00:00:00 2001 From: songgyubin Date: Sat, 24 Aug 2024 14:44:14 +0900 Subject: [PATCH 2/2] Update to Material Adaptive 1.0.0-rc01 --- .../dependencies/releaseRuntimeClasspath.txt | 10 +-- .../prodReleaseRuntimeClasspath.txt | 82 +++++++++---------- gradle/libs.versions.toml | 2 +- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index b9135ed42b..fcbb409ee7 100644 --- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt +++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt @@ -20,8 +20,8 @@ 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.adaptive:adaptive-android:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive:1.0.0-rc01 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 @@ -91,9 +91,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-beta02 -androidx.window:window-core:1.3.0-beta02 -androidx.window:window:1.3.0-beta02 +androidx.window:window-core-android:1.3.0-rc01 +androidx.window:window-core:1.3.0-rc01 +androidx.window:window:1.3.0-rc01 com.google.accompanist:accompanist-drawablepainter:0.32.0 com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-lint-aar:2.51.1 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 96e5940e8a..669f0e1812 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -1,7 +1,7 @@ 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-experimental:1.4.1 androidx.annotation:annotation-jvm:1.8.0 androidx.annotation:annotation:1.8.0 androidx.appcompat:appcompat-resources:1.7.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.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.animation:animation-android:1.7.0-rc01 +androidx.compose.animation:animation-core-android:1.7.0-rc01 +androidx.compose.animation:animation-core:1.7.0-rc01 +androidx.compose.animation:animation:1.7.0-rc01 +androidx.compose.foundation:foundation-android:1.7.0-rc01 +androidx.compose.foundation:foundation-layout-android:1.7.0-rc01 +androidx.compose.foundation:foundation-layout:1.7.0-rc01 +androidx.compose.foundation:foundation:1.7.0-rc01 +androidx.compose.material3.adaptive:adaptive-android:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive-layout:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-rc01 +androidx.compose.material3.adaptive:adaptive:1.0.0-rc01 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 @@ -39,25 +39,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.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-android:1.7.0-rc01 +androidx.compose.runtime:runtime-saveable-android:1.7.0-rc01 +androidx.compose.runtime:runtime-saveable:1.7.0-rc01 androidx.compose.runtime:runtime-tracing:1.0.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.runtime:runtime:1.7.0-rc01 +androidx.compose.ui:ui-android:1.7.0-rc01 +androidx.compose.ui:ui-geometry-android:1.7.0-rc01 +androidx.compose.ui:ui-geometry:1.7.0-rc01 +androidx.compose.ui:ui-graphics-android:1.7.0-rc01 +androidx.compose.ui:ui-graphics:1.7.0-rc01 +androidx.compose.ui:ui-text-android:1.7.0-rc01 +androidx.compose.ui:ui-text:1.7.0-rc01 +androidx.compose.ui:ui-tooling-preview-android:1.7.0-rc01 +androidx.compose.ui:ui-tooling-preview:1.7.0-rc01 +androidx.compose.ui:ui-unit-android:1.7.0-rc01 +androidx.compose.ui:ui-unit:1.7.0-rc01 +androidx.compose.ui:ui-util-android:1.7.0-rc01 +androidx.compose.ui:ui-util:1.7.0-rc01 +androidx.compose.ui:ui:1.7.0-rc01 androidx.compose:compose-bom:2024.02.02 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.13.1 @@ -106,11 +106,11 @@ androidx.lifecycle:lifecycle-viewmodel:2.8.3 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-alpha04 -androidx.navigation:navigation-common-ktx:2.8.0-alpha06 -androidx.navigation:navigation-common:2.8.0-alpha06 -androidx.navigation:navigation-compose:2.8.0-alpha06 -androidx.navigation:navigation-runtime-ktx:2.8.0-alpha06 -androidx.navigation:navigation-runtime:2.8.0-alpha06 +androidx.navigation:navigation-common-ktx:2.8.0-beta06 +androidx.navigation:navigation-common:2.8.0-beta06 +androidx.navigation:navigation-compose:2.8.0-beta06 +androidx.navigation:navigation-runtime-ktx:2.8.0-beta06 +androidx.navigation:navigation-runtime:2.8.0-beta06 androidx.print:print:1.0.0 androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 @@ -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-beta02 -androidx.window:window-core:1.3.0-beta02 -androidx.window:window:1.3.0-beta02 +androidx.window:window-core-android:1.3.0-rc01 +androidx.window:window-core:1.3.0-rc01 +androidx.window:window:1.3.0-rc01 androidx.work:work-runtime-ktx:2.9.0 androidx.work:work-runtime:2.9.0 com.caverock:androidsvg-aar:1.4 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed6428e166..83af1ad5c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0" androidxComposeAlpha = "1.7.0-beta01" androidxComposeBom = "2024.02.02" -androidxComposeMaterial3Adaptive = "1.0.0-beta01" +androidxComposeMaterial3Adaptive = "1.0.0-rc01" androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0-beta01" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0"