diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/detail/ItemViewModel.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/detail/ItemViewModel.kt index 7ee380bd..9d8ede6d 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/detail/ItemViewModel.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/detail/ItemViewModel.kt @@ -63,17 +63,8 @@ abstract class LoadingItemViewModel( open fun init( itemId: UUID, potential: BaseItem?, - ): Job? { - if (item.value == null && potential?.id == itemId) { - item.value = potential - loading.value = LoadingState.Success - return null - } - if (item.value?.id == itemId) { - loading.value = LoadingState.Success - return null - } - return viewModelScope.launch( + ): Job? = + viewModelScope.launch( LoadingExceptionHandler( loading, "Error loading item $itemId", @@ -93,5 +84,4 @@ abstract class LoadingItemViewModel( loading.value = LoadingState.Error("Error loading item $itemId", e) } } - } } diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/detail/movie/MovieDetailsHeader.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/detail/movie/MovieDetailsHeader.kt index 42de9457..31cc4937 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/detail/movie/MovieDetailsHeader.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/detail/movie/MovieDetailsHeader.kt @@ -207,7 +207,7 @@ fun MovieDetailsHeader( } dto.genres?.letNotEmpty { TitleValueText( - stringResource(R.string.studios), + stringResource(R.string.genres), it.joinToString(", "), modifier = Modifier.widthIn(max = 80.dp), ) diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackContent.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackContent.kt index 04797c11..c8b621fe 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackContent.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackContent.kt @@ -45,6 +45,7 @@ import androidx.media3.ui.compose.state.rememberPresentationState import androidx.media3.ui.compose.state.rememberPreviousButtonState import androidx.tv.material3.MaterialTheme import com.github.damontecres.dolphin.preferences.UserPreferences +import com.github.damontecres.dolphin.ui.components.LoadingPage import com.github.damontecres.dolphin.ui.nav.Destination import com.github.damontecres.dolphin.ui.nav.NavigationManager import com.github.damontecres.dolphin.ui.tryRequestFocus @@ -147,7 +148,9 @@ fun PlaybackContent( Modifier .matchParentSize() .background(Color.Black), - ) + ) { + LoadingPage() + } } if (!controllerViewState.controlsVisible && skipIndicatorDuration != 0L) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d3f27971..15167e96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,4 +41,5 @@ Studios Video Audio + Genres