Merge pull request #1279 from android/av/material3-adaptive-1.0.0-alpha08

Update material3-adaptive to 1.0.0-alpha08

Author: alexvanyo

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -12,41 +12,41 @@ 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.2
-androidx.compose.animation:animation-core-android:1.6.2
-androidx.compose.animation:animation-core:1.6.2
-androidx.compose.animation:animation:1.6.2
-androidx.compose.foundation:foundation-android:1.6.2
-androidx.compose.foundation:foundation-layout-android:1.6.2
-androidx.compose.foundation:foundation-layout:1.6.2
-androidx.compose.foundation:foundation:1.6.2
-androidx.compose.material3:material3-android:1.2.0
-androidx.compose.material3:material3:1.2.0
-androidx.compose.material:material-icons-core-android:1.6.2
-androidx.compose.material:material-icons-core:1.6.2
-androidx.compose.material:material-icons-extended-android:1.6.2
-androidx.compose.material:material-icons-extended:1.6.2
-androidx.compose.material:material-ripple-android:1.6.2
-androidx.compose.material:material-ripple:1.6.2
-androidx.compose.runtime:runtime-android:1.6.2
-androidx.compose.runtime:runtime-saveable-android:1.6.2
-androidx.compose.runtime:runtime-saveable:1.6.2
-androidx.compose.runtime:runtime:1.6.2
-androidx.compose.ui:ui-android:1.6.2
-androidx.compose.ui:ui-geometry-android:1.6.2
-androidx.compose.ui:ui-geometry:1.6.2
-androidx.compose.ui:ui-graphics-android:1.6.2
-androidx.compose.ui:ui-graphics:1.6.2
-androidx.compose.ui:ui-text-android:1.6.2
-androidx.compose.ui:ui-text:1.6.2
-androidx.compose.ui:ui-tooling-preview-android:1.6.2
-androidx.compose.ui:ui-tooling-preview:1.6.2
-androidx.compose.ui:ui-unit-android:1.6.2
-androidx.compose.ui:ui-unit:1.6.2
-androidx.compose.ui:ui-util-android:1.6.2
-androidx.compose.ui:ui-util:1.6.2
-androidx.compose.ui:ui:1.6.2
-androidx.compose:compose-bom:2024.02.01
+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.material3:material3-android:1.2.1
+androidx.compose.material3:material3:1.2.1
+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.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:compose-bom:2024.02.02
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.12.0
 androidx.core:core:1.12.0

app/build.gradle.kts

@@ -90,6 +90,8 @@ dependencies {
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive.layout)
+    implementation(libs.androidx.compose.material3.adaptive.navigation)
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.core.ktx)

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -13,46 +13,50 @@ 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.2
-androidx.compose.animation:animation-core-android:1.6.2
-androidx.compose.animation:animation-core:1.6.2
-androidx.compose.animation:animation:1.6.2
-androidx.compose.foundation:foundation-android:1.6.2
-androidx.compose.foundation:foundation-layout-android:1.6.2
-androidx.compose.foundation:foundation-layout:1.6.2
-androidx.compose.foundation:foundation:1.6.2
-androidx.compose.material3:material3-adaptive-android:1.0.0-alpha06
-androidx.compose.material3:material3-adaptive:1.0.0-alpha06
-androidx.compose.material3:material3-android:1.2.0
-androidx.compose.material3:material3-window-size-class-android:1.2.0
-androidx.compose.material3:material3-window-size-class:1.2.0
-androidx.compose.material3:material3:1.2.0
-androidx.compose.material:material-icons-core-android:1.6.2
-androidx.compose.material:material-icons-core:1.6.2
-androidx.compose.material:material-icons-extended-android:1.6.2
-androidx.compose.material:material-icons-extended:1.6.2
-androidx.compose.material:material-ripple-android:1.6.2
-androidx.compose.material:material-ripple:1.6.2
-androidx.compose.runtime:runtime-android:1.6.2
-androidx.compose.runtime:runtime-saveable-android:1.6.2
-androidx.compose.runtime:runtime-saveable:1.6.2
+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.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: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.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.6.3
+androidx.compose.runtime:runtime-saveable-android:1.6.3
+androidx.compose.runtime:runtime-saveable:1.6.3
 androidx.compose.runtime:runtime-tracing:1.0.0-beta01
-androidx.compose.runtime:runtime:1.6.2
-androidx.compose.ui:ui-android:1.6.2
-androidx.compose.ui:ui-geometry-android:1.6.2
-androidx.compose.ui:ui-geometry:1.6.2
-androidx.compose.ui:ui-graphics-android:1.6.2
-androidx.compose.ui:ui-graphics:1.6.2
-androidx.compose.ui:ui-text-android:1.6.2
-androidx.compose.ui:ui-text:1.6.2
-androidx.compose.ui:ui-tooling-preview-android:1.6.2
-androidx.compose.ui:ui-tooling-preview:1.6.2
-androidx.compose.ui:ui-unit-android:1.6.2
-androidx.compose.ui:ui-unit:1.6.2
-androidx.compose.ui:ui-util-android:1.6.2
-androidx.compose.ui:ui-util:1.6.2
-androidx.compose.ui:ui:1.6.2
-androidx.compose:compose-bom:2024.02.01
+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:compose-bom:2024.02.02
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.12.0
 androidx.core:core-splashscreen:1.0.1
@@ -119,7 +123,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:1.2.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.work:work-runtime-ktx:2.9.0
 androidx.work:work-runtime:2.9.0
 com.caverock:androidsvg-aar:1.4

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt

@@ -20,11 +20,11 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.ListDetailPaneScaffold
-import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole
-import androidx.compose.material3.adaptive.PaneAdaptedValue
-import androidx.compose.material3.adaptive.ThreePaneScaffoldNavigator
-import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldNavigator
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
+import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
+import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -93,7 +93,8 @@ internal fun InterestsListDetailScreen(
     }
 
     ListDetailPaneScaffold(
-        scaffoldState = listDetailNavigator.scaffoldState,
+        value = listDetailNavigator.scaffoldValue,
+        directive = listDetailNavigator.scaffoldDirective,
         listPane = {
             InterestsRoute(
                 onTopicClick = ::onTopicClickShowDetailPane,
@@ -129,8 +130,8 @@ internal fun InterestsListDetailScreen(
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 private fun <T> ThreePaneScaffoldNavigator<T>.isListPaneVisible(): Boolean =
-    scaffoldState.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
+    scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 private fun <T> ThreePaneScaffoldNavigator<T>.isDetailPaneVisible(): Boolean =
-    scaffoldState.scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded
+    scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded

gradle/libs.versions.toml

@@ -7,9 +7,9 @@ androidTools = "31.3.0"
 androidxActivity = "1.8.0"
 androidxAppCompat = "1.6.1"
 androidxBrowser = "1.8.0"
-androidxComposeBom = "2024.02.01"
+androidxComposeBom = "2024.02.02"
 androidxComposeCompiler = "1.5.8"
-androidxComposeMaterial3Adaptive = "1.0.0-alpha06"
+androidxComposeMaterial3Adaptive = "1.0.0-alpha08"
 androidxComposeRuntimeTracing = "1.0.0-beta01"
 androidxCore = "1.12.0"
 androidxCoreSplashscreen = "1.0.1"
@@ -71,7 +71,9 @@ androidx-compose-foundation = { group = "androidx.compose.foundation", name = "f
 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-adaptive = { group = "androidx.compose.material3", name = "material3-adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
+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" }