From 7fcaa3321aae7297547811c7f53f6729e1db2755 Mon Sep 17 00:00:00 2001 From: Tram Bui Date: Thu, 2 May 2024 10:11:12 -0700 Subject: [PATCH 1/2] implement new pb spec with declerate intepolator --- .../android/samples/socialite/ui/Main.kt | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt b/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt index 6f923a8c..3cefa062 100644 --- a/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt +++ b/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt @@ -20,6 +20,7 @@ import android.app.Activity import android.content.Intent import android.content.pm.ActivityInfo import android.os.Bundle +import androidx.compose.animation.core.CubicBezierEasing import androidx.compose.animation.core.FastOutLinearInEasing import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.tween @@ -83,10 +84,28 @@ fun MainNavigation( navController = navController, startDestination = "home", popEnterTransition = { - scaleIn(initialScale = 1.1F) + fadeIn() + scaleIn( + animationSpec = tween( + durationMillis = 100, + delayMillis = 35 + ), + initialScale = 1.1F + ) + fadeIn( + animationSpec = tween( + durationMillis = 100, + delayMillis = 35 + ) + ) }, popExitTransition = { - scaleOut(targetScale = 0.9F) + fadeOut() + scaleOut( + targetScale = 0.9F + ) + fadeOut( + animationSpec = tween( + durationMillis = 35, + easing = CubicBezierEasing(0.1f, 0.1f, 0f, 1f) + ) + ) }, modifier = modifier, ) { From 3a06d051301f907c588e116b4268f9aade3364a1 Mon Sep 17 00:00:00 2001 From: Tram Bui Date: Thu, 2 May 2024 10:17:04 -0700 Subject: [PATCH 2/2] resolve spotless build errors --- .../google/android/samples/socialite/ui/Main.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt b/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt index 3cefa062..6e1c598e 100644 --- a/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt +++ b/app/src/main/java/com/google/android/samples/socialite/ui/Main.kt @@ -87,24 +87,24 @@ fun MainNavigation( scaleIn( animationSpec = tween( durationMillis = 100, - delayMillis = 35 + delayMillis = 35, ), - initialScale = 1.1F + initialScale = 1.1F, ) + fadeIn( animationSpec = tween( durationMillis = 100, - delayMillis = 35 - ) + delayMillis = 35, + ), ) }, popExitTransition = { scaleOut( - targetScale = 0.9F + targetScale = 0.9F, ) + fadeOut( animationSpec = tween( durationMillis = 35, - easing = CubicBezierEasing(0.1f, 0.1f, 0f, 1f) - ) + easing = CubicBezierEasing(0.1f, 0.1f, 0f, 1f), + ), ) }, modifier = modifier,