From aa27e14e9761c7b0f46781fcc330c70f8e3d890e Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Sun, 12 Jun 2022 15:10:08 +0200 Subject: [PATCH] Add transition to SettingsScreen --- .../vfsfitvnm/vimusic/ui/screens/HomeScreen.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt index 861dd55..28c99bf 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import androidx.media3.common.Player import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.route.fastFade import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.enums.SongCollection @@ -52,9 +53,7 @@ import kotlinx.coroutines.launch @ExperimentalAnimationApi @Composable -fun HomeScreen( -// uri: Uri?, -) { +fun HomeScreen() { val colorPalette = LocalColorPalette.current val typography = LocalTypography.current @@ -70,8 +69,6 @@ fun HomeScreen( val albumRoute = rememberPlaylistOrAlbumRoute() val artistRoute = rememberArtistRoute() -// val (route, onRouteChanged) = rememberRoute(uri?.let { intentUriRoute }) - val playlistPreviews by remember { Database.playlistPreviews() }.collectAsState(initial = emptyList(), context = Dispatchers.IO) @@ -86,7 +83,15 @@ fun HomeScreen( } }.collectAsState(initial = emptyList(), context = Dispatchers.IO) - RouteHandler(listenToGlobalEmitter = true) { + RouteHandler( + listenToGlobalEmitter = true, + transitionSpec = { + when (targetState.route) { + settingsRoute -> scaleIn(initialScale = 0.9f) with fadeOut() + else -> fastFade + } + } + ) { settingsRoute { SettingsScreen() }