Merge pull request #7757 from osamasayed585/feat/drag-to-seekbar

feat: allow drag-to-seek like YouTube

Author: Bnyro

app/src/main/java/com/github/libretube/ui/views/DismissableTimeBar.kt

@@ -4,13 +4,15 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
+import android.view.ViewConfiguration
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.DefaultTimeBar
 import androidx.media3.ui.PlayerControlView
 import androidx.media3.ui.TimeBar
 import androidx.media3.ui.TimeBar.OnScrubListener
 import com.github.libretube.extensions.dpToPx
+import kotlin.math.abs
 
 @UnstableApi
 open class DismissableTimeBar(
@@ -19,41 +21,113 @@ open class DismissableTimeBar(
 ): DefaultTimeBar(context, attributeSet) {
     private var shouldAddListener = false
     var exoPlayer: Player? = null
-    private var lastYPosition = 0f
+
+    private val listeners = mutableListOf<OnScrubListener>()
+
+    // Drag-only seeking state
+    private var initialX: Float = 0f
+    private var initialY: Float = 0f
+    private var waitingForDrag: Boolean = false
+    private var dragStarted: Boolean = false
+    private val touchSlopPx: Int = ViewConfiguration.get(context).scaledTouchSlop
 
     init {
-        addSeekBarListener(object : OnScrubListener {
-            override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
+        super.addListener(object : OnScrubListener {
+            override fun onScrubStart(timeBar: TimeBar, position: Long) {
+                listeners.forEach { it.onScrubStart(timeBar, position) }
+            }
 
-            override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
+            override fun onScrubMove(timeBar: TimeBar, position: Long) {
+                listeners.forEach { it.onScrubMove(timeBar, position) }
+            }
 
             override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
-                if (lastYPosition > MINIMUM_ACCEPTED_HEIGHT.dpToPx()) exoPlayer?.seekTo(position)
+                listeners.forEach { it.onScrubStop(timeBar, position, canceled) }
+
+                if (canceled) return
+                // Ignore if gesture started too far above the bar (keep original behavior)
+                if (initialY <= MINIMUM_ACCEPTED_HEIGHT.dpToPx()) return
+
+                exoPlayer?.seekTo(position)
             }
         })
     }
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        lastYPosition = event.y
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                initialX = event.x
+                initialY = event.y
+                waitingForDrag = true
+                dragStarted = false
+                // Consume without forwarding to prevent tap-to-seek or thumb jump
+                return true
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (waitingForDrag) {
+                    // make sure that the user dragged at least touchSlopPx pixels
+                    // which is the minimum amount to trigger a drag event
+                    val dx = abs(event.x - initialX)
+                    val dy = abs(event.y - initialY)
+                    if (dx > touchSlopPx || dy > touchSlopPx) {
+                        // Begin scrubbing now by synthesizing a DOWN at the current progress X
+                        val fakeDown = MotionEvent.obtain(event).apply {
+                            action = MotionEvent.ACTION_DOWN
+                            setLocation(event.x, event.y)
+                        }
+                        super.onTouchEvent(fakeDown)
+                        fakeDown.recycle()
+
+                        waitingForDrag = false
+                        dragStarted = true
+                    } else {
+                        // Still not considered a drag; consume
+                        return true
+                    }
+                }
+
+                // Forward MOVE only after we've started dragging, with relative X
+                if (dragStarted) {
+                    return super.onTouchEvent(event)
+                }
+                return true
+            }
+
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                // If we started a drag, forward the terminal event to finish scrubbing
+                if (dragStarted) {
+                    waitingForDrag = false
+                    dragStarted = false
+                    return super.onTouchEvent(event)
+                }
+
+                // It's a tap without drag: do nothing (prevent seek and thumb jump)
+                waitingForDrag = false
+                dragStarted = false
+                // Optionally report click for accessibility without side effects
+                performClick()
+                return true
+            }
+        }
 
         return super.onTouchEvent(event)
     }
 
     /**
      * DO NOT CALL THIS METHOD DIRECTLY. Use [addSeekBarListener] instead!
      */
+    @Deprecated("Use addSeekBarListener instead")
     override fun addListener(listener: OnScrubListener) {
-        if (shouldAddListener) super.addListener(listener)
+        // do nothing, see below on how listeners should be set
     }
 
     /**
      * Wrapper to circumvent adding the listener created by [PlayerControlView]
      */
     fun addSeekBarListener(listener: OnScrubListener) {
-        shouldAddListener = true
-        addListener(listener)
-        shouldAddListener = false
+        listeners.add(listener)
     }
 
     fun setPlayer(player: Player) {