Skip to content

fix: focus first unwatched episode in details view (#117) #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProdigyV21 merged 1 commit into from
Apr 5, 2026
Merged

fix: focus first unwatched episode in details view (#117) #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/details/DetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,20 @@ class DetailsViewModel @Inject constructor(
}

val targetEpisodeForRow = if (initialSeason == seasonToLoad) initialEpisode else null
val initialEpisodeIndex = if (targetEpisodeForRow != null) {
decoratedEpisodes.indexOfFirst { it.episodeNumber == targetEpisodeForRow }.coerceAtLeast(0)
} else 0
val nextUnwatchedEpisode = decoratedEpisodes.firstOrNull { !it.isWatched }
// Focus the explicit target episode if the caller passed one (deeplink /
// Continue Watching tile), otherwise focus the first unwatched episode so
// users don't have to scroll past every episode they've already seen.
// When every episode in the current season is watched we fall back to
// the first episode (index 0) — from there the user can jump to the next
// season via the season selector. See issue #117.
val initialEpisodeIndex = when {
targetEpisodeForRow != null ->
decoratedEpisodes.indexOfFirst { it.episodeNumber == targetEpisodeForRow }.coerceAtLeast(0)
nextUnwatchedEpisode != null ->
decoratedEpisodes.indexOf(nextUnwatchedEpisode).coerceAtLeast(0)
else -> 0
}
val hasWatchedEpisodes = decoratedEpisodes.any { it.isWatched }
updateState { state ->
val shouldUseEpisodeTarget = !hasExplicitEpisodeTarget &&
Expand Down
Loading