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

seeking preview on keyframes

Browse source
This commit is contained in:
jmir1 2022-07-05 19:04:31 +02:00
parent 9a6a877468
commit e0a25cf38c
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,8 @@ class Gestures(
return true
}
private var scrollDiff: Float? = null
override fun onScroll(
e1: MotionEvent,
e2: MotionEvent,
@ -82,7 +84,9 @@ class Gestures(
activity.verticalScrollRight(1.5F * distanceY / height)
}
STATE_HORIZONTAL -> {
activity.horizontalScroll(150F * -dx / width)
val diff = 150F * -dx / width
scrollDiff = diff
activity.horizontalScroll(diff)
}
}
return true
@ -91,6 +95,10 @@ class Gestures(
@SuppressLint("ClickableViewAccessibility")
override fun onTouch(v: View, event: MotionEvent): Boolean {
if (event.action == MotionEvent.ACTION_UP) {
if (scrollState == STATE_HORIZONTAL) {
scrollDiff?.let { activity.horizontalScroll(it, final = true) }
scrollDiff = null
}
if (scrollState != STATE_UP) {
scrollState = STATE_UP
}

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

@ -810,7 +810,7 @@ class PlayerActivity :
fun initSeek() {
initialSeek = player.timePos ?: -1
}
fun horizontalScroll(diff: Float) {
fun horizontalScroll(diff: Float, final: Boolean = false) {
// disable seeking when timePos is not available
val duration = player.duration ?: 0
if (duration == 0 || initialSeek < 0) {
@ -820,7 +820,7 @@ class PlayerActivity :
val newDiff = newPos - initialSeek
playerControls.hideUiForSeek()
if (preferences.getPlayerSmoothSeek()) player.timePos = newPos else MPVLib.command(arrayOf("seek", newPos.toString(), "absolute+keyframes"))
if (preferences.getPlayerSmoothSeek() && final) player.timePos = newPos else MPVLib.command(arrayOf("seek", newPos.toString(), "absolute+keyframes"))
playerControls.updatePlaybackPos(newPos)
val diffText = Utils.prettyTime(newDiff, true)

4
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
View file

@ -40,7 +40,7 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
return
}
hideUiForSeek()
activity.player.timePos = progress
MPVLib.command(arrayOf("seek", progress.toString(), "absolute+keyframes"))
updatePlaybackPos(progress)
val duration = activity.player.duration ?: 0
@ -60,6 +60,8 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
}
override fun onStopTrackingTouch(seekBar: SeekBar) {
val newPos = seekBar.progress
if (preferences.getPlayerSmoothSeek()) activity.player.timePos = newPos else MPVLib.command(arrayOf("seek", newPos.toString(), "absolute+keyframes"))
userIsOperatingSeekbar = false
animationHandler.removeCallbacks(hideUiForSeekRunnable)
animationHandler.postDelayed(hideUiForSeekRunnable, 500L)