Refactor: Update Compose snippets and dependencies

riggaroo · riggaroo · commit f661dfed08c4 · 2025-09-26T15:55:03.000+01:00
This commit includes the following changes:

- Updated various Compose snippets to align with recent API changes:
    - Replaced `Mdc3Theme` with standard Material 3 Theming.
    - Removed `LocalUseFallbackRippleImplementation` as its not available in latest versions.
    - Replaced `Divider` with `HorizontalDivider`.
    - Updated `ClickableText` to use `Text` with a `clickable` modifier.
    - Removed `ContextualFlowLayoutExample` as `ContextualFlowRow` is deprecated.
    - Updated `pullToRefreshIndicator` to `pullToRefresh`.
    - Removed `caretSize` from `TooltipBox` as it is no longer available.
    - Replaced `TabRow` with `PrimaryTabRow`.
- Updated Gradle wrapper to version 9.1.0.
- Updated various library versions in `libs.versions.toml`, including `androidx-xr` libraries.
- Corrected import for `hiltViewModel`.
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/components/AppBar.kt b/compose/snippets/src/main/java/com/example/compose/snippets/components/AppBar.kt
@@ -218,7 +218,7 @@ fun CenterAlignedTopAppBarExample() {
 
         topBar = {
             CenterAlignedTopAppBar(
-                colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
+                colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
                     titleContentColor = MaterialTheme.colorScheme.primary,
                 ),
@@ -431,6 +431,7 @@ fun AppBarSelectionActions(
                 }
             }
         },
+        modifier = modifier
     )
 }
 // [END android_compose_components_appbarselectionactions]
