kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 16:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #6755 from Bnyro/master

Browse Source 
fix: missing indicator for current selected resolution
This commit is contained in:
Bnyro 2024-11-18 16:09:57 +01:00 committed by GitHub
commit 8a96a22509
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -759,7 +759,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
commentsViewModel.setCommentSheetExpand(null)
updateResolutionOnFullscreenChange(true)
updateResolution(true)
openOrCloseFullscreenDialog(true)
binding.player.updateMarginsByFullscreenMode()
@ -776,7 +776,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
}
openOrCloseFullscreenDialog(false)
updateResolutionOnFullscreenChange(false)
updateResolution(false)
binding.player.updateMarginsByFullscreenMode()
@ -1257,7 +1257,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
updateCurrentSubtitle(viewModel.currentSubtitle)
// set media source and resolution in the beginning
updateResolutionOnFullscreenChange(commonPlayerViewModel.isFullscreen.value == true)
updateResolution(commonPlayerViewModel.isFullscreen.value == true)
playerController.sendCustomCommand(
AbstractPlayerService.runPlayerActionCommand,
bundleOf(PlayerCommand.START_PLAYBACK.name to true)
@ -1292,11 +1292,13 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
binding.player.selectedResolution = resolution
}
private fun updateResolutionOnFullscreenChange(isFullscreen: Boolean) {
private fun updateResolution(isFullscreen: Boolean) {
if (!isFullscreen && noFullscreenResolution != null) {
setPlayerResolution(noFullscreenResolution!!)
} else if (fullscreenResolution != null) {
setPlayerResolution(fullscreenResolution ?: Int.MAX_VALUE)
setPlayerResolution(fullscreenResolution!!)
} else {
setPlayerResolution(Int.MAX_VALUE)
}
}
@ -1344,7 +1346,9 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
BaseBottomSheet()
.setSimpleItems(
resolutions.map(VideoResolution::name),
preselectedItem = resolutions.firstOrNull { it.resolution == binding.player.selectedResolution }?.name
preselectedItem = resolutions.firstOrNull {
it.resolution == binding.player.selectedResolution
}?.name ?: getString(R.string.auto_quality)
) { which ->
val newResolution = resolutions[which].resolution
setPlayerResolution(newResolution, true)