Merge pull request #454 from android/main

Add recent changes to `latest` branch

Author: JolandaVerhoef

.github/workflows/apply_spotless.yml

@@ -44,10 +44,13 @@ jobs:
     - 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: Auto-commit if spotlessApply has changes
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
-        commit_message: Apply Spotless
-
-    - name: Run spotlessApply for Wear
-      run: ./gradlew :wear:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+        commit_message: Apply Spotless

.github/workflows/build.yml

@@ -45,3 +45,5 @@ jobs:
       run: ./gradlew :kotlin:build
     - name: Build Wear snippets
       run: ./gradlew :wear:build
+    - name: Build misc snippets
+      run: ./gradlew :misc:build

compose/snippets/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:enableOnBackInvokedCallback="true"
         android:theme="@style/Theme.Snippets">
 <!--    [START android_compose_pip_manifest_entry]-->
         <activity

compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt

@@ -16,6 +16,7 @@
 
 package com.example.compose.snippets
 
+import NavigationDrawerExamples
 import android.os.Bundle
 import android.os.StrictMode
 import androidx.activity.ComponentActivity
@@ -33,24 +34,31 @@ import com.example.compose.snippets.components.AppBarExamples
 import com.example.compose.snippets.components.BadgeExamples
 import com.example.compose.snippets.components.ButtonExamples
 import com.example.compose.snippets.components.CardExamples
+import com.example.compose.snippets.components.CarouselExamples
 import com.example.compose.snippets.components.CheckboxExamples
 import com.example.compose.snippets.components.ChipExamples
 import com.example.compose.snippets.components.ComponentsScreen
 import com.example.compose.snippets.components.DatePickerExamples
 import com.example.compose.snippets.components.DialogExamples
 import com.example.compose.snippets.components.DividerExamples
 import com.example.compose.snippets.components.FloatingActionButtonExamples
+import com.example.compose.snippets.components.MenusExamples
 import com.example.compose.snippets.components.PartialBottomSheet
 import com.example.compose.snippets.components.ProgressIndicatorExamples
 import com.example.compose.snippets.components.ScaffoldExample
+import com.example.compose.snippets.components.SearchBarExamples
+import com.example.compose.snippets.components.SegmentedButtonExamples
 import com.example.compose.snippets.components.SliderExamples
+import com.example.compose.snippets.components.SwipeToDismissBoxExamples
 import com.example.compose.snippets.components.SwitchExamples
 import com.example.compose.snippets.components.TimePickerExamples
+import com.example.compose.snippets.components.TooltipExamples
 import com.example.compose.snippets.graphics.ApplyPolygonAsClipImage
 import com.example.compose.snippets.graphics.BitmapFromComposableFullSnippet
 import com.example.compose.snippets.graphics.BrushExamplesScreen
 import com.example.compose.snippets.images.ImageExamplesScreen
 import com.example.compose.snippets.landing.LandingScreen
+import com.example.compose.snippets.layouts.PagerExamples
 import com.example.compose.snippets.navigation.Destination
 import com.example.compose.snippets.navigation.TopComponentsDestination
 import com.example.compose.snippets.ui.theme.SnippetsTheme
@@ -85,6 +93,7 @@ class SnippetsActivity : ComponentActivity() {
                                     }
                                     Destination.ShapesExamples -> ApplyPolygonAsClipImage()
                                     Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
+                                    Destination.PagerExamples -> PagerExamples()
                                 }
                             }
                         }
@@ -109,6 +118,13 @@ class SnippetsActivity : ComponentActivity() {
                                     TopComponentsDestination.PartialBottomSheet -> PartialBottomSheet()
                                     TopComponentsDestination.TimePickerExamples -> TimePickerExamples()
                                     TopComponentsDestination.DatePickerExamples -> DatePickerExamples()
+                                    TopComponentsDestination.CarouselExamples -> CarouselExamples()
+                                    TopComponentsDestination.MenusExample -> MenusExamples()
+                                    TopComponentsDestination.TooltipExamples -> TooltipExamples()
+                                    TopComponentsDestination.NavigationDrawerExamples -> NavigationDrawerExamples()
+                                    TopComponentsDestination.SegmentedButtonExamples -> SegmentedButtonExamples()
+                                    TopComponentsDestination.SwipeToDismissBoxExamples -> SwipeToDismissBoxExamples()
+                                    TopComponentsDestination.SearchBarExamples -> SearchBarExamples()
                                 }
                             }
                         }

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

@@ -26,9 +26,11 @@ import androidx.compose.animation.EnterExitState
 import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.animateColor
 import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.AnimationVector1D
 import androidx.compose.animation.core.AnimationVector2D
 import androidx.compose.animation.core.Easing
