diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt index 8996852..54ce794 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt @@ -1,9 +1,7 @@ package it.vfsfitvnm.vimusic.ui.screens import androidx.annotation.DrawableRes -import androidx.compose.animation.AnimatedContentScope import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.animation.with import androidx.compose.foundation.* import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* @@ -17,9 +15,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import it.vfsfitvnm.route.Route0 -import it.vfsfitvnm.route.RouteHandler -import it.vfsfitvnm.route.fastFade +import it.vfsfitvnm.route.* import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.TopAppBar import it.vfsfitvnm.vimusic.ui.components.themed.EnumValueSelectorDialog @@ -47,13 +43,9 @@ fun SettingsScreen() { listenToGlobalEmitter = true, transitionSpec = { when (targetState.route) { - appearanceRoute, backupAndRestoreRoute -> - slideIntoContainer(AnimatedContentScope.SlideDirection.Left) with - slideOutOfContainer(AnimatedContentScope.SlideDirection.Left) + appearanceRoute, backupAndRestoreRoute -> leftSlide else -> when (initialState.route) { - appearanceRoute, backupAndRestoreRoute -> - slideIntoContainer(AnimatedContentScope.SlideDirection.Right) with - slideOutOfContainer(AnimatedContentScope.SlideDirection.Right) + appearanceRoute, backupAndRestoreRoute -> rightSlide else -> fastFade } } diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt index 36d128a..647ef0b 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt @@ -4,6 +4,16 @@ import androidx.compose.animation.* import androidx.compose.animation.core.tween +@ExperimentalAnimationApi +val AnimatedContentScope.leftSlide: ContentTransform + get() = slideIntoContainer(AnimatedContentScope.SlideDirection.Left) with + slideOutOfContainer(AnimatedContentScope.SlideDirection.Left) + +@ExperimentalAnimationApi +val AnimatedContentScope.rightSlide: ContentTransform + get() = slideIntoContainer(AnimatedContentScope.SlideDirection.Right) with + slideOutOfContainer(AnimatedContentScope.SlideDirection.Right) + @ExperimentalAnimationApi val AnimatedContentScope.fastFade: ContentTransform get() = fadeIn(tween(200)) with fadeOut(tween(200))