mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-11-29 09:39:03 +03:00
parent
9a944ff78a
commit
38366ae669
2 changed files with 111 additions and 8 deletions
|
@ -1,13 +1,24 @@
|
|||
package eu.kanade.tachiyomi.ui.player
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.view.GestureDetector
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import kotlin.math.abs
|
||||
|
||||
class Gestures(
|
||||
private val activity: PlayerActivity,
|
||||
private val width: Float,
|
||||
private val height: Float
|
||||
) : GestureDetector.SimpleOnGestureListener() {
|
||||
) : GestureDetector.SimpleOnGestureListener(), View.OnTouchListener {
|
||||
private var scrollState = STATE_UP
|
||||
|
||||
private val trigger = width.coerceAtMost(height) / 30
|
||||
|
||||
private val preferences: PreferencesHelper by injectLazy()
|
||||
|
||||
override fun onDown(event: MotionEvent): Boolean {
|
||||
return true
|
||||
}
|
||||
|
@ -34,11 +45,58 @@ class Gestures(
|
|||
|
||||
override fun onDoubleTap(e: MotionEvent): Boolean {
|
||||
if (e.y < height * 0.05F || e.y > height * 0.95F) return false
|
||||
val interval = preferences.skipLengthPreference()
|
||||
when {
|
||||
e.x < width * 0.4F -> activity.doubleTapSeek(-10, e)
|
||||
e.x > width * 0.6F -> activity.doubleTapSeek(10, e)
|
||||
e.x < width * 0.4F -> activity.doubleTapSeek(-interval, e)
|
||||
e.x > width * 0.6F -> activity.doubleTapSeek(interval, e)
|
||||
else -> return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onScroll(
|
||||
e1: MotionEvent,
|
||||
e2: MotionEvent,
|
||||
distanceX: Float,
|
||||
distanceY: Float
|
||||
): Boolean {
|
||||
if (e1.y < height * 0.05F || e1.y > height * 0.95F) return false
|
||||
val dx = e1.x - e2.x
|
||||
val dy = e1.y - e2.y
|
||||
when (scrollState) {
|
||||
STATE_UP -> {
|
||||
if (abs(dx) > trigger) {
|
||||
scrollState = STATE_HORIZONTAL
|
||||
activity.initSeek()
|
||||
} else if (abs(dy) > trigger) {
|
||||
scrollState = if (e1.x > width / 2) STATE_VERTICAL_R else STATE_VERTICAL_L
|
||||
}
|
||||
}
|
||||
STATE_VERTICAL_L -> {
|
||||
activity.verticalScrollLeft(1.5F * distanceY / height)
|
||||
}
|
||||
STATE_VERTICAL_R -> {
|
||||
activity.verticalScrollRight(1.5F * distanceY / height)
|
||||
}
|
||||
STATE_HORIZONTAL -> {
|
||||
activity.horizontalScroll(150F * -dx / width)
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@SuppressLint("ClickableViewAccessibility")
|
||||
override fun onTouch(v: View, event: MotionEvent): Boolean {
|
||||
if (event.action == MotionEvent.ACTION_UP) {
|
||||
if (scrollState != STATE_UP) {
|
||||
scrollState = STATE_UP
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
private const val STATE_UP = 0
|
||||
private const val STATE_HORIZONTAL = 1
|
||||
private const val STATE_VERTICAL_L = 2
|
||||
private const val STATE_VERTICAL_R = 3
|
||||
|
|
|
@ -5,6 +5,7 @@ import android.annotation.SuppressLint
|
|||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.res.ColorStateList
|
||||
import android.media.AudioManager
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.os.Handler
|
||||
|
@ -43,6 +44,7 @@ import `is`.xyz.mpv.Utils
|
|||
import logcat.LogPriority
|
||||
import nucleus.factory.RequiresPresenter
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
@RequiresPresenter(PlayerPresenter::class)
|
||||
class PlayerActivity :
|
||||
|
@ -66,6 +68,12 @@ class PlayerActivity :
|
|||
|
||||
private val player get() = binding.player
|
||||
|
||||
private var audioManager: AudioManager? = null
|
||||
private var fineVolume = 0F
|
||||
private var maxVolume = 0
|
||||
|
||||
private var initialSeek = -1
|
||||
|
||||
private var userIsOperatingSeekbar = false
|
||||
|
||||
// private var lockedUI = false
|
||||
|
@ -136,14 +144,20 @@ class PlayerActivity :
|
|||
MPVLib.setOptionString("keep-open", "always")
|
||||
player.addObserver(this)
|
||||
|
||||
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
|
||||
fineVolume = audioManager!!.getStreamVolume(AudioManager.STREAM_MUSIC).toFloat()
|
||||
maxVolume = audioManager!!.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
|
||||
val dm = DisplayMetrics()
|
||||
windowManager.defaultDisplay.getRealMetrics(dm)
|
||||
val width = dm.widthPixels.toFloat()
|
||||
val height = dm.heightPixels.toFloat()
|
||||
|
||||
mDetector = GestureDetectorCompat(this, Gestures(this, width, height))
|
||||
val gestures = Gestures(this, width, height)
|
||||
mDetector = GestureDetectorCompat(this, gestures)
|
||||
// player.setOnClickListener { binding.controls.isVisible = !binding.controls.isVisible }
|
||||
player.setOnTouchListener { _, event ->
|
||||
player.setOnTouchListener { v, event ->
|
||||
gestures.onTouch(v, event)
|
||||
mDetector.onTouchEvent(event)
|
||||
}
|
||||
binding.cycleAudioBtn.setOnLongClickListener { pickAudio(); true }
|
||||
|
@ -372,13 +386,44 @@ class PlayerActivity :
|
|||
|
||||
ObjectAnimator.ofFloat(v, "alpha", 0f, 0.2f).setDuration(500).start()
|
||||
ObjectAnimator.ofFloat(v, "alpha", 0.2f, 0.2f, 0f).setDuration(1000).start()
|
||||
val newPos = (player.timePos ?: 0) + time // only for display
|
||||
MPVLib.command(arrayOf("seek", time.toString(), "relative"))
|
||||
|
||||
val diffText = Utils.prettyTime(time, true)
|
||||
binding.gestureTextView.text = getString(R.string.ui_seek_distance, Utils.prettyTime(newPos), diffText)
|
||||
showGestureText()
|
||||
}
|
||||
|
||||
fun verticalScrollLeft(diff: Float) {
|
||||
val initialBright = Utils.getScreenBrightness(this) ?: 0.5f
|
||||
val newBright = (initialBright + diff).coerceIn(0f, 1f)
|
||||
window.attributes.screenBrightness = newBright
|
||||
|
||||
binding.gestureTextView.text = getString(R.string.ui_brightness, (newBright * 100).roundToInt())
|
||||
showGestureText()
|
||||
}
|
||||
|
||||
fun verticalScrollRight(diff: Float) {
|
||||
fineVolume = (fineVolume + (diff * maxVolume)).coerceIn(0F, maxVolume.toFloat())
|
||||
val newVolume = fineVolume.toInt()
|
||||
val newVolumePercent = 100 * newVolume / maxVolume
|
||||
audioManager!!.setStreamVolume(AudioManager.STREAM_MUSIC, newVolume, 0)
|
||||
|
||||
binding.gestureTextView.text = getString(R.string.ui_volume, newVolumePercent)
|
||||
showGestureText()
|
||||
}
|
||||
|
||||
fun initSeek() {
|
||||
initialSeek = player.timePos ?: -1
|
||||
}
|
||||
|
||||
fun horizontalScroll(diff: Float) {
|
||||
// disable seeking when timePos is not available
|
||||
val duration = player.duration ?: 0
|
||||
val initialSeek = player.timePos ?: -1
|
||||
if (duration == 0) {
|
||||
if (duration == 0 || initialSeek < 0) {
|
||||
return
|
||||
}
|
||||
val newPos = (initialSeek + time).coerceIn(0, duration)
|
||||
val newPos = (initialSeek + diff.toInt()).coerceIn(0, duration)
|
||||
val newDiff = newPos - initialSeek
|
||||
// seek faster than assigning to timePos but less precise
|
||||
MPVLib.command(arrayOf("seek", newPos.toString(), "absolute+keyframes"))
|
||||
|
|
Loading…
Reference in a new issue