Merge branch 'main' into develop/jellyseerr

This commit is contained in:
Damontecres 2026-01-12 16:12:41 -05:00
commit 171e066637
No known key found for this signature in database
2 changed files with 5 additions and 7 deletions

View file

@ -110,12 +110,10 @@ fun SeriesOverviewContent(
val seasonStr = stringResource(R.string.tv_season) val seasonStr = stringResource(R.string.tv_season)
val tabs = val tabs =
remember(seasons) { seasons.map { season ->
seasons.mapNotNull { season?.name
it?.name ?: season?.data?.indexNumber?.let { "$seasonStr $it" }
?: it?.data?.indexNumber?.let { "$seasonStr $it" } ?: ""
?: ""
}
} }
val focusRequesters = remember(seasons) { List(seasons.size) { FocusRequester() } } val focusRequesters = remember(seasons) { List(seasons.size) { FocusRequester() } }

View file

@ -182,7 +182,7 @@ fun PlaybackDialog(
// } // }
}, },
onSelectChoice = { _, choice -> onSelectChoice = { _, choice ->
onPlaybackActionClick.invoke(PlaybackAction.ToggleCaptions(choice.index)) onPlaybackActionClick.invoke(PlaybackAction.ToggleAudio(choice.index))
}, },
gravity = Gravity.END, gravity = Gravity.END,
) )