Add player gesture features

wizdom13 · wizdom13 · commit d04934de097f · 2026-06-06T14:53:16.000+03:00
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -950,6 +950,13 @@ public void setPlaybackSpeed(final float speed) {
         setPlaybackParameters(speed, getPlaybackPitch(), getPlaybackSkipSilence());
     }
 
+    public void setPlaybackSpeedTemporarily(final float speed) {
+        if (!exoPlayerIsNull()) {
+            simpleExoPlayer.setPlaybackParameters(
+                    new PlaybackParameters(speed, getPlaybackPitch()));
+        }
+    }
+
     public float getPlaybackPitch() {
         return getPlaybackParameters().pitch;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/BasePlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/BasePlayerGestureListener.kt
@@ -9,6 +9,7 @@ import android.view.View
 import androidx.core.os.postDelayed
 import org.schabi.newpipe.databinding.PlayerBinding
 import org.schabi.newpipe.player.Player
+import org.schabi.newpipe.player.helper.PlayerHelper
 import org.schabi.newpipe.player.ui.VideoPlayerUi
 
 /**
@@ -24,8 +25,14 @@ abstract class BasePlayerGestureListener(
     protected val player: Player = playerUi.player
     protected val binding: PlayerBinding = playerUi.binding
 
+    private var isHoldToSpeedActive = false
+    private var previousPlaybackSpeed = 1.0f
+
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         playerUi.gestureDetector.onTouchEvent(event)
+        if (event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL) {
+            restoreHoldToSpeed()
+        }
         return false
     }
 
@@ -120,6 +127,27 @@ abstract class BasePlayerGestureListener(
         return true
     }
 
+    override fun onLongPress(e: MotionEvent) {
+        if (isHoldToSpeedActive || !PlayerHelper.isHoldToSpeedEnabled(player.context) ||
+            player.exoPlayerIsNull()
+        ) {
+            return
+        }
+
+        previousPlaybackSpeed = player.playbackSpeed
+        player.setPlaybackSpeedTemporarily(PlayerHelper.getHoldToSpeedValue(player.context))
+        isHoldToSpeedActive = true
+    }
+
+    private fun restoreHoldToSpeed() {
+        if (!isHoldToSpeedActive) {
+            return
+        }
+
+        player.setPlaybackSpeedTemporarily(previousPlaybackSpeed)
+        isHoldToSpeedActive = false
+    }
+
     // ///////////////////////////////////////////////////////////////////
     // Multi double tapping
     // ///////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
@@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.view.isVisible
 import kotlin.math.abs
+import kotlin.math.sign
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
 import org.schabi.newpipe.ktx.AnimationType
@@ -17,6 +18,7 @@ import org.schabi.newpipe.player.Player
 import org.schabi.newpipe.player.helper.AudioReactor
 import org.schabi.newpipe.player.helper.PlayerHelper
 import org.schabi.newpipe.player.ui.MainPlayerUi
+import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.ThemeHelper.getAndroidDimenPx
 
 /**
@@ -31,15 +33,26 @@ class MainPlayerGestureListener(
 ) : BasePlayerGestureListener(playerUi), OnTouchListener {
     private var isMoving = false
 
+    private var isSwipeSeeking = false
+    private var accumulatedSeek = 0f
+    private var swipeSeekStartPosition = 0L
+    private var swipeSeekTargetPosition = 0L
+
+    private var isPendingFullscreenSwipe = false
+
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         super.onTouch(v, event)
-        if (event.action == MotionEvent.ACTION_UP && isMoving) {
+        if ((event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL) &&
+            isMoving
+        ) {
             isMoving = false
             onScrollEnd(event)
         }
         return when (event.action) {
             MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
-                v.parent?.requestDisallowInterceptTouchEvent(playerUi.isFullscreen)
+                v.parent?.requestDisallowInterceptTouchEvent(
+                    playerUi.isFullscreen || PlayerHelper.isFullscreenGestureEnabled(player.context)
+                )
                 true
             }
 
@@ -156,6 +169,16 @@ class MainPlayerGestureListener(
 
     override fun onScrollEnd(event: MotionEvent) {
         super.onScrollEnd(event)
+        if (isPendingFullscreenSwipe) {
+            playerUi.toggleFullscreen()
+            isPendingFullscreenSwipe = false
+            return
+        }
+        if (isSwipeSeeking) {
+            player.seekTo(swipeSeekTargetPosition)
+            binding.swipeSeekDisplay.animate(false, 200, AnimationType.SCALE_AND_ALPHA)
+            isSwipeSeeking = false
+        }
         if (binding.volumeRelativeLayout.isVisible) {
             binding.volumeRelativeLayout.animate(false, 200, AnimationType.SCALE_AND_ALPHA, 200)
         }
@@ -164,13 +187,49 @@ class MainPlayerGestureListener(
         }
     }
 
+    private fun onScrollSeek(distanceX: Float) {
+        val duration = player.exoPlayer?.duration ?: 0L
+        if (duration <= 0L) {
+            return
+        }
+
+        if (!isSwipeSeeking) {
+            isSwipeSeeking = true
+            accumulatedSeek = 0f
+            swipeSeekStartPosition = player.exoPlayer?.currentPosition ?: 0L
+            swipeSeekTargetPosition = swipeSeekStartPosition
+            binding.swipeSeekDisplay.animate(true, 200, AnimationType.SCALE_AND_ALPHA)
+            binding.volumeRelativeLayout.isVisible = false
+            binding.brightnessRelativeLayout.isVisible = false
+        }
+
+        accumulatedSeek -= distanceX
+        val thresholdPx = SEEK_SWIPE_FAST_THRESHOLD_MS / SEEK_SWIPE_FACTOR
+        val deltaMs = if (abs(accumulatedSeek) <= thresholdPx) {
+            (accumulatedSeek * SEEK_SWIPE_FACTOR).toLong()
+        } else {
+            val beyond = abs(accumulatedSeek) - thresholdPx
+            (sign(accumulatedSeek) *
+                (SEEK_SWIPE_FAST_THRESHOLD_MS +
+                    beyond * SEEK_SWIPE_FACTOR * SEEK_SWIPE_FAST_MULTIPLIER)).toLong()
+        }
+
+        swipeSeekTargetPosition = (swipeSeekStartPosition + deltaMs).coerceIn(0L, duration)
+
+        val delta = swipeSeekTargetPosition - swipeSeekStartPosition
+        val deltaText = (if (delta >= 0) "+" else "-") +
+            Localization.getDurationString(abs(delta) / 1000L)
+        val targetText = Localization.getDurationString(swipeSeekTargetPosition / 1000L)
+        binding.swipeSeekDisplay.text = "$deltaText ($targetText)"
+    }
+
     override fun onScroll(
         initialEvent: MotionEvent?,
         movingEvent: MotionEvent,
         distanceX: Float,
         distanceY: Float
     ): Boolean {
-        if (initialEvent == null || !playerUi.isFullscreen) {
+        if (initialEvent == null) {
             return false
         }
 
@@ -185,16 +244,42 @@ class MainPlayerGestureListener(
             return false
         }
 
-        val insideThreshold = abs(movingEvent.y - initialEvent.y) <= MOVEMENT_THRESHOLD
+        val isHorizontal = abs(distanceX) > abs(distanceY)
+        val insideThreshold = abs(movingEvent.y - initialEvent.y) <= MOVEMENT_THRESHOLD &&
+            abs(movingEvent.x - initialEvent.x) <= MOVEMENT_THRESHOLD
         if (
-            !isMoving && (insideThreshold || abs(distanceX) > abs(distanceY)) ||
+            !isMoving && insideThreshold ||
             player.currentState == Player.STATE_COMPLETED
         ) {
             return false
         }
 
         isMoving = true
 
+        if (isSwipeSeeking) {
+            onScrollSeek(distanceX)
+            return true
+        }
+
+        if (PlayerHelper.isFullscreenGestureEnabled(player.context) && !isHorizontal) {
+            val portion = getDisplayPortion(initialEvent)
+            if ((playerUi.isFullscreen && distanceY < 0 && portion == DisplayPortion.MIDDLE) ||
+                (!playerUi.isFullscreen && distanceY > 0)
+            ) {
+                isPendingFullscreenSwipe = true
+                return true
+            }
+        }
+
+        if (!playerUi.isFullscreen) {
+            return false
+        }
+
+        if (PlayerHelper.isSwipeSeekGestureEnabled(player.context) && isHorizontal) {
+            onScrollSeek(distanceX)
+            return true
+        }
+
         // -- Brightness and Volume control --
         if (getDisplayHalfPortion(initialEvent) == DisplayPortion.RIGHT_HALF) {
             when (PlayerHelper.getActionForRightGestureSide(player.context)) {
@@ -236,5 +321,8 @@ class MainPlayerGestureListener(
         private val TAG = MainPlayerGestureListener::class.java.simpleName
         private val DEBUG = MainActivity.DEBUG
         private const val MOVEMENT_THRESHOLD = 40
+        private const val SEEK_SWIPE_FACTOR = 100f // ms per pixel
+        private const val SEEK_SWIPE_FAST_MULTIPLIER = 10f
+        private const val SEEK_SWIPE_FAST_THRESHOLD_MS = 60_000L
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -220,6 +220,37 @@ public static String getActionForLeftGestureSide(@NonNull final Context context)
                         context.getString(R.string.default_left_gesture_control_value));
     }
 
+    public static boolean isSwipeSeekGestureEnabled(@NonNull final Context context) {
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.swipe_seek_gesture_control_key), true);
+    }
+
+    public static boolean isFullscreenGestureEnabled(@NonNull final Context context) {
+        return getPreferences(context)
+                .getBoolean(context.getString(R.string.fullscreen_gesture_control_key), true);
+    }
+
+    public static boolean isHoldToSpeedEnabled(@NonNull final Context context) {
+        return !context.getString(R.string.hold_to_speed_off_value)
+                .equals(getPreferences(context).getString(
+                        context.getString(R.string.hold_to_speed_key),
+                        context.getString(R.string.hold_to_speed_default_value)));
+    }
+
+    public static float getHoldToSpeedValue(@NonNull final Context context) {
+        final String value = getPreferences(context).getString(
+                context.getString(R.string.hold_to_speed_key),
+                context.getString(R.string.hold_to_speed_default_value));
+        if (context.getString(R.string.hold_to_speed_off_value).equals(value)) {
+            return 1.0f;
+        }
+        try {
+            return Float.parseFloat(value);
+        } catch (final NullPointerException | NumberFormatException e) {
+            return Float.parseFloat(context.getString(R.string.hold_to_speed_default_value));
+        }
+    }
+
     public static boolean isStartMainPlayerFullscreenEnabled(@NonNull final Context context) {
         return getPreferences(context)
                 .getBoolean(context.getString(R.string.start_main_player_fullscreen_key), false);
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
@@ -776,6 +776,23 @@
                     tools:src="@drawable/ic_brightness_high" />
             </RelativeLayout>
 
+            <org.schabi.newpipe.views.NewPipeTextView
+                android:id="@+id/swipeSeekDisplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/background_oval_black_transparent"
+                android:paddingStart="18dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="18dp"
+                android:paddingBottom="12dp"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:text="+00:15 (03:12)"
+                tools:visibility="visible" />
+
         </RelativeLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
@@ -232,6 +232,30 @@
         <item>@string/none_control_key</item>
     </string-array>
 
+    <string name="swipe_seek_gesture_control_key">swipe_seek_gesture_control</string>
+    <string name="fullscreen_gesture_control_key">fullscreen_gesture_control</string>
+    <string name="hold_to_speed_key">hold_to_speed</string>
+    <string name="hold_to_speed_default_value">2.0</string>
+    <string name="hold_to_speed_off_value">off</string>
+    <string-array name="hold_to_speed_entries">
+        <item>@string/hold_to_speed_off</item>
+        <item>1.25x</item>
+        <item>1.5x</item>
+        <item>1.75x</item>
+        <item>2x</item>
+        <item>2.5x</item>
+        <item>3x</item>
+    </string-array>
+    <string-array name="hold_to_speed_values">
+        <item>@string/hold_to_speed_off_value</item>
+        <item>1.25</item>
+        <item>1.5</item>
+        <item>1.75</item>
+        <item>2.0</item>
+        <item>2.5</item>
+        <item>3.0</item>
+    </string-array>
+
     <string name="prefer_original_audio_key">prefer_original_audio</string>
     <string name="prefer_descriptive_audio_key">prefer_descriptive_audio</string>
     <string name="last_resize_mode">last_resize_mode</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -943,4 +943,11 @@
     <string name="api23_requirement_dialog_title">NewPipe is dropping support for Android 5</string>
     <string name="api23_requirement_dialog_message">Unfortunately NewPipe depends on a few libraries that dropped support for Android 5.0 and 5.1. The next NewPipe release will therefore only work on devices with Android 6 or higher, sadly. Read more in the blogpost.</string>
     <string name="api23_requirement_dialog_blogpost">Blogpost</string>
+    <string name="swipe_seek_title">Swipe seek</string>
+    <string name="swipe_seek_summary">Swipe left or right on the video to seek</string>
+    <string name="fullscreen_swipe_title">Fullscreen swipe</string>
+    <string name="fullscreen_swipe_summary">Swipe up or down on the video to enter or exit fullscreen</string>
+    <string name="hold_to_speed_title">Hold to speed up</string>
+    <string name="hold_to_speed_summary">Temporarily speed up playback while holding the video</string>
+    <string name="hold_to_speed_off">Off</string>
 </resources>
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
@@ -208,6 +208,33 @@
             app:singleLineTitle="false"
             app:iconSpaceReserved="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/swipe_seek_gesture_control_key"
+            android:summary="@string/swipe_seek_summary"
+            android:title="@string/swipe_seek_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/fullscreen_gesture_control_key"
+            android:summary="@string/fullscreen_swipe_summary"
+            android:title="@string/fullscreen_swipe_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
+        <ListPreference
+            android:defaultValue="@string/hold_to_speed_default_value"
+            android:entries="@array/hold_to_speed_entries"
+            android:entryValues="@array/hold_to_speed_values"
+            android:key="@string/hold_to_speed_key"
+            android:summary="@string/hold_to_speed_summary"
+            android:title="@string/hold_to_speed_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="@string/popup_remember_size_pos_key"

Original file line number	Diff line number	Diff line change
`@@ -950,6 +950,13 @@ public void setPlaybackSpeed(final float speed) {`
`950`	`950`	`setPlaybackParameters(speed, getPlaybackPitch(), getPlaybackSkipSilence());`
`951`	`951`	`}`
`952`	`952`
	`953`	`+ public void setPlaybackSpeedTemporarily(final float speed) {`
	`954`	`+ if (!exoPlayerIsNull()) {`
	`955`	`+ simpleExoPlayer.setPlaybackParameters(`
	`956`	`+ new PlaybackParameters(speed, getPlaybackPitch()));`
	`957`	`+ }`
	`958`	`+ }`
	`959`	`+`
`953`	`960`	`public float getPlaybackPitch() {`
`954`	`961`	`return getPlaybackParameters().pitch;`
`955`	`962`	`}`