justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 23:51:21 +02:00
Code Issues Projects Packages Wiki Activity Actions

Simplify playback next up

Browse source
This commit is contained in:
Damontecres 2025-10-07 15:27:18 -04:00
parent 34959a4e3c
commit 8ab092d2ca
No known key found for this signature in database
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/github/damontecres/dolphin/ui/playback/NextUpEpisode.kt
View file

@ -72,7 +72,7 @@ fun NextUpEpisode(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
Row( Row(
horizontalArrangement = Arrangement.spacedBy(16.dp), horizontalArrangement = Arrangement.spacedBy(32.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(8.dp), modifier = Modifier.padding(8.dp),
) { ) {

26
app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt
View file

@ -18,6 +18,7 @@ import com.github.damontecres.dolphin.data.model.BaseItem
import com.github.damontecres.dolphin.data.model.Chapter import com.github.damontecres.dolphin.data.model.Chapter
import com.github.damontecres.dolphin.preferences.UserPreferences import com.github.damontecres.dolphin.preferences.UserPreferences
import com.github.damontecres.dolphin.ui.DefaultItemFields import com.github.damontecres.dolphin.ui.DefaultItemFields
import com.github.damontecres.dolphin.ui.indexOfFirstOrNull
import com.github.damontecres.dolphin.ui.nav.Destination import com.github.damontecres.dolphin.ui.nav.Destination
import com.github.damontecres.dolphin.util.ApiRequestPager import com.github.damontecres.dolphin.util.ApiRequestPager
import com.github.damontecres.dolphin.util.ExceptionHandler import com.github.damontecres.dolphin.util.ExceptionHandler
@ -427,19 +428,17 @@ class PlaybackViewModel
fun getEpisodes(seriesId: UUID) { fun getEpisodes(seriesId: UUID) {
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val episodes =
if (!this@PlaybackViewModel.episodes.isInitialized) {
val request = val request =
GetEpisodesRequest(seriesId = seriesId, fields = DefaultItemFields) GetEpisodesRequest(
val pager = seriesId = seriesId,
ApiRequestPager(api, request, GetEpisodesRequestHandler, viewModelScope) fields = DefaultItemFields,
pager.init() startItemId = itemId,
currentEpisodeIndex = pager.indexOfBlocking { it?.id == itemId } limit = 2,
pager )
} else { val episodes = GetEpisodesRequestHandler.execute(api, request).content.items
this@PlaybackViewModel.episodes.value!! val currentEpisodeIndex = episodes.indexOfFirstOrNull { it.id == itemId }
}
Timber.v("Current episode is $currentEpisodeIndex of ${episodes.size}") Timber.v("Current episode is $currentEpisodeIndex of ${episodes.size}")
if (currentEpisodeIndex != null) {
val nextIndex = currentEpisodeIndex + 1 val nextIndex = currentEpisodeIndex + 1
if (nextIndex < episodes.size) { if (nextIndex < episodes.size) {
val listener = val listener =
@ -447,8 +446,8 @@ class PlaybackViewModel
override fun onPlaybackStateChanged(playbackState: Int) { override fun onPlaybackStateChanged(playbackState: Int) {
if (playbackState == Player.STATE_ENDED) { if (playbackState == Player.STATE_ENDED) {
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val nextItem = episodes.getBlocking(nextIndex) val nextItem = BaseItem.from(episodes[nextIndex], api)
Timber.v("Setting next up episode to ${nextItem?.id}") Timber.v("Setting next up episode to ${nextItem.id}")
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
nextUpEpisode.value = nextItem nextUpEpisode.value = nextItem
} }
@ -479,6 +478,7 @@ class PlaybackViewModel
} }
} }
} }
}
fun playUpNextEpisode() { fun playUpNextEpisode() {
nextUpEpisode.value?.let { nextUpEpisode.value?.let {