wip

GrakovNe · Nov 29, 2024 · 21c7854 · 21c7854
1 parent b3d3175
commit 21c7854
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
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
@@ -1,5 +1,6 @@
 package org.grakovne.lissen.ui.screens.player
 
+import android.content.Context
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
@@ -33,13 +34,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import coil.ImageLoader
 import org.grakovne.lissen.R
+import org.grakovne.lissen.channel.common.LibraryType
 import org.grakovne.lissen.domain.DetailedItem
 import org.grakovne.lissen.ui.icons.Search
 import org.grakovne.lissen.ui.navigation.AppNavigationService
@@ -49,6 +52,7 @@ import org.grakovne.lissen.ui.screens.player.composable.TrackControlComposable
 import org.grakovne.lissen.ui.screens.player.composable.TrackDetailsComposable
 import org.grakovne.lissen.ui.screens.player.composable.placeholder.PlayingQueuePlaceholderComposable
 import org.grakovne.lissen.ui.screens.player.composable.placeholder.TrackDetailsPlaceholderComposable
+import org.grakovne.lissen.ui.screens.player.composable.provideNowPlayingTitle
 import org.grakovne.lissen.viewmodel.ContentCachingModelView
 import org.grakovne.lissen.viewmodel.LibraryViewModel
 import org.grakovne.lissen.viewmodel.PlayerViewModel
@@ -61,6 +65,8 @@ fun PlayerScreen(
     bookId: String,
     bookTitle: String,
 ) {
+    val context = LocalContext.current
+
     val cachingModelView: ContentCachingModelView = hiltViewModel()
     val playerViewModel: PlayerViewModel = hiltViewModel()
     val libraryViewModel: LibraryViewModel = hiltViewModel()
@@ -73,7 +79,7 @@ fun PlayerScreen(
     val searchRequested by playerViewModel.searchRequested.observeAsState(false)
 
     val screenTitle = when (playingQueueExpanded) {
-        true -> stringResource(R.string.player_screen_now_playing_title)
+        true -> provideNowPlayingTitle(libraryViewModel.fetchPreferredLibraryType(), context)
         false -> stringResource(R.string.player_screen_title)
     }
 
@@ -202,6 +208,7 @@ fun PlayerScreen(
 
                 if (isPlaybackReady) {
                     PlayingQueueComposable(
+                        libraryViewModel = libraryViewModel,
                         viewModel = playerViewModel,
                         modifier = Modifier,
                     )
@@ -223,4 +230,4 @@ private fun playingItemChanged(
 private fun cachePolicyChanged(
     contentCachingModelView: ContentCachingModelView,
     playingBook: DetailedItem?,
-) = contentCachingModelView.localCacheUsing() != playingBook?.localProvided
+) = contentCachingModelView.localCacheUsing() != playingBook?.localProvided
diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/PlayingQueueComposable.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/PlayingQueueComposable.kt
@@ -49,10 +49,12 @@ import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.android.awaitFrame
 import kotlinx.coroutines.launch
 import org.grakovne.lissen.R
+import org.grakovne.lissen.viewmodel.LibraryViewModel
 import org.grakovne.lissen.viewmodel.PlayerViewModel
 
 @Composable
 fun PlayingQueueComposable(
+    libraryViewModel: LibraryViewModel,
     viewModel: PlayerViewModel,
     modifier: Modifier = Modifier,
 ) {
@@ -122,7 +124,7 @@ fun PlayingQueueComposable(
     ) {
         if (playingQueueExpanded.not()) {
             Text(
-                text = stringResource(R.string.player_screen_now_playing_title),
+                text = provideNowPlayingTitle(libraryViewModel.fetchPreferredLibraryType(), context),
                 fontSize = fontSize.sp,
                 fontWeight = FontWeight.SemiBold,
                 color = MaterialTheme.colorScheme.primary,

diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/PlaylistItemComposable.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/PlaylistItemComposable.kt
@@ -44,7 +44,7 @@ fun PlaylistItemComposable(
         if (isSelected) {
             Icon(
                 imageVector = Icons.Outlined.Audiotrack,
-                contentDescription = stringResource(R.string.player_screen_now_playing_title),
+                contentDescription = stringResource(R.string.player_screen_library_playing_title),
                 modifier = Modifier.size(16.dp),
             )
         } else {

diff --git a/...ovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt b/...ovne/lissen/ui/screens/player/composable/placeholder/PlayingQueuePlaceholderComposable.kt
@@ -27,7 +27,7 @@ import org.grakovne.lissen.R
 fun PlayingQueuePlaceholderComposable(modifier: Modifier = Modifier) {
     Column(modifier = modifier.padding(horizontal = 16.dp)) {
         Text(
-            text = stringResource(R.string.player_screen_now_playing_title),
+            text = stringResource(R.string.player_screen_library_playing_title),
             fontSize = typography.titleMedium.fontSize * 1.25f,
             fontWeight = FontWeight.SemiBold,
             color = MaterialTheme.colorScheme.primary,

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
@@ -0,0 +1,14 @@
+package org.grakovne.lissen.ui.screens.player.composable
+
+import android.content.Context
+import org.grakovne.lissen.R
+import org.grakovne.lissen.channel.common.LibraryType
+
+fun provideNowPlayingTitle(
+    libraryType: LibraryType,
+    context: Context
+) = when (libraryType) {
+    LibraryType.LIBRARY -> context.getString(R.string.player_screen_library_playing_title)
+    LibraryType.PODCAST -> context.getString(R.string.player_screen_podcast_playing_title)
+    LibraryType.UNKNOWN -> context.getString(R.string.player_screen_items_playing_title)
+}
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -14,7 +14,7 @@
     <string name="player_screen_playback_speed_navigation">Скорость</string>
     <string name="player_screen_chapter_list_navigation">Эпизоды</string>
     <string name="player_screen_preferences_navigation">Настройки</string>
-    <string name="player_screen_now_playing_title">"Список эпизодов"</string>
+    <string name="player_screen_library_playing_title">"Список глав"</string>
     <string name="player_screen_now_playing_title_chapter_of">Эпизод %1$s из %2$s</string>
     <string name="settings_screen_title">Настройки</string>
     <string name="settings_screen_preferred_library_title">Выбранная библиотека</string>
@@ -78,4 +78,6 @@
     <string name="downloads_menu_download_option_clear_chapters">Удалить загруженные главы</string>
     <string name="downloads_menu_download_option_clear_episodes">Удалить загруженные выпуски</string>
     <string name="downloads_menu_download_option_clear_items">Удалить загруженные элементы</string>
+    <string name="player_screen_podcast_playing_title">Список выпусков</string>
+    <string name="player_screen_items_playing_title">Список элементов</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -14,7 +14,9 @@
     <string name="player_screen_playback_speed_navigation">Speed</string>
     <string name="player_screen_chapter_list_navigation">Chapters</string>
     <string name="player_screen_preferences_navigation">Preferences</string>
-    <string name="player_screen_now_playing_title">Playing chapters</string>
+    <string name="player_screen_library_playing_title">Playing chapters</string>
+    <string name="player_screen_podcast_playing_title">Playing episodes</string>
+    <string name="player_screen_items_playing_title">Playing items</string>
     <string name="player_screen_now_playing_title_chapter_of">Chapter %1$s of %2$s</string>
     <string name="settings_screen_title">Preferences</string>
     <string name="settings_screen_preferred_library_title">Preferred library</string>