@@ -454,6 +455,7 @@ private fun AppBarMultiSelectionExample(
     var selectedItems by rememberSaveable { mutableStateOf(setOf<Int>()) }
 
     Scaffold(
+        modifier = modifier,
         topBar = { AppBarSelectionActions(selectedItems) }
     ) { innerPadding ->
         LazyColumn(contentPadding = innerPadding) {
@@ -517,7 +519,8 @@ fun LazyListMultiSelection(
 ) {
     var selectedItems by rememberSaveable { mutableStateOf(setOf<Int>()) }
 
-    LazyColumn(contentPadding = contentPadding) {
+    LazyColumn(modifier = modifier,
+        contentPadding = contentPadding) {
         itemsIndexed(listItems) { _, index ->
             val selected = selectedItems.contains(index)
             ListItemSelectable(
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/components/DatePickers.kt b/compose/snippets/src/main/java/com/example/compose/snippets/components/DatePickers.kt
@@ -57,15 +57,15 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
-import com.example.compose.snippets.touchinput.userinteractions.MyAppTheme
+import com.example.compose.snippets.ui.theme.SnippetsTheme
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
 @Preview
 @Composable
 private fun DatePickerPreview() {
-    MyAppTheme {
+    SnippetsTheme {
         DatePickerExamples()
     }
 }
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/components/PullToRefreshBox.kt b/compose/snippets/src/main/java/com/example/compose/snippets/components/PullToRefreshBox.kt
@@ -36,7 +36,7 @@ import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
 import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.Indicator
 import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.PositionalThreshold
 import androidx.compose.material3.pulltorefresh.PullToRefreshState
-import androidx.compose.material3.pulltorefresh.pullToRefreshIndicator
+import androidx.compose.material3.pulltorefresh.pullToRefresh
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -187,11 +187,13 @@ fun MyCustomIndicator(
     modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = modifier.pullToRefreshIndicator(
+        modifier = modifier.pullToRefresh(
             state = state,
             isRefreshing = isRefreshing,
-            containerColor = PullToRefreshDefaults.containerColor,
-            threshold = PositionalThreshold
+            threshold = PositionalThreshold,
+            onRefresh = {
+
+            }
         ),
         contentAlignment = Alignment.Center
     ) {
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/components/Tooltips.kt b/compose/snippets/src/main/java/com/example/compose/snippets/components/Tooltips.kt
@@ -166,7 +166,6 @@ fun AdvancedRichTooltipExample(
                         }
                     }
                 },
-                caretSize = DpSize(32.dp, 16.dp)
             ) {
                 Text(richTooltipText)
             }
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Mdc3ThemeSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/designsystems/Mdc3ThemeSnippets.kt
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/interop/MigrationCommonScenariosSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/interop/MigrationCommonScenariosSnippets.kt
@@ -58,7 +58,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.ViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/FlowLayoutSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/FlowLayoutSnippets.kt
@@ -21,9 +21,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ContextualFlowRow
-import androidx.compose.foundation.layout.ContextualFlowRowOverflow
-import androidx.compose.foundation.layout.ContextualFlowRowOverflowScope
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowColumn
 import androidx.compose.foundation.layout.FlowRow
@@ -33,22 +30,13 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -465,48 +453,6 @@ fun FlowLayout_FractionalSizing() {
     // [END android_compose_flow_layout_fractional_sizing]
 }
 
-@OptIn(ExperimentalLayoutApi::class)
-@Preview
-@Composable
-fun ContextualFlowLayoutExample() {
-    // [START android_compose_layouts_contextual_flow]
-    val totalCount = 40
-    var maxLines by remember {
-        mutableIntStateOf(2)
-    }
-
-    val moreOrCollapseIndicator = @Composable { scope: ContextualFlowRowOverflowScope ->
-        val remainingItems = totalCount - scope.shownItemCount
-        ChipItem(if (remainingItems == 0) "Less" else "+$remainingItems", onClick = {
-            if (remainingItems == 0) {
-                maxLines = 2
-            } else {
-                maxLines += 5
-            }
-        })
-    }
-    ContextualFlowRow(
-        modifier = Modifier
-            .safeDrawingPadding()
-            .fillMaxWidth(1f)
-            .padding(16.dp)
-            .wrapContentHeight(align = Alignment.Top)
-            .verticalScroll(rememberScrollState()),
-        verticalArrangement = Arrangement.spacedBy(4.dp),
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        maxLines = maxLines,
-        overflow = ContextualFlowRowOverflow.expandOrCollapseIndicator(
-            minRowsToShowCollapse = 4,
-            expandIndicator = moreOrCollapseIndicator,
-            collapseIndicator = moreOrCollapseIndicator
-        ),
-        itemCount = totalCount
-    ) { index ->
-        ChipItem("Item $index")
-    }
-    // [END android_compose_layouts_contextual_flow]
-}
-
 @OptIn(ExperimentalLayoutApi::class)
 @Preview
 @Composable
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt
@@ -50,8 +50,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.PrimaryTabRow
 import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -239,7 +239,7 @@ fun PagerWithTabsExample() {
         pages.size
     })
 
-    TabRow(
+    PrimaryTabRow(
         // Our selected tab is our current page
         selectedTabIndex = pagerState.currentPage,
     ) {
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/resources/ResourcesSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/resources/ResourcesSnippets.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Menu
 import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -109,7 +110,7 @@ fun Colors() {
     // <color name="purple_200">#FFBB86FC</color>
 
     // In your Compose code
-    Divider(color = colorResource(R.color.purple_200))
+    HorizontalDivider(color = colorResource(R.color.purple_200))
     // [END android_compose_resources_colors]
 }
 
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/state/StateHoistingSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/state/StateHoistingSnippets.kt
@@ -18,6 +18,8 @@
 
 package com.example.compose.snippets.state
 
+import android.R.id.message
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
@@ -34,7 +36,13 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withLink
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewModelScope
@@ -60,9 +68,11 @@ private object StateHoistingSnippets1 {
     ) {
         var showDetails by rememberSaveable { mutableStateOf(false) } // Define the UI element expanded state
 
-        ClickableText(
+        Text(
             text = AnnotatedString(message.content),
-            onClick = { showDetails = !showDetails } // Apply simple UI logic
+            modifier = Modifier.clickable {
+                showDetails = !showDetails // Apply UI logic
+            }
         )
 
         if (showDetails) {
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/userinteractions/UserInteractions.kt b/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/userinteractions/UserInteractions.kt
@@ -37,7 +37,6 @@ import androidx.compose.material.ripple.RippleAlpha
 import androidx.compose.material.ripple.RippleTheme
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LocalUseFallbackRippleImplementation
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -240,28 +239,6 @@ private class ScaleIndicationNode(
 fun App() {
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun LocalUseFallbackRippleImplementationExample() {
-// [START android_compose_userinteractions_localusefallbackrippleimplementation]
-    CompositionLocalProvider(LocalUseFallbackRippleImplementation provides true) {
-        MaterialTheme {
-            App()
-        }
-    }
-// [END android_compose_userinteractions_localusefallbackrippleimplementation]
-}
-
-// [START android_compose_userinteractions_localusefallbackrippleimplementation_app_theme]
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MyAppTheme(content: @Composable () -> Unit) {
-    CompositionLocalProvider(LocalUseFallbackRippleImplementation provides true) {
-        MaterialTheme(content = content)
-    }
-}
-// [END android_compose_userinteractions_localusefallbackrippleimplementation_app_theme]
-
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun MyComposableDisabledRippleConfig() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,9 +28,9 @@ androidx-test-junit = "1.3.0"
 androidx-window = "1.5.0"
 androidx-window-core = "1.5.0"
 androidx-window-java = "1.5.0"
-androidx-xr-arcore = "1.0.0-alpha06"
-androidx-xr-compose = "1.0.0-alpha07"
-androidx-xr-scenecore = "1.0.0-alpha07"
+androidx-xr-arcore = "1.0.0-alpha05"
+androidx-xr-compose = "1.0.0-alpha06"
+androidx-xr-scenecore = "1.0.0-alpha06"
 androidxHiltNavigationCompose = "1.3.0"
 appcompat = "1.7.1"
 coil = "2.7.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ fun AdvancedRichTooltipExample(`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`},`
`169`		`- caretSize = DpSize(32.dp, 16.dp)`
`170`	`169`	`) {`
`171`	`170`	`Text(richTooltipText)`
`172`	`171`	`}`