From e97a08f06bc5215d0ef2fac81e09bab60febb21e Mon Sep 17 00:00:00 2001 From: grakovne Date: Fri, 29 Nov 2024 02:10:25 +0100 Subject: [PATCH] wip --- .../lissen/ui/screens/player/PlayerScreen.kt | 1 + ...owPlayingTitle.kt => ProvideNowPlayingTitle.kt} | 0 .../PlayingQueuePlaceholderComposable.kt | 14 ++++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) rename app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/{provideNowPlayingTitle.kt => ProvideNowPlayingTitle.kt} (100%) diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt index 6dbb48dc..75989740 100644 --- a/app/src/main/java/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt +++ b/app/src/main/java/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt @@ -213,6 +213,7 @@ fun PlayerScreen( ) } else { PlayingQueuePlaceholderComposable( + libraryViewModel = libraryViewModel, modifier = Modifier, ) } diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/provideNowPlayingTitle.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/ProvideNowPlayingTitle.kt similarity index 100% rename from app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/provideNowPlayingTitle.kt rename to app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/ProvideNowPlayingTitle.kt diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt index c8e515af..69ef145a 100644 --- a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt +++ b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt @@ -17,17 +17,23 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.stringResource +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.valentinilk.shimmer.shimmer -import org.grakovne.lissen.R +import org.grakovne.lissen.ui.screens.player.composable.provideNowPlayingTitle +import org.grakovne.lissen.viewmodel.LibraryViewModel @Composable -fun PlayingQueuePlaceholderComposable(modifier: Modifier = Modifier) { +fun PlayingQueuePlaceholderComposable( + libraryViewModel: LibraryViewModel, + modifier: Modifier = Modifier, +) { + val context = LocalContext.current + Column(modifier = modifier.padding(horizontal = 16.dp)) { Text( - text = stringResource(R.string.player_screen_library_playing_title), + text = provideNowPlayingTitle(libraryViewModel.fetchPreferredLibraryType(), context), fontSize = typography.titleMedium.fontSize * 1.25f, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.primary,