+import androidx.compose.animation.core.ExperimentalAnimationSpecApi
 import androidx.compose.animation.core.ExperimentalTransitionApi
 import androidx.compose.animation.core.FastOutLinearInEasing
 import androidx.compose.animation.core.FastOutSlowInEasing
@@ -43,11 +45,13 @@ import androidx.compose.animation.core.TwoWayConverter
 import androidx.compose.animation.core.VectorConverter
 import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.animateOffsetAsState
 import androidx.compose.animation.core.animateRect
 import androidx.compose.animation.core.animateValueAsState
 import androidx.compose.animation.core.createChildTransition
 import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.keyframes
+import androidx.compose.animation.core.keyframesWithSpline
 import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.rememberTransition
 import androidx.compose.animation.core.repeatable
@@ -71,11 +75,13 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.sizeIn
@@ -93,25 +99,34 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.PointMode
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.round
 import com.example.compose.snippets.R
 import java.text.BreakIterator
 import java.text.StringCharacterIterator
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 
 /*
 * Copyright 2023 The Android Open Source Project
@@ -709,6 +724,101 @@ private fun AnimationSpecKeyframe() {
     // [END android_compose_animations_spec_keyframe]
 }
 
+@OptIn(ExperimentalAnimationSpecApi::class)
+@Composable
+private fun AnimationSpecKeyframeWithSpline() {
+    // [START android_compose_animation_spec_keyframes_with_spline]
+    val offset by animateOffsetAsState(
+        targetValue = Offset(300f, 300f),
+        animationSpec = keyframesWithSpline {
+            durationMillis = 6000
+            Offset(0f, 0f) at 0
+            Offset(150f, 200f) atFraction 0.5f
+            Offset(0f, 100f) atFraction 0.7f
+        }
+    )
+    // [END android_compose_animation_spec_keyframes_with_spline]
+}
+
+@OptIn(ExperimentalAnimationSpecApi::class)
+@Preview
+@Composable
+private fun OffsetKeyframeWithSplineDemo() {
+    val points = remember { mutableStateListOf<Offset>() }
+    val offsetAnim = remember {
+        Animatable(
+            Offset.Zero,
+            Offset.VectorConverter
+        )
+    }
+    val density = LocalDensity.current
+
+    BoxWithConstraints(
+        Modifier.fillMaxSize().drawBehind {
+            drawPoints(
+                points = points,
+                pointMode = PointMode.Lines,
+                color = Color.LightGray,
+                strokeWidth = 4f,
+                pathEffect = PathEffect.dashPathEffect(floatArrayOf(30f, 20f))
+            )
+        }
+    ) {
+        val minDimension = minOf(maxWidth, maxHeight)
+        val size = minDimension / 4
+
+        val sizePx = with(density) { size.toPx() }
+        val widthPx = with(density) { maxWidth.toPx() }
+        val heightPx = with(density) { maxHeight.toPx() }
+
+        val maxXOff = (widthPx - sizePx) / 2f
+        val maxYOff = heightPx - (sizePx / 2f)
+
+        Box(
+            Modifier.align(Alignment.TopCenter)
+                .offset { offsetAnim.value.round() }
+                .size(size)
+                .background(Color.Red, RoundedCornerShape(50))
+                .onPlaced { points.add(it.boundsInParent().center) }
+        )
+
+        LaunchedEffect(Unit) {
+            delay(1000)
+            while (isActive) {
+                offsetAnim.animateTo(
+                    targetValue = Offset.Zero,
+                    animationSpec =
+                    keyframesWithSpline {
+                        durationMillis = 4400
+
+                        // Increasingly approach the halfway point moving from side to side
+                        for (i in 0..4) {
+                            val sign = if (i % 2 == 0) 1 else -1
+                            Offset(
+                                x = maxXOff * (i.toFloat() / 5f) * sign,
+                                y = (maxYOff) * (i.toFloat() / 5f)
+                            ) atFraction (0.1f * i)
+                        }
+
+                        // Halfway point (at bottom of the screen)
+                        Offset(0f, maxYOff) atFraction 0.5f
+
+                        // Return with mirrored movement
+                        for (i in 0..4) {
+                            val sign = if (i % 2 == 0) 1 else -1
+                            Offset(
+                                x = maxXOff * (1f - i.toFloat() / 5f) * sign,
+                                y = (maxYOff) * (1f - i.toFloat() / 5f)
+                            ) atFraction ((0.1f * i) + 0.5f)
+                        }
+                    }
+                )
+                points.clear()
+            }
+        }
+    }
+}
+
 @Composable
 private fun AnimationSpecRepeatable() {
     // [START android_compose_animations_spec_repeatable]