wip

GrakovNe · Dec 1, 2024 · 610cf82 · 610cf82
1 parent 1e6714b
commit 610cf82
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt
@@ -90,6 +90,7 @@ fun LibraryScreen(
     var pullRefreshing by remember { mutableStateOf(false) }
     val recentBookRefreshing by libraryViewModel.recentBookUpdating.observeAsState(false)
     val searchRequested by libraryViewModel.searchRequested.observeAsState(false)
+    val preparingError by playerViewModel.preparingError.observeAsState(false)
 
     val library = when (searchRequested) {
         true -> libraryViewModel.searchPager.collectAsLazyPagingItems()
@@ -131,6 +132,12 @@ fun LibraryScreen(
         refreshContent(false)
     }
 
+    LaunchedEffect(preparingError) {
+        if (preparingError) {
+            playerViewModel.clearPlayingBook()
+        }
+    }
+
     val pullRefreshState = rememberPullRefreshState(
         refreshing = pullRefreshing,
         onRefresh = {

diff --git a/...c/main/java/org/grakovne/lissen/ui/screens/library/composables/DefaultActionComposable.kt b/...c/main/java/org/grakovne/lissen/ui/screens/library/composables/DefaultActionComposable.kt
@@ -34,7 +34,6 @@ import org.grakovne.lissen.R
 import org.grakovne.lissen.ui.icons.Search
 import org.grakovne.lissen.ui.navigation.AppNavigationService
 import org.grakovne.lissen.viewmodel.ContentCachingModelView
-import org.grakovne.lissen.viewmodel.LibraryViewModel
 import org.grakovne.lissen.viewmodel.PlayerViewModel
 
 @Composable

diff --git a/...src/main/java/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt b/...src/main/java/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt
@@ -4,23 +4,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.MenuBook
 import androidx.compose.material.icons.automirrored.outlined.MenuOpen
-import androidx.compose.material.icons.automirrored.outlined.PlaylistPlay
-import androidx.compose.material.icons.outlined.Book
-import androidx.compose.material.icons.outlined.Checklist
 import androidx.compose.material.icons.outlined.CloudDownload
-import androidx.compose.material.icons.outlined.LocalPlay
 import androidx.compose.material.icons.outlined.MenuOpen
-import androidx.compose.material.icons.outlined.PlayCircleOutline
-import androidx.compose.material.icons.outlined.PlayForWork
-import androidx.compose.material.icons.outlined.PlayLesson
-import androidx.compose.material.icons.outlined.PlaylistAddCircle
-import androidx.compose.material.icons.outlined.PlaylistPlay
 import androidx.compose.material.icons.outlined.SlowMotionVideo
 import androidx.compose.material.icons.outlined.Sync
 import androidx.compose.material.icons.outlined.Timer
-import androidx.compose.material.icons.rounded.Book
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography

diff --git a/app/src/main/java/org/grakovne/lissen/viewmodel/PlayerViewModel.kt b/app/src/main/java/org/grakovne/lissen/viewmodel/PlayerViewModel.kt
@@ -32,6 +32,7 @@ class PlayerViewModel @Inject constructor(
 
     val isPlaybackReady: LiveData<Boolean> = mediaRepository.isPlaybackReady
     val playbackSpeed: LiveData<Float> = mediaRepository.playbackSpeed
+    val preparingError: LiveData<Boolean> = mediaRepository.mediaPreparingError
 
     private val _searchRequested = MutableLiveData(false)
     val searchRequested: LiveData<Boolean> = _searchRequested
@@ -104,6 +105,7 @@ class PlayerViewModel @Inject constructor(
     fun togglePlayPause() = mediaRepository.togglePlayPause()
 
     companion object {
+
         private const val EMPTY_SEARCH = ""
     }
 }
diff --git a/app/src/main/java/org/grakovne/lissen/widget/MediaRepository.kt b/app/src/main/java/org/grakovne/lissen/widget/MediaRepository.kt
@@ -73,6 +73,9 @@ class MediaRepository @Inject constructor(
     private val _playingBook = MutableLiveData<DetailedItem?>()
     val playingBook: LiveData<DetailedItem?> = _playingBook
 
+    private val _mediaPreparingError = MutableLiveData<Boolean>()
+    val mediaPreparingError: LiveData<Boolean> = _mediaPreparingError
+
     private val _playbackSpeed = MutableLiveData(preferences.getPlaybackSpeed())
     val playbackSpeed: LiveData<Float> = _playbackSpeed
 
@@ -279,7 +282,7 @@ class MediaRepository @Inject constructor(
                     .fetchBook(bookId)
                     .foldAsync(
                         onSuccess = { startPreparingPlayback(it, fromBackground) },
-                        onFailure = {},
+                        onFailure = { _mediaPreparingError.postValue(true) },
                     )
             }
         }
@@ -349,6 +352,7 @@ class MediaRepository @Inject constructor(
             .value
             ?.let { updateTimer(timerOption = null) }
 
+        _mediaPreparingError.postValue(false)
         _isPlaybackReady.postValue(false)
     }