mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 09:39:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix controls not fading after gesture seek

Browse source
This commit is contained in:
jmir1 2022-07-05 22:45:02 +02:00
parent e0a25cf38c
commit 3fb99b290b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/ui/player/Gestures.kt
View file

@ -98,6 +98,7 @@ class Gestures(
if (scrollState == STATE_HORIZONTAL) {
scrollDiff?.let { activity.horizontalScroll(it, final = true) }
scrollDiff = null
activity.playerControls.resetControlsFade()
}
if (scrollState != STATE_UP) {
scrollState = STATE_UP

13
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
View file

@ -259,15 +259,15 @@ class PlayerActivity :
private var playerIsDestroyed = true
internal var subTracks: Array<Track> = emptyArray()
private var subTracks: Array<Track> = emptyArray()
internal var selectedSub = 0
private var selectedSub = 0
private var hadPreviousSubs = false
internal var audioTracks: Array<Track> = emptyArray()
private var audioTracks: Array<Track> = emptyArray()
internal var selectedAudio = 0
private var selectedAudio = 0
private var hadPreviousAudio = false
@ -541,7 +541,7 @@ class PlayerActivity :
showLoadingIndicator(position >= cachePosition && seeking)
}
internal fun setSub(index: Int) {
private fun setSub(index: Int) {
if (selectedSub == index || selectedSub > subTracks.lastIndex) return
selectedSub = index
if (index == 0) {
@ -557,7 +557,7 @@ class PlayerActivity :
?: MPVLib.command(arrayOf("sub-add", subTracks[index].url, "select", subTracks[index].url))
}
internal fun setAudio(index: Int) {
private fun setAudio(index: Int) {
if (selectedAudio == index || selectedAudio > audioTracks.lastIndex) return
selectedAudio = index
if (index == 0) {
@ -810,6 +810,7 @@ class PlayerActivity :
fun initSeek() {
initialSeek = player.timePos ?: -1
}
fun horizontalScroll(diff: Float, final: Boolean = false) {
// disable seeking when timePos is not available
val duration = player.duration ?: 0