feat(gestures): Customizable Long Press Speed (#202)

Nostalgia-WZQ · web-flow · commit 2ebca9fe58e1 · 2025-02-15T14:08:56.000+01:00
* Long Press Speed Adjustment with More Options

* Modify the default value of long-press speed to 2x and cancel the 0.25 increment.

* Using the '.toFixed' function

* Can it solve the build failed?
diff --git a/app/src/main/java/live/mehiz/mpvkt/preferences/PlayerPreferences.kt b/app/src/main/java/live/mehiz/mpvkt/preferences/PlayerPreferences.kt
@@ -12,7 +12,7 @@ class PlayerPreferences(
   val invertDuration = preferenceStore.getBoolean("invert_duration")
   val drawOverDisplayCutout = preferenceStore.getBoolean("draw_over_cutout", true)
 
-  val holdForDoubleSpeed = preferenceStore.getBoolean("hold_for_double_speed", true)
+  val holdForMultipleSpeed = preferenceStore.getFloat("hold_for_multiple_speed", 2f)
   val horizontalSeekGesture = preferenceStore.getBoolean("horizontal_seek_gesture", true)
   val showSeekBarWhenSeeking = preferenceStore.getBoolean("show_seekbar_when_seeking")
   val preciseSeeking = preferenceStore.getBoolean("precise_seeking")
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerEnums.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerEnums.kt
@@ -76,7 +76,7 @@ enum class Panels {
 
 sealed class PlayerUpdates {
   data object None : PlayerUpdates()
-  data object DoubleSpeed : PlayerUpdates()
+  data object MultipleSpeed : PlayerUpdates()
   data object AspectRatio : PlayerUpdates()
   data class ShowText(val value: String) : PlayerUpdates()
 }
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/GestureHandler.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/GestureHandler.kt
@@ -75,7 +75,7 @@ fun GestureHandler(
     delay(100)
     viewModel.hideSeekBar()
   }
-  val doubleSpeedGesture by playerPreferences.holdForDoubleSpeed.collectAsState()
+  val multipleSpeedGesture by playerPreferences.holdForMultipleSpeed.collectAsState()
   val brightnessGesture = playerPreferences.brightnessGesture.get()
   val volumeGesture by playerPreferences.volumeGesture.collectAsState()
   val swapVolumeAndBrightness by playerPreferences.swapVolumeAndBrightness.collectAsState()
@@ -142,13 +142,13 @@ fun GestureHandler(
             interactionSource.emit(PressInteraction.Release(press))
           },
           onLongPress = {
-            if (!doubleSpeedGesture || areControlsLocked) return@detectTapGestures
+            if (multipleSpeedGesture == 0f || areControlsLocked) return@detectTapGestures
             if (!isLongPressing && !viewModel.paused.value) {
               originalSpeed = viewModel.playbackSpeed.value
               haptics.performHapticFeedback(HapticFeedbackType.LongPress)
               isLongPressing = true
-              MPVLib.setPropertyDouble("speed", 2.0)
-              viewModel.playerUpdate.update { PlayerUpdates.DoubleSpeed }
+              MPVLib.setPropertyDouble("speed", multipleSpeedGesture.toDouble())
+              viewModel.playerUpdate.update { PlayerUpdates.MultipleSpeed }
             }
           },
         )
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerControls.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerControls.kt
@@ -76,7 +76,7 @@ import live.mehiz.mpvkt.ui.player.Sheets
 import live.mehiz.mpvkt.ui.player.VideoAspect
 import live.mehiz.mpvkt.ui.player.controls.components.BrightnessSlider
 import live.mehiz.mpvkt.ui.player.controls.components.ControlsButton
-import live.mehiz.mpvkt.ui.player.controls.components.DoubleSpeedPlayerUpdate
+import live.mehiz.mpvkt.ui.player.controls.components.MultipleSpeedPlayerUpdate
 import live.mehiz.mpvkt.ui.player.controls.components.SeekbarWithTimers
 import live.mehiz.mpvkt.ui.player.controls.components.TextPlayerUpdate
 import live.mehiz.mpvkt.ui.player.controls.components.VolumeSlider
@@ -288,11 +288,11 @@ fun PlayerControls(
             displayAsPercentage = displayVolumeAsPercentage,
           )
         }
-
+        val holdForMultipleSpeed by playerPreferences.holdForMultipleSpeed.collectAsState()
         val currentPlayerUpdate by viewModel.playerUpdate.collectAsState()
         val aspectRatio by playerPreferences.videoAspect.collectAsState()
         LaunchedEffect(currentPlayerUpdate, aspectRatio) {
-          if (currentPlayerUpdate is PlayerUpdates.DoubleSpeed || currentPlayerUpdate is PlayerUpdates.None) {
+          if (currentPlayerUpdate is PlayerUpdates.MultipleSpeed || currentPlayerUpdate is PlayerUpdates.None) {
             return@LaunchedEffect
           }
           delay(2000)
@@ -308,7 +308,7 @@ fun PlayerControls(
           },
         ) {
           when (currentPlayerUpdate) {
-            is PlayerUpdates.DoubleSpeed -> DoubleSpeedPlayerUpdate()
+            is PlayerUpdates.MultipleSpeed -> MultipleSpeedPlayerUpdate(currentSpeed = holdForMultipleSpeed)
             is PlayerUpdates.AspectRatio -> TextPlayerUpdate(stringResource(aspectRatio.titleRes))
             is PlayerUpdates.ShowText -> TextPlayerUpdate((currentPlayerUpdate as PlayerUpdates.ShowText).value)
             else -> {}
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/components/PlayerUpdates.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/components/PlayerUpdates.kt
@@ -50,15 +50,16 @@ fun TextPlayerUpdate(
 }
 
 @Composable
-fun DoubleSpeedPlayerUpdate(
+fun MultipleSpeedPlayerUpdate(
+  currentSpeed: Float,
   modifier: Modifier = Modifier
 ) {
   PlayerUpdate(modifier) {
     Row(
       verticalAlignment = Alignment.Bottom,
     ) {
       Text(
-        stringResource(R.string.player_speed, 2f),
+        stringResource(R.string.player_speed, currentSpeed),
         fontWeight = FontWeight.Bold,
         fontSize = 20.sp,
       )
@@ -72,6 +73,6 @@ fun DoubleSpeedPlayerUpdate(
 
 @Composable
 @Preview
-private fun PreviewDoubleSpeedPlayerUpdate() {
-  DoubleSpeedPlayerUpdate()
+private fun PreviewMultipleSpeedPlayerUpdate() {
+  MultipleSpeedPlayerUpdate(currentSpeed = 2f)
 }
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/preferences/PlayerPreferencesScreen.kt b/app/src/main/java/live/mehiz/mpvkt/ui/preferences/PlayerPreferencesScreen.kt
@@ -27,6 +27,7 @@ import live.mehiz.mpvkt.preferences.PlayerPreferences
 import live.mehiz.mpvkt.preferences.preference.collectAsState
 import live.mehiz.mpvkt.presentation.Screen
 import live.mehiz.mpvkt.ui.player.PlayerOrientation
+import live.mehiz.mpvkt.ui.player.controls.components.sheets.toFixed
 import me.zhanghai.compose.preference.ListPreference
 import me.zhanghai.compose.preference.PreferenceCategory
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
@@ -156,11 +157,23 @@ object PlayerPreferencesScreen : Screen() {
             onValueChange = preferences.volumeGesture::set,
             title = { Text(stringResource(R.string.pref_player_gestures_volume)) },
           )
-          val holdForDoubleSpeed by preferences.holdForDoubleSpeed.collectAsState()
-          SwitchPreference(
-            value = holdForDoubleSpeed,
-            onValueChange = preferences.holdForDoubleSpeed::set,
-            title = { Text(stringResource(R.string.pref_player_gestures_hold_for_double_speed)) },
+          val holdForMultipleSpeed by preferences.holdForMultipleSpeed.collectAsState()
+          SliderPreference(
+            value = holdForMultipleSpeed,
+            onValueChange = { preferences.holdForMultipleSpeed.set(it.toFixed(2)) },
+            title = { Text(stringResource(R.string.pref_player_gestures_hold_for_multiple_speed)) },
+            valueRange = 0f..6f,
+            summary = {
+              Text(
+                if (holdForMultipleSpeed == 0F) {
+                  stringResource(R.string.generic_disabled)
+                } else {
+                  "%.2fx".format(holdForMultipleSpeed)
+                },
+              )
+            },
+            onSliderValueChange = { preferences.holdForMultipleSpeed.set(it.toFixed(2)) },
+            sliderValue = holdForMultipleSpeed,
           )
           PreferenceCategory(
             title = { Text(stringResource(R.string.pref_player_controls)) },
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -48,6 +48,7 @@
     <string name="pref_player_gestures_brightness">亮度调整手势</string>
     <string name="pref_player_gestures_volume">音量调整手势</string>
     <string name="pref_player_gestures_hold_for_double_speed">长按二倍速</string>
+    <string name="pref_player_gestures_hold_for_multiple_speed">长按多倍速</string>
     <string name="pref_player_controls">控制</string>
     <string name="pref_player_controls_allow_gestures_in_panels">允许在面板中使用手势</string>
     <string name="pref_player_controls_show_loading_circle">显示加载动画</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -56,6 +56,7 @@
     <string name="pref_player_gestures_brightness">Brightness gestures</string>
     <string name="pref_player_gestures_volume">Volume gestures</string>
     <string name="pref_player_gestures_hold_for_double_speed">Hold for 2x speed</string>
+    <string name="pref_player_gestures_hold_for_multiple_speed">Hold for multi - x speed</string>
 
     <string name="pref_player_controls">Controls</string>
     <string name="pref_player_controls_allow_gestures_in_panels">Allow gestures in panels</string>

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ enum class Panels {`
`76`	`76`
`77`	`77`	`sealed class PlayerUpdates {`
`78`	`78`	`data object None : PlayerUpdates()`
`79`		`- data object DoubleSpeed : PlayerUpdates()`
	`79`	`+ data object MultipleSpeed : PlayerUpdates()`
`80`	`80`	`data object AspectRatio : PlayerUpdates()`
`81`	`81`	`data class ShowText(val value: String) : PlayerUpdates()`
`82`	`82`	`}`