diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt index f9f4b3a1..ef5d74a4 100644 --- a/app/src/main/java/com/futo/platformplayer/Settings.kt +++ b/app/src/main/java/com/futo/platformplayer/Settings.kt @@ -830,6 +830,12 @@ class Settings : FragmentedStorageFileJson() { @FormField(R.string.restore_system_brightness, FieldForm.TOGGLE, R.string.restore_system_brightness_descr, 6) var restoreSystemBrightness: Boolean = true; + + @FormField(R.string.zoom_option, FieldForm.TOGGLE, R.string.zoom_option_descr, 7) + var zoom: Boolean = true; + + @FormField(R.string.pan_option, FieldForm.TOGGLE, R.string.pan_option_descr, 8) + var pan: Boolean = true; } @FormField(R.string.info, FieldForm.GROUP, -1, 20) diff --git a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt index 4aa09621..10953833 100644 --- a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt @@ -116,7 +116,7 @@ class GestureControlView : LinearLayout { _scaleGestureDetector = ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() { override fun onScale(detector: ScaleGestureDetector): Boolean { - if (!_isFullScreen) { + if (!_isFullScreen || !Settings.instance.gestureControls.zoom) { return false } @@ -201,7 +201,7 @@ class GestureControlView : LinearLayout { } } } - } else if (_isFullScreen && !_isZooming) { + } else if (_isFullScreen && !_isZooming && Settings.instance.gestureControls.pan) { stopAllGestures() pan(_translationX - distanceX, _translationY - distanceY) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c67e7e0f..7534afcb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -355,6 +355,10 @@ Gesture controls adjust system brightness Restore system brightness Restore system brightness when exiting fullscreen + Enable zoom + Enable two finger pinch zoom gesture + Enable pan + Enable two finger pan gesture System volume Gesture controls adjust system volume Live Chat Webview