lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): make predictive back animation more subtle

Browse Source
This commit is contained in:
Nishant Mishra
2025-10-23 21:09:02 +05:30
parent 6e6f5477e1
commit b363f5f10f
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
View File

@@ -19,12 +19,11 @@ package org.nsh07.pomodoro.ui
import android.content.Intent import android.content.Intent
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ContentTransform
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.SharedTransitionLayout import androidx.compose.animation.SharedTransitionLayout
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleOut import androidx.compose.animation.togetherWith
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.calculateEndPadding import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding import androidx.compose.foundation.layout.calculateStartPadding
@@ -142,23 +141,16 @@ fun AppScreen(
backStack = backStack, backStack = backStack,
onBack = backStack::removeLastOrNull, onBack = backStack::removeLastOrNull,
transitionSpec = { transitionSpec = {
ContentTransform( fadeIn(motionScheme.defaultEffectsSpec())
fadeIn(motionScheme.defaultEffectsSpec()), .togetherWith(fadeOut(motionScheme.defaultEffectsSpec()))
fadeOut(motionScheme.defaultEffectsSpec())
)
}, },
popTransitionSpec = { popTransitionSpec = {
ContentTransform( fadeIn(motionScheme.defaultEffectsSpec())
fadeIn(motionScheme.defaultEffectsSpec()), .togetherWith(fadeOut(motionScheme.defaultEffectsSpec()))
fadeOut(motionScheme.defaultEffectsSpec())
)
}, },
predictivePopTransitionSpec = { predictivePopTransitionSpec = {
ContentTransform( fadeIn(motionScheme.defaultEffectsSpec())
fadeIn(motionScheme.defaultEffectsSpec()), .togetherWith(fadeOut(motionScheme.defaultEffectsSpec()))
fadeOut(motionScheme.defaultEffectsSpec()) +
scaleOut(targetScale = 0.7f),
)
}, },
entryProvider = entryProvider { entryProvider = entryProvider {
entry<Screen.Timer> { entry<Screen.Timer> {