From 4a709d0bafb9c1109c436195ba7d785ada996d83 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Wed, 15 Jun 2022 16:58:27 +0200 Subject: [PATCH] Move LyricsShimmer --- .../vfsfitvnm/vimusic/ui/views/LyricsView.kt | 15 +++++++++++++-- .../vimusic/ui/views/PlayerBottomSheet.kt | 18 ------------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/LyricsView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/LyricsView.kt index 882e613..8fff1fd 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/LyricsView.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/LyricsView.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.text.style.TextDecoration @@ -18,6 +19,7 @@ import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.Message import it.vfsfitvnm.vimusic.ui.components.OutcomeItem import it.vfsfitvnm.vimusic.ui.components.themed.TextFieldDialog +import it.vfsfitvnm.vimusic.ui.components.themed.TextPlaceholder import it.vfsfitvnm.vimusic.ui.styling.LocalTypography import it.vfsfitvnm.vimusic.utils.center import it.vfsfitvnm.vimusic.utils.secondary @@ -55,11 +57,20 @@ fun LyricsView( outcome = lyricsOutcome, onInitialize = onInitialize, onLoading = { - LyricsShimmer( + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier .fillMaxSize() .shimmer() - ) + ) { + repeat(16) { index -> + TextPlaceholder( + modifier = Modifier + .alpha(1f - index * 0.05f) + ) + } + } } ) { lyrics -> Column( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerBottomSheet.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerBottomSheet.kt index d843c74..51aa730 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerBottomSheet.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerBottomSheet.kt @@ -237,21 +237,3 @@ fun PlayerBottomSheet( } } } - -@Composable -fun LyricsShimmer( - modifier: Modifier = Modifier -) { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - modifier = modifier - ) { - repeat(16) { index -> - TextPlaceholder( - modifier = Modifier - .alpha(1f - index * 0.05f) - ) - } - } -} \ No newline at end of file