From d17a0dcc64894726d5392bc088d7383a75dece4f Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 14 Feb 2024 14:28:42 -0800
Subject: [PATCH] Bump M3 adaptive to alpha06

Change-Id: I4d77c84da8d18cec87f3b7a47603d62bfa9c790d
---
 .../google/samples/apps/nowinandroid/MainActivity.kt |  4 ++--
 .../nowinandroid/feature/interests/TabContent.kt     | 12 ++++++------
 gradle/libs.versions.toml                            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
index 59b3d4184..9be5f7328 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
@@ -25,7 +25,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.collectWindowSizeAsState
+import androidx.compose.material3.adaptive.currentWindowSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -142,7 +142,7 @@ class MainActivity : ComponentActivity() {
                     androidTheme = shouldUseAndroidTheme(uiState),
                     disableDynamicTheming = shouldDisableDynamicTheming(uiState),
                 ) {
-                    val windowSize by collectWindowSizeAsState()
+                    val windowSize = currentWindowSize()
                     NiaApp(
                         windowSize = windowSize.toDpSize(),
                         networkMonitor = networkMonitor,
diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
index 49e588b90..7979bdf0e 100644
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
@@ -34,7 +34,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole
-import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldState
+import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -56,20 +56,20 @@ fun TopicsTabContent(
     modifier: Modifier = Modifier,
     detailsPane: @Composable (String) -> Unit,
 ) {
-    val listDetailPaneState = rememberListDetailPaneScaffoldState()
+    val listDetailPaneNavigator = rememberListDetailPaneScaffoldNavigator<String>()
 
-    BackHandler(enabled = listDetailPaneState.canNavigateBack()) {
-        listDetailPaneState.navigateBack()
+    BackHandler(enabled = listDetailPaneNavigator.canNavigateBack()) {
+        listDetailPaneNavigator.navigateBack()
     }
 
     LaunchedEffect(selectedTopicId) {
         if (selectedTopicId != null) {
-            listDetailPaneState.navigateTo(ListDetailPaneScaffoldRole.Detail)
+            listDetailPaneNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
         }
     }
 
     ListDetailPaneScaffold(
-        scaffoldState = listDetailPaneState,
+        scaffoldState = listDetailPaneNavigator.scaffoldState,
         listPane = {
             ListPane(
                 topics = topics,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2cff441c8..b37167090 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ androidxHiltNavigationCompose = "1.0.0"
 androidxJunit = "1.1.5"
 androidxLifecycle = "2.6.2"
 androidxMacroBenchmark = "1.2.0"
-androidxComposeMaterial3Adaptive = "1.0.0-alpha01"
+androidxComposeMaterial3Adaptive = "1.0.0-alpha06"
 androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha01"
 androidxMetrics = "1.0.0-alpha04"
 androidxNavigation = "2.7.4"