Merge branch 'main' into lazily-load-list

# Conflicts:
#	compose/snippets/src/main/java/com/example/compose/snippets/lists/LazyListSnippets.kt

Author: riggaroo

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kapt) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose.compiler) apply false

compose/snippets/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kapt)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.compose.compiler)
@@ -146,7 +146,7 @@ dependencies {
     implementation(libs.hilt.android)
     implementation(libs.glide.compose)
 
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(libs.junit)
 

compose/snippets/src/main/java/com/example/compose/snippets/animations/AnimationSnippets.kt

@@ -109,6 +109,9 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import com.example.compose.snippets.R
+import java.text.BreakIterator
+import java.text.StringCharacterIterator
+import kotlinx.coroutines.delay
 
 /*
 * Copyright 2023 The Android Open Source Project
@@ -820,3 +823,39 @@ private fun Expanded() {
 @Composable
 private fun ContentIcon() {
 }
+
+// [START android_compose_animations_char_by_char]
+@Composable
+private fun AnimatedText() {
+    val text = "This text animates as though it is being typed \uD83E\uDDDE\u200D♀\uFE0F \uD83D\uDD10  \uD83D\uDC69\u200D❤\uFE0F\u200D\uD83D\uDC68 \uD83D\uDC74\uD83C\uDFFD"
+
+    // Use BreakIterator as it correctly iterates over characters regardless of how they are
+    // stored, for example, some emojis are made up of multiple characters.
+    // You don't want to break up an emoji as it animates, so using BreakIterator will ensure
+    // this is correctly handled!
+    val breakIterator = remember(text) { BreakIterator.getCharacterInstance() }
+
+    // Define how many milliseconds between each character should pause for. This will create the
+    // illusion of an animation, as we delay the job after each character is iterated on.
+    val typingDelayInMs = 50L
+
+    var substringText by remember {
+        mutableStateOf("")
+    }
+    LaunchedEffect(text) {
+        // Initial start delay of the typing animation
+        delay(1000)
+        breakIterator.text = StringCharacterIterator(text)
+
+        var nextIndex = breakIterator.next()
+        // Iterate over the string, by index boundary
+        while (nextIndex != BreakIterator.DONE) {
+            substringText = text.subSequence(0, nextIndex).toString()
+            // Go to the next logical character boundary
+            nextIndex = breakIterator.next()
+            delay(typingDelayInMs)
+        }
+    }
+    Text(substringText)
+// [END android_compose_animations_char_by_char]
+}

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

@@ -162,7 +162,7 @@ private object StreamData {
     }
 }
 
-private object HiltExample3 {
+object HiltExample3 {
     // [START android_compose_libraries_hilt_3]
     @HiltViewModel
     class MyViewModel @Inject constructor(
@@ -180,7 +180,7 @@ private object HiltExample3 {
     interface ExampleRepository
 }
 
-private object HiltViewModel {
+object HiltViewModel {
     @HiltViewModel
     class MyViewModel @Inject constructor() : ViewModel() { /* ... */ }
     // [START android_compose_libraries_hilt_viewmodel]
@@ -207,7 +207,7 @@ private object HiltViewModel {
     }
 }
 
