Update Transition and Ripple

android · Sep 5, 2024 · 1e54aad · 1e54aad
1 parent 9c585a5
commit 1e54aad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...nCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyAnimatedCircle.kt b/...nCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyAnimatedCircle.kt
@@ -20,8 +20,8 @@ import androidx.compose.animation.core.CubicBezierEasing
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.rememberTransition
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.Canvas
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -50,7 +50,7 @@ fun AnimatedCircle(
             .apply { targetState = AnimatedCircleProgress.END }
     }
     val stroke = with(LocalDensity.current) { Stroke(5.dp.toPx()) }
-    val transition = updateTransition(currentState)
+    val transition = rememberTransition(currentState)
     val angleOffset by transition.animateFloat(
         transitionSpec = {
             tween(

diff --git a/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyTabRow.kt b/NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyTabRow.kt
@@ -33,7 +33,7 @@ import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -102,7 +102,7 @@ private fun RallyTab(
                 onClick = onSelected,
                 role = Role.Tab,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(
+                indication = ripple(
                     bounded = false,
                     radius = Dp.Unspecified,
                     color = Color.Unspecified

diff --git a/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/components/AnimatedCircle.kt b/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/components/AnimatedCircle.kt
@@ -20,8 +20,8 @@ import androidx.compose.animation.core.CubicBezierEasing
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.rememberTransition
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.Canvas
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -50,7 +50,7 @@ fun AnimatedCircle(
             .apply { targetState = AnimatedCircleProgress.END }
     }
     val stroke = with(LocalDensity.current) { Stroke(5.dp.toPx()) }
-    val transition = updateTransition(currentState)
+    val transition = rememberTransition(currentState)
     val angleOffset by transition.animateFloat(
         transitionSpec = {
             tween(

diff --git a/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyTopAppBar.kt b/TestingCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyTopAppBar.kt
@@ -33,7 +33,7 @@ import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -102,7 +102,7 @@ private fun RallyTab(
                 onClick = onSelected,
                 role = Role.Tab,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(
+                indication = ripple(
                     bounded = false,
                     radius = Dp.Unspecified,
                     color = Color.Unspecified