Merge branch 'main' into latest

Author: riggaroo

.github/workflows/sync_main_latest.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Sync main to latest

.github/workflows/update_deps.yml

@@ -19,7 +19,7 @@ jobs:
         run: ./gradlew versionCatalogUpdate
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Update Dependencies

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)
@@ -144,7 +144,9 @@ dependencies {
     implementation(libs.googlemaps.maps)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    implementation(libs.glide.compose)
+
+    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/images/LoadingImagesSnippets.kt

@@ -22,6 +22,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import coil.compose.AsyncImage
+import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
+import com.bumptech.glide.integration.compose.GlideImage
 import com.example.compose.snippets.R
 
 /*
@@ -53,11 +55,23 @@ fun LoadingImageFromDisk() {
 
 @Preview
 @Composable
-fun LoadingImageFromInternet() {
+fun LoadingImageFromInternetCoil() {
     // [START android_compose_images_load_internet_coil]
     AsyncImage(
         model = "https://example.com/image.jpg",
         contentDescription = "Translated description of what the image contains"
     )
     // [END android_compose_images_load_internet_coil]
 }
+
+@OptIn(ExperimentalGlideComposeApi::class)
+@Preview
+@Composable
+fun LoadingImageFromInternetGlide() {
+    // [START android_compose_images_load_internet_glide]
+    GlideImage(
+        model = "https://example.com/image.jpg",
+        contentDescription = "Translated description of what the image contains"
+    )
+    // [END android_compose_images_load_internet_glide]
+}

compose/snippets/src/main/java/com/example/compose/snippets/images/ParallaxEffect.kt

@@ -0,0 +1,74 @@
+/*
+ * 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.images
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.example.compose.snippets.R
+
+// [START android_compose_images_parallax]
+@Composable
+fun ParallaxEffect() {
+    fun Modifier.parallaxLayoutModifier(scrollState: ScrollState, rate: Int) =
+        layout { measurable, constraints ->
+            val placeable = measurable.measure(constraints)
+            val height = if (rate > 0) scrollState.value / rate else scrollState.value
+            layout(placeable.width, placeable.height) {
+                placeable.place(0, height)
+            }
+        }
+
+    val scrollState = rememberScrollState()
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .verticalScroll(scrollState),
+    ) {
+
+        Image(
+            painterResource(id = R.drawable.cupcake),
+            contentDescription = "Android logo",
+            contentScale = ContentScale.Fit,
+            // Reduce scrolling rate by half.
+            modifier = Modifier.parallaxLayoutModifier(scrollState, 2)
+        )
+
+        Text(
+            text = stringResource(R.string.detail_placeholder),
+            modifier = Modifier
+                .background(Color.White)
+                .padding(horizontal = 8.dp),
+
+        )
+    }
+}
+// [END android_compose_images_parallax]

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"
             )