-private object HiltViewModelBackStack {
+object HiltViewModelBackStack {
     @HiltViewModel
     class MyViewModel @Inject constructor() : ViewModel() { /* ... */ }
 
@@ -273,7 +273,7 @@ private object MapsExample {
             cameraPositionState = cameraPositionState
         ) {
             Marker(
-                state = MarkerState(position = singapore),
+                state = remember { MarkerState(position = singapore) },
                 title = "Singapore",
                 snippet = "Marker in Singapore"
             )

compose/snippets/src/main/java/com/example/compose/snippets/lists/LazyListSnippets.kt

@@ -23,6 +23,7 @@ import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.border
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -34,11 +35,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.items
@@ -48,6 +52,7 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
@@ -60,6 +65,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Density
@@ -769,7 +775,6 @@ fun MessageList(modifier: Modifier,
             }
         }
     }
-
     @Composable
     fun MessagePlaceholder(modifier: Modifier) {
         Box(
@@ -795,4 +800,55 @@ fun MessageList(modifier: Modifier,
         }
     }
 }
-// [END android_compose_layouts_lazily_load_list]
+// [END android_compose_layouts_lazily_load_list]
+
+// [START android_compose_lists_snap_scroll_button]
+@Composable
+fun MessageList(modifier: Modifier = Modifier) {
+    val listState = rememberLazyListState()
+    val coroutineScope = rememberCoroutineScope()
+
+    LazyColumn(state = listState, modifier = Modifier.height(120.dp)) {
+        items(10) { index ->
+            Text(
+                modifier = Modifier.height(40.dp),
+                text = "Item $index"
+            )
+        }
+    }
+
+    Button(onClick = {
+        coroutineScope.launch {
+            listState.animateScrollToItem(index = 0)
+        }
+    }) {
+        Text(text = "Go top")
+    }
+}
+// [END android_compose_lists_snap_scroll_button]
+
+// [START android_compose_layout_scrollable_grid]
+@Composable
+fun ScrollingGrid() {
+    val itemsList = (0..15).toList()
+
+    val itemModifier = Modifier
+        .border(1.dp, Color.Blue)
+        .width(80.dp)
+        .wrapContentSize()
+
+    LazyHorizontalGrid(
+        rows = GridCells.Fixed(3),
+        horizontalArrangement = Arrangement.spacedBy(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        items(itemsList) {
+            Text("Item is $it", itemModifier)
+        }
+
+        item {
+            Text("Single item", itemModifier)
+        }
+    }
+}
+// [END android_compose_layout_scrollable_grid]

compose/snippets/src/main/java/com/example/compose/snippets/lists/ListWithMultipleItemTypes.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.compose.snippets.lists
+
+import android.provider.MediaStore
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import org.w3c.dom.Text
+
+// [START android_compose_lists_multiple_item_types]
+@Composable
+fun ListWithMultipleItems(messages: List<Any>) {
+    LazyColumn {
+        items(
+            messages.size,
+            contentType = { it }
+        ) {
+            for (message in messages)
+                when (message) {
+                    is MediaStore.Audio -> AudioMessage(message)
+                    is Text -> TextMessage(message)
+                }
+        }
+    }
+}
+
+@Composable
+fun AudioMessage(message: MediaStore.Audio) {
+    TODO("Not yet implemented.")
+}
+
+@Composable
+fun TextMessage(message: Text) {
+    TODO("Not yet implemented.")
+}
+
+data class SampleMessage(val text: String, val content: Any)
+// [END android_compose_lists_multiple_item_types]

compose/snippets/src/main/java/com/example/compose/snippets/lists/NestedScrollingItem.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.compose.snippets.lists
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+
+// [START android_compose_layouts_nested_scrolling]
+@Composable
+fun NestedScrollingRowsList(urls: List<String>) {
+    LazyColumn {
+        items(10) {
+            LazyRow {
+                item { Text("Row: $it") }
+                items(urls.size) { index ->
+                    // AsyncImage provided by Coil.
+                    AsyncImage(
+                        model = urls[index],
+                        modifier = Modifier.size(150.dp),
+                        contentDescription = null
+                    )
+                }
+            }
+        }
+    }
+}
+// [END android_compose_layouts_nested_scrolling]

compose/snippets/src/main/java/com/example/compose/snippets/mentalmodel/ThinkingInComposeSnippets.kt

@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Button
+import androidx.compose.material3.Card
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
@@ -108,15 +109,16 @@ fun ListComposable(myList: List<String>) {
 
 // [START android_compose_thinking_in_compose_incorrect]
 @Composable
-@Deprecated("Example with bug")
 fun ListWithBug(myList: List<String>) {
     var items = 0
 
     Row(horizontalArrangement = Arrangement.SpaceBetween) {
         Column {
             for (item in myList) {
-                Text("Item: $item")
-                items++ // Avoid! Side-effect of the column recomposing.
+                Card {
+                    Text("Item: $item")
+                    items++ // Avoid! Side-effect of the column recomposing.
+                }
             }
         }
         Text("Count: $items")

compose/snippets/src/main/java/com/example/compose/snippets/sideeffects/SideEffectsSnippets.kt

@@ -180,18 +180,18 @@ fun rememberFirebaseAnalytics(user: User): FirebaseAnalytics {
 }
 // [END android_compose_side_effects_sideeffect]
 
+// b/368420773
+@Suppress("ProduceStateDoesNotAssignValue")
 // [START android_compose_side_effects_producestate]
 @Composable
 fun loadNetworkImage(
     url: String,
     imageRepository: ImageRepository = ImageRepository()
 ): State<Result<Image>> {
-
     // Creates a State<T> with Result.Loading as initial value
     // If either `url` or `imageRepository` changes, the running producer
     // will cancel and will be re-launched with the new inputs.
     return produceState<Result<Image>>(initialValue = Result.Loading, url, imageRepository) {
-
         // In a coroutine, can make suspend calls
         val image = imageRepository.load(url)