diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8418662..f82226f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,6 +15,8 @@ android { namespace = "com.bintianqi.owndroid" compileSdk = 34 + lint.checkReleaseBuilds = false + defaultConfig { applicationId = "com.bintianqi.owndroid" minSdk = 21 diff --git a/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt b/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt index f7a9079..34359e7 100644 --- a/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt +++ b/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt @@ -9,12 +9,12 @@ object Animations{ private const val INITIAL_OFFSET_VALUE = 96 private const val TARGET_OFFSET_VALUE = 96 - private val bezier = CubicBezierEasing(0.4f, 0f, 0f, 1f) + private val bezier = CubicBezierEasing(0.20f, 0.85f, 0.0f, 1f) - private val tween: FiniteAnimationSpec = tween(450, easing = bezier) + private val tween: FiniteAnimationSpec = tween(durationMillis = 650, easing = bezier, delayMillis = 50) val navHostEnterTransition: AnimatedContentTransitionScope.() -> EnterTransition = { - fadeIn(tween(150, easing = LinearEasing)) + + fadeIn(tween(100, easing = LinearEasing)) + slideIntoContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.End, @@ -23,7 +23,7 @@ object Animations{ } val navHostExitTransition: AnimatedContentTransitionScope.() -> ExitTransition = { - fadeOut(tween(83, easing = LinearEasing)) + + fadeOut(tween(100, easing = LinearEasing)) + slideOutOfContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.Start, @@ -32,7 +32,7 @@ object Animations{ } val navHostPopEnterTransition: AnimatedContentTransitionScope.() -> EnterTransition = { - fadeIn(tween(83, easing = LinearEasing)) + + fadeIn(tween(100, easing = LinearEasing)) + slideIntoContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.End, @@ -41,7 +41,7 @@ object Animations{ } val navHostPopExitTransition: AnimatedContentTransitionScope.() -> ExitTransition = { - fadeOut(tween(83, easing = LinearEasing)) + + fadeOut(tween(100, easing = LinearEasing)) + slideOutOfContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.Start,