feat(tv-show): skip loading TV show's 'Specials' season

Close #91
stantanasi · Apr 18, 2024 · 2cb73a6 · 2cb73a6
1 parent dd845ce
commit 2cb73a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/tanasi/streamflix/adapters/viewholders/TvShowViewHolder.kt b/app/src/main/java/com/tanasi/streamflix/adapters/viewholders/TvShowViewHolder.kt
@@ -534,6 +534,7 @@ class TvShowViewHolder(
             ?: episodes.indexOfLast { it.isWatched }
                 .takeIf { it != -1 && it + 1 < episodes.size }
                 ?.let { episodes.getOrNull(it + 1) }
+            ?: tvShow.seasons.firstOrNull { it.number != 0 }?.episodes?.firstOrNull()
             ?: episodes.firstOrNull()
 
         binding.btnTvShowWatchEpisode.apply {
@@ -718,8 +719,8 @@ class TvShowViewHolder(
             ?: episodes.indexOfLast { it.isWatched }
                 .takeIf { it != -1 && it + 1 < episodes.size }
                 ?.let { episodes.getOrNull(it + 1) }
+            ?: tvShow.seasons.firstOrNull { it.number != 0 }?.episodes?.firstOrNull()
             ?: episodes.firstOrNull()
-        episode?.season = episode?.season?.let { database.seasonDao().getById(it.id) }
 
         binding.btnTvShowWatchEpisode.apply {
             setOnClickListener {

diff --git a/app/src/main/java/com/tanasi/streamflix/fragments/tv_show/TvShowViewModel.kt b/app/src/main/java/com/tanasi/streamflix/fragments/tv_show/TvShowViewModel.kt
@@ -32,7 +32,9 @@ class TvShowViewModel(id: String, private val database: AppDatabase) : ViewModel
                     }
 
                     if (episodes.isEmpty() && state.tvShow.seasons.isNotEmpty()) {
-                        getSeason(TvShow(id, ""), state.tvShow.seasons.first())
+                        val firstSeason = state.tvShow.seasons.firstOrNull { it.number != 0 }
+                            ?: state.tvShow.seasons.first()
+                        getSeason(TvShow(id, ""), firstSeason)
                     } else {
                         val season = state.tvShow.seasons.let { seasons ->
                             seasons