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

Merge pull request #2361 from Bnyro/master

Browse Source 
Hightlight the current resolution in the quality selection
This commit is contained in:
Bnyro 2022-12-12 19:18:28 +01:00 committed by GitHub
commit 90f3a716a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/github/libretube/services/DownloadService.kt
View File

@ -106,8 +106,9 @@ class DownloadService : Service() {
DownloadManager.EXTRA_DOWNLOAD_ID,
-1
)
if (downloadId == audioDownloadId) audioDownloadId = null
else if (downloadId == videoDownloadId) videoDownloadId = null
if (downloadId == audioDownloadId) {
audioDownloadId = null
} else if (downloadId == videoDownloadId) videoDownloadId = null
if (audioDownloadId != null || videoDownloadId != null) return

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

@ -1133,12 +1133,12 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
if (resolutions.isEmpty()) {
return listOf(
VideoResolution(getString(R.string.hls), adaptiveSourceUrl = streams.hls)
VideoResolution(getString(R.string.hls), resolution = Int.MAX_VALUE, adaptiveSourceUrl = streams.hls)
)
} else {
resolutions.add(0, VideoResolution(getString(R.string.auto_quality), Int.MAX_VALUE))
}
resolutions.add(0, VideoResolution(getString(R.string.auto_quality), null))
return resolutions
}
@ -1176,12 +1176,9 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
)
}
private fun setPlayerResolution(resolution: Int?) {
private fun setPlayerResolution(resolution: Int) {
val params = trackSelector.buildUponParameters()
when (resolution) {
null -> params.setMaxVideoSize(Int.MAX_VALUE, Int.MAX_VALUE).setMinVideoSize(0, 0)
else -> params.setMaxVideoSize(Int.MAX_VALUE, resolution).setMinVideoSize(Int.MIN_VALUE, resolution)
}
params.setMaxVideoSize(Int.MAX_VALUE, resolution).setMinVideoSize(Int.MIN_VALUE, resolution)
trackSelector.setParameters(params)
}
@ -1327,13 +1324,18 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
override fun onQualityClicked() {
// get the available resolutions
val resolutions = getAvailableResolutions()
val currentQuality = trackSelector.parameters.maxVideoHeight
// Dialog for quality selection
BaseBottomSheet()
.setSimpleItems(
resolutions.map { it.name }
resolutions.map {
if (currentQuality == it.resolution) "${it.name} ✓" else it.name
}
) { which ->
setPlayerResolution(resolutions[which].resolution)
resolutions[which].resolution?.let {
setPlayerResolution(it)
}
}
.show(childFragmentManager)
}