Merge pull request #452 from android/jdk/adaptive-codelab-end

[AdaptiveUiCodelab] use window size class from material3.adaptive:ada…

Author: jdkoren

AdaptiveUiCodelab/app/build.gradle.kts

@@ -72,7 +72,7 @@ dependencies {
     androidTestImplementation(composeBom)
 
     implementation(libs.androidx.material3)
-    implementation(libs.androidx.material3.windowSizeClass)
+    implementation(libs.androidx.material3.adaptive)
     implementation(libs.androidx.material.icons.extended)
     implementation(libs.androidx.ui.tooling.preview)
     androidTestImplementation(libs.androidx.ui.test.junit4)

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/MainActivity.kt

@@ -20,14 +20,13 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.window.core.layout.WindowWidthSizeClass
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import com.example.reply.data.local.LocalEmailsDataProvider
@@ -43,7 +42,6 @@ class MainActivity : ComponentActivity() {
 
     private val viewModel: ReplyHomeViewModel by viewModels()
 
-    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -75,10 +73,10 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             ReplyTheme {
-                val windowSize = calculateWindowSizeClass(this)
+                val windowAdaptiveInfo = currentWindowAdaptiveInfo()
                 val devicePosture = devicePostureFlow.collectAsState().value
                 val uiState = viewModel.uiState.collectAsState().value
-                ReplyApp(windowSize.widthSizeClass, devicePosture, uiState)
+                ReplyApp(windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass, devicePosture, uiState)
             }
         }
     }
@@ -90,7 +88,7 @@ fun ReplyAppPreview() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.Compact,
+            windowSize = WindowWidthSizeClass.COMPACT,
             foldingDevicePosture = DevicePosture.NormalPosture
         )
     }
@@ -102,7 +100,7 @@ fun ReplyAppPreviewTablet() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.Medium,
+            windowSize = WindowWidthSizeClass.MEDIUM,
             foldingDevicePosture = DevicePosture.NormalPosture
         )
     }
@@ -114,8 +112,8 @@ fun ReplyAppPreviewDesktop() {
     ReplyTheme {
         ReplyApp(
             replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
-            windowSize = WindowWidthSizeClass.Expanded,
+            windowSize = WindowWidthSizeClass.EXPANDED,
             foldingDevicePosture = DevicePosture.NormalPosture
         )
     }
-}
+}

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/ReplyApp.kt

@@ -52,7 +52,6 @@ import androidx.compose.material3.PermanentDrawerSheet
 import androidx.compose.material3.PermanentNavigationDrawer
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberDrawerState
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -61,6 +60,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.window.core.layout.WindowWidthSizeClass
 import com.example.reply.R
 import com.example.reply.ui.utils.DevicePosture
 import com.example.reply.ui.utils.ReplyContentType
@@ -85,19 +85,19 @@ fun ReplyApp(
     val contentType: ReplyContentType
 
     when (windowSize) {
-        WindowWidthSizeClass.Compact -> {
+        WindowWidthSizeClass.COMPACT -> {
             navigationType = ReplyNavigationType.BOTTOM_NAVIGATION
             contentType = ReplyContentType.LIST_ONLY
         }
-        WindowWidthSizeClass.Medium -> {
+        WindowWidthSizeClass.MEDIUM -> {
             navigationType = ReplyNavigationType.NAVIGATION_RAIL
             contentType = if (foldingDevicePosture != DevicePosture.NormalPosture) {
                 ReplyContentType.LIST_AND_DETAIL
             } else {
                 ReplyContentType.LIST_ONLY
             }
         }
-        WindowWidthSizeClass.Expanded -> {
+        WindowWidthSizeClass.EXPANDED -> {
             navigationType = if (foldingDevicePosture is DevicePosture.BookPosture) {
                 ReplyNavigationType.NAVIGATION_RAIL
             } else {
@@ -320,4 +320,4 @@ fun NavigationDrawerContent(
             onClick = { /*TODO*/ }
         )
     }
-}
+}

AdaptiveUiCodelab/gradle/libs.versions.toml

@@ -10,7 +10,7 @@ kotlin = "1.9.23"
 kotlinxCoroutinesAndroid = "1.8.0"
 lifecycleViewmodelCompose = "2.7.0"
 lifecycleRuntimeKtx = "2.7.0"
-material3WindowSizeClass = "1.2.1"
+material3Adaptive = "1.0.0-alpha12"
 window = "1.2.0"
 
 [libraries]
@@ -23,7 +23,7 @@ androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtim
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3 = { module = "androidx.compose.material3:material3" }
-androidx-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3WindowSizeClass" }
+androidx-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "material3Adaptive" }
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }