RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style: extract easing tokens into separate file 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2025-04-03 00:21:35 +02:00
parent 6d599957cf
commit 5b8333490b
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/chat/revolt/activities/MainActivity.kt
View File

@ -17,7 +17,6 @@ import androidx.activity.compose.setContent
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.core.CubicBezierEasing
import androidx.compose.animation.core.EaseInOutExpo import androidx.compose.animation.core.EaseInOutExpo
import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.FiniteAnimationSpec
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
@ -62,6 +61,7 @@ import chat.revolt.api.settings.Experiments
import chat.revolt.api.settings.LoadedSettings import chat.revolt.api.settings.LoadedSettings
import chat.revolt.api.settings.SyncedSettings import chat.revolt.api.settings.SyncedSettings
import chat.revolt.components.generic.HealthAlert import chat.revolt.components.generic.HealthAlert
import chat.revolt.material.EasingTokens
import chat.revolt.ndk.NativeLibraries import chat.revolt.ndk.NativeLibraries
import chat.revolt.persistence.KVStorage import chat.revolt.persistence.KVStorage
import chat.revolt.screens.DefaultDestinationScreen import chat.revolt.screens.DefaultDestinationScreen
@ -535,14 +535,14 @@ fun AppEntrypoint(
// This is only used outside of Polar mode // This is only used outside of Polar mode
// Otherwise you may be looking for "main" right below // Otherwise you may be looking for "main" right below
composable("chat", composable(
"chat",
enterTransition = { enterTransition = {
slideIntoContainer( slideIntoContainer(
AnimatedContentTransitionScope.SlideDirection.Up, AnimatedContentTransitionScope.SlideDirection.Up,
animationSpec = tween( animationSpec = tween(
400, 400,
// cf. https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#cbea5c6e-7b0d-47a0-98c3-767080a38d95 easing = EasingTokens.EmphasizedDecelerate
easing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
), ),
initialOffset = { it / 3 } initialOffset = { it / 3 }
) + fadeIn(animationSpec = RevoltTweenFloat) ) + fadeIn(animationSpec = RevoltTweenFloat)
@ -564,21 +564,20 @@ fun AppEntrypoint(
// This is only the main screen in Polar mode // This is only the main screen in Polar mode
// Otherwise you may be looking for "chat" right above // Otherwise you may be looking for "chat" right above
composable("main", composable(
"main",
enterTransition = { enterTransition = {
slideIntoContainer( slideIntoContainer(
AnimatedContentTransitionScope.SlideDirection.Up, AnimatedContentTransitionScope.SlideDirection.Up,
animationSpec = tween( animationSpec = tween(
400, 400,
// cf. https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#cbea5c6e-7b0d-47a0-98c3-767080a38d95 easing = EasingTokens.EmphasizedDecelerate
easing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
), ),
initialOffset = { it / 3 } initialOffset = { it / 3 }
) + fadeIn(animationSpec = RevoltTweenFloat) + scaleIn( ) + fadeIn(animationSpec = RevoltTweenFloat) + scaleIn(
animationSpec = tween( animationSpec = tween(
400, 400,
// cf. https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#cbea5c6e-7b0d-47a0-98c3-767080a38d95 easing = EasingTokens.EmphasizedDecelerate
easing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
), ),
initialScale = 0.8f, initialScale = 0.8f,
transformOrigin = TransformOrigin.Center transformOrigin = TransformOrigin.Center
@ -594,8 +593,7 @@ fun AppEntrypoint(
AnimatedContentTransitionScope.SlideDirection.Left, AnimatedContentTransitionScope.SlideDirection.Left,
animationSpec = tween( animationSpec = tween(
600, 600,
// cf. https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#cbea5c6e-7b0d-47a0-98c3-767080a38d95 easing = EasingTokens.EmphasizedDecelerate
easing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
), ),
initialOffset = { it } initialOffset = { it }
) + fadeIn(animationSpec = RevoltTweenFloat) ) + fadeIn(animationSpec = RevoltTweenFloat)
@ -605,8 +603,7 @@ fun AppEntrypoint(
AnimatedContentTransitionScope.SlideDirection.Right, AnimatedContentTransitionScope.SlideDirection.Right,
animationSpec = tween( animationSpec = tween(
600, 600,
// cf. https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#cbea5c6e-7b0d-47a0-98c3-767080a38d95 easing = EasingTokens.EmphasizedDecelerate
easing = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
), ),
targetOffset = { it } targetOffset = { it }
) + fadeOut(animationSpec = RevoltTweenFloat) ) + fadeOut(animationSpec = RevoltTweenFloat)

8
app/src/main/java/chat/revolt/material/EasingTokens.kt Normal file
View File

@ -0,0 +1,8 @@
package chat.revolt.material
import androidx.compose.animation.core.CubicBezierEasing
object EasingTokens {
// https://m3.material.io/styles/motion/easing-and-duration/tokens-specs#ed7ab8eb-9b9a-40a3-806f-a4485558f3df
val EmphasizedDecelerate = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1f)
}