Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79929b99 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

[flexiglass] Pattern bouncer motion UX polish. am: 70f9b87d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23351960



Change-Id: I6ff8959fa8da98985f28900dd4168dbcda11a413
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4ea06e7 70f9b87d

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt

+26 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import androidx.compose.ui.platform.LocalView 
import androidx.compose.ui.res.integerResource

import androidx.compose.ui.unit.IntSize

import androidx.compose.ui.unit.dp

import com.android.compose.animation.Easings

import com.android.internal.R

import com.android.systemui.bouncer.ui.viewmodel.PatternBouncerViewModel

import com.android.systemui.bouncer.ui.viewmodel.PatternDotViewModel
@@ -67,9 +68,9 @@ internal fun PatternBouncer( 
    val rowCount = viewModel.rowCount



    val dotColor = MaterialTheme.colorScheme.secondary

    val dotRadius = with(LocalDensity.current) { 8.dp.toPx() }

    val dotRadius = with(LocalDensity.current) { (DOT_DIAMETER_DP / 2).dp.toPx() }

    val lineColor = MaterialTheme.colorScheme.primary

    val lineStrokeWidth = dotRadius * 2 + with(LocalDensity.current) { 4.dp.toPx() }

    val lineStrokeWidth = with(LocalDensity.current) { LINE_STROKE_WIDTH_DP.dp.toPx() }



    var containerSize: IntSize by remember { mutableStateOf(IntSize(0, 0)) }

    val horizontalSpacing = containerSize.width / colCount
@@ -121,9 +122,24 @@ internal fun PatternBouncer( 
            // completion even if the LaunchedEffect is canceled because its key objects have

            // changed.

            scope.launch {

                animatable.animateTo(if (isSelected) 2f else 1f)

                if (isSelected) {

                    animatable.animateTo(1f)

                    animatable.animateTo(

                        targetValue = (SELECTED_DOT_DIAMETER_DP / DOT_DIAMETER_DP.toFloat()),

                        animationSpec =

                            tween(

                                durationMillis = SELECTED_DOT_REACTION_ANIMATION_DURATION_MS,

                                easing = Easings.StandardAccelerateEasing,

                            ),

                    )

                } else {

                    animatable.animateTo(

                        targetValue = 1f,

                        animationSpec =

                            tween(

                                durationMillis = SELECTED_DOT_RETRACT_ANIMATION_DURATION_MS,

                                easing = Easings.StandardDecelerateEasing,

                            ),

                    )

                }

            }

        }
@@ -273,3 +289,9 @@ private fun lineAlpha(gridSpacing: Float, lineLength: Float = gridSpacing): Floa 
    // farther the user input pointer goes from the line, the more opaque the line gets.

    return ((lineLength / gridSpacing - 0.3f) * 4f).coerceIn(0f, 1f)

}



private const val DOT_DIAMETER_DP = 16

private const val SELECTED_DOT_DIAMETER_DP = 24

private const val SELECTED_DOT_REACTION_ANIMATION_DURATION_MS = 83

private const val SELECTED_DOT_RETRACT_ANIMATION_DURATION_MS = 750

private const val LINE_STROKE_WIDTH_DP = 16