Merge branch 'main' into cartland/fix-sam-conversion

Author: cartland

.github/workflows/apply_spotless.yml

@@ -42,16 +42,7 @@ jobs:
         java-version: '17'
 
     - name: Run spotlessApply
-      run: ./gradlew :compose:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Wear
-      run: ./gradlew :wear:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Misc
-      run: ./gradlew :misc:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for XR
-      run: ./gradlew :xr:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+      run: ./gradlew spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
 
     - name: Auto-commit if spotlessApply has changes
       uses: stefanzweifel/git-auto-commit-action@v5

.gitignore

@@ -6,7 +6,7 @@
 /.idea/modules.xml
 /.idea/workspace.xml
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .idea/*

compose/snippets/src/main/java/com/example/compose/snippets/components/Badges.kt

@@ -30,7 +30,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -78,7 +78,7 @@ fun BadgeExample() {
 // [START android_compose_components_badgeinteractive]
 @Composable
 fun BadgeInteractiveExample() {
-    var itemCount by remember { mutableStateOf(0) }
+    var itemCount by remember { mutableIntStateOf(0) }
 
     Column(
         verticalArrangement = Arrangement.spacedBy(16.dp)

compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt

@@ -29,6 +29,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -65,7 +66,7 @@ fun ProgressIndicatorExamples() {
 // [START android_compose_components_determinateindicator]
 @Composable
 fun LinearDeterminateIndicator() {
-    var currentProgress by remember { mutableStateOf(0f) }
+    var currentProgress by remember { mutableFloatStateOf(0f) }
     var loading by remember { mutableStateOf(false) }
     val scope = rememberCoroutineScope() // Create a coroutine scope
 
@@ -107,7 +108,7 @@ suspend fun loadProgress(updateProgress: (Float) -> Unit) {
 @Preview
 @Composable
 fun CircularDeterminateIndicator() {
-    var currentProgress by remember { mutableStateOf(0f) }
+    var currentProgress by remember { mutableFloatStateOf(0f) }
     var loading by remember { mutableStateOf(false) }
     val scope = rememberCoroutineScope() // Create a coroutine scope
 

compose/snippets/src/main/java/com/example/compose/snippets/components/SearchBar.kt

@@ -178,13 +178,13 @@ fun CustomizableSearchBar(
     onSearch: (String) -> Unit,
     searchResults: List<String>,
     onResultClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
     // Customization options
     placeholder: @Composable () -> Unit = { Text("Search") },
     leadingIcon: @Composable (() -> Unit)? = { Icon(Icons.Default.Search, contentDescription = "Search") },
     trailingIcon: @Composable (() -> Unit)? = null,
     supportingContent: (@Composable (String) -> Unit)? = null,
     leadingContent: (@Composable () -> Unit)? = null,
-    modifier: Modifier = Modifier
 ) {
     // Track expanded state of search bar
     var expanded by rememberSaveable { mutableStateOf(false) }

compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt

@@ -34,6 +34,7 @@ import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -225,7 +226,7 @@ private object ActionLaunchSendBroadcastEvent {
 
 private object ActionLambda {
     @Composable
-    fun actionLambda() {
+    fun ActionLambda() {
         // [START android_compose_glance_lambda01]
         Text(
             text = "Submit",
@@ -237,7 +238,7 @@ private object ActionLambda {
     }
 
     @Composable
-    fun actionLambda2() {
+    fun ActionLambda2() {
         // [START android_compose_glance_lambda02]
         Button(
             text = "Submit",
@@ -436,7 +437,7 @@ object ManageAndUpdate {
 object BuildUIWithGlance {
 
     @Composable
-    fun example1() {
+    fun Example1() {
         // [START android_compose_glance_buildUI01]
         Row(modifier = GlanceModifier.fillMaxWidth().padding(16.dp)) {
             val modifier = GlanceModifier.defaultWeight()
@@ -448,7 +449,7 @@ object BuildUIWithGlance {
     }
 
     @Composable
-    fun example2() {
+    fun Example2() {
 
         // [START android_compose_glance_buildUI02]
         // Remember to import Glance Composables
@@ -466,7 +467,7 @@ object BuildUIWithGlance {
     }
 
     @Composable
-    fun example3() {
+    fun Example3() {
         // [START android_compose_glance_buildUI03]
         LazyColumn {
             item {
@@ -480,7 +481,7 @@ object BuildUIWithGlance {
     }
 
     @Composable
-    fun example4() {
+    fun Example4() {
         val peopleNameList = arrayListOf<String>()
         val peopleList = arrayListOf<Person>()
 
@@ -631,7 +632,7 @@ object SizeModeSnippets3 {
 
 object AccessResources {
     @Composable
-    fun example1() {
+    fun Example1() {
         // [START android_compose_glance_buildUI10]
         LocalContext.current.getString(R.string.glance_title)
         // [END android_compose_glance_buildUI10]
@@ -651,11 +652,11 @@ object AccessResources {
 
 object CompoundButton {
     @Composable
-    fun example1() {
+    fun Example1() {
         // [START android_compose_glance_buildUI12]
         var isApplesChecked by remember { mutableStateOf(false) }
         var isEnabledSwitched by remember { mutableStateOf(false) }
-        var isRadioChecked by remember { mutableStateOf(0) }
+        var isRadioChecked by remember { mutableIntStateOf(0) }
 
         CheckBox(
             checked = isApplesChecked,
@@ -860,7 +861,7 @@ object GlanceTheming {
     }
 
     @Composable
-    fun shapeExample() {
+    fun ShapeExample() {
         // Note : android_compose_glance_glancetheming04 is found in button_outline.xml
         // [START android_compose_glance_glancetheming05]
         GlanceModifier.background(
@@ -898,7 +899,7 @@ object GlanceInnerPadding {
 
 object GlanceInteroperability {
     @Composable
-    fun example01() {
+    fun Example01() {
         // [START android_compose_glance_glanceinteroperability01]
         val packageName = LocalContext.current.packageName
         Column(modifier = GlanceModifier.fillMaxSize()) {
@@ -909,7 +910,7 @@ object GlanceInteroperability {
     }
 
     @Composable
-    fun example02() {
+    fun Example02() {
         val packageName = null
 
         // [START android_compose_glance_glanceinteroperability02]

compose/snippets/src/main/java/com/example/compose/snippets/interop/InteroperabilityAPIsSnippets.kt

@@ -38,7 +38,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
@@ -194,7 +194,7 @@ class ExampleFragmentMultipleComposeView : Fragment() {
 // [START android_compose_interop_apis_views_in_compose]
 @Composable
 fun CustomView() {
-    var selectedItem by remember { mutableStateOf(0) }
+    var selectedItem by remember { mutableIntStateOf(0) }
 
     // Adds view to Compose
     AndroidView(

compose/snippets/src/main/java/com/example/compose/snippets/kotlin/KotlinSnippets.kt

@@ -340,15 +340,17 @@ fun MoveBoxWhereTapped() {
                 // coroutines inside a suspend function
                 coroutineScope {
                     while (true) {
-                        // Wait for the user to tap on the screen
-                        val offset = awaitPointerEventScope {
-                            awaitFirstDown().position
-                        }
-                        // Launch a new coroutine to asynchronously animate to
-                        // where the user tapped on the screen
-                        launch {
-                            // Animate to the pressed position
-                            animatedOffset.animateTo(offset)
+                        // Wait for the user to tap on the screen and animate
+                        // in the same block
+                        awaitPointerEventScope {
+                            val offset = awaitFirstDown().position
+
+                            // Launch a new coroutine to asynchronously animate to
+                            // where the user tapped on the screen
+                            launch {
+                                // Animate to the pressed position
+                                animatedOffset.animateTo(offset)
+                            }
                         }
                     }
                 }

compose/snippets/src/main/java/com/example/compose/snippets/layouts/FlowLayoutSnippets.kt

@@ -45,7 +45,7 @@ import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -472,7 +472,7 @@ fun ContextualFlowLayoutExample() {
     // [START android_compose_layouts_contextual_flow]
     val totalCount = 40
     var maxLines by remember {
-        mutableStateOf(2)
+        mutableIntStateOf(2)
     }
 
     val moreOrCollapseIndicator = @Composable { scope: ContextualFlowRowOverflowScope ->

compose/snippets/src/main/java/com/example/compose/snippets/performance/PerformanceSnippets.kt

@@ -36,6 +36,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -264,7 +265,7 @@ private object BackwardsWrite {
     // [START android_compose_performance_backwardswrite]
     @Composable
     fun BadComposable() {
-        var count by remember { mutableStateOf(0) }
+        var count by remember { mutableIntStateOf(0) }
 
         // Causes recomposition on click
         Button(onClick = { count++ }, Modifier.wrapContentSize()) {