allow user to disable fullscreen swipe gesture

furthermore, some rewording

Signed-off-by: Toni Förster <toni.foerster@gmail.com>

Model/Import Export Settings/Exporters/ControlsSettingsGroupExporter.swift

@@ -5,6 +5,7 @@ final class ConstrolsSettingsGroupExporter: SettingsGroupExporter {
     override var globalJSON: JSON {
         [
             "avPlayerUsesSystemControls": Defaults[.avPlayerUsesSystemControls],
+            "fullscreenPlayerGestureEnabled": Defaults[.fullscreenPlayerGestureEnabled],
             "horizontalPlayerGestureEnabled": Defaults[.horizontalPlayerGestureEnabled],
             "seekGestureSensitivity": Defaults[.seekGestureSensitivity],
             "seekGestureSpeed": Defaults[.seekGestureSpeed],

Model/Import Export Settings/Importers/ControlsSettingsGroupImporter.swift

@@ -9,6 +9,10 @@ struct ConstrolsSettingsGroupImporter {
             Defaults[.avPlayerUsesSystemControls] = avPlayerUsesSystemControls
         }
 
+        if let fullscreenPlayerGestureEnabled = json["fullscreenPlayerGestureEnabled"].bool {
+            Defaults[.fullscreenPlayerGestureEnabled] = fullscreenPlayerGestureEnabled
+        }
+
         if let horizontalPlayerGestureEnabled = json["horizontalPlayerGestureEnabled"].bool {
             Defaults[.horizontalPlayerGestureEnabled] = horizontalPlayerGestureEnabled
         }

Open in Yattee/Open in Yattee.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.ZYMM2HKXY2.yattee.app.url</string>
+		<string>group.78Z5H3M6RJ.stream.yattee.app.urlbookmarks</string>
 	</array>
 </dict>
 </plist>

Shared/Defaults.swift

@@ -116,6 +116,7 @@ extension Defaults.Keys {
 
     static let avPlayerUsesSystemControls = Key<Bool>("avPlayerUsesSystemControls", default: Constants.isTvOS)
     static let horizontalPlayerGestureEnabled = Key<Bool>("horizontalPlayerGestureEnabled", default: true)
+    static let fullscreenPlayerGestureEnabled = Key<Bool>("fullscreenPlayerGestureEnabled", default: true)
     static let seekGestureSensitivity = Key<Double>("seekGestureSensitivity", default: 30.0)
     static let seekGestureSpeed = Key<Double>("seekGestureSpeed", default: 0.5)
 

Shared/Player/MPV/MPVOGLView.swift

@@ -11,7 +11,6 @@ final class MPVOGLView: GLKView {
     var mpvGL: UnsafeMutableRawPointer?
     var queue = DispatchQueue(label: "stream.yattee.opengl", qos: .userInteractive)
     var needsDrawing = true
-    private var dirtyRegion: CGRect?
 
     override init(frame: CGRect) {
         guard let context = EAGLContext(api: .openGLES2) else {
@@ -86,7 +85,6 @@ final class MPVOGLView: GLKView {
     @objc private func updateFrame() {
         // Trigger the drawing process if needed
         if needsDrawing {
-            markRegionAsDirty(bounds)
             setNeedsDisplay()
         }
     }
@@ -102,60 +100,16 @@ final class MPVOGLView: GLKView {
         glClear(UInt32(GL_COLOR_BUFFER_BIT))
     }
 
-    // Function to set a dirty region when a part of the screen changes
-    func markRegionAsDirty(_ region: CGRect) {
-        if dirtyRegion == nil {
-            dirtyRegion = region
-        } else {
-            // Expand the dirty region to include the new region
-            dirtyRegion = dirtyRegion!.union(region)
-        }
-    }
-
-    // Logic to decide if only part of the screen needs updating
-    private func needsPartialUpdate() -> Bool {
-        // Check if there is a defined dirty region that needs updating
-        if let dirtyRegion, !dirtyRegion.isEmpty {
-            // Set up glScissor based on dirtyRegion coordinates
-            glScissor(GLint(dirtyRegion.origin.x), GLint(dirtyRegion.origin.y), GLsizei(dirtyRegion.width), GLsizei(dirtyRegion.height))
-            return true
-        }
-        return false
-    }
-
-    // Call this function when you know the entire screen needs updating
-    private func clearDirtyRegion() {
-        dirtyRegion = nil
-    }
-
     override func draw(_: CGRect) {
         guard needsDrawing, let mpvGL else { return }
 
-        // Ensure the correct context is set
-        guard EAGLContext.setCurrent(context) else {
-            logger.error("Failed to set current OpenGL context.")
-            return
-        }
-
         // Bind the default framebuffer
         glGetIntegerv(UInt32(GL_FRAMEBUFFER_BINDING), &defaultFBO!)
 
-        // Ensure the framebuffer is valid
-        guard defaultFBO != nil && defaultFBO! != 0 else {
-            logger.error("Invalid framebuffer ID.")
-            return
-        }
-
         // Get the current viewport dimensions
         var dims: [GLint] = [0, 0, 0, 0]
         glGetIntegerv(GLenum(GL_VIEWPORT), &dims)
 
-        // Check if we need partial updates
-        if needsPartialUpdate() {
-            logger.info("Performing partial update with scissor test.")
-            glEnable(GLenum(GL_SCISSOR_TEST))
-        }
-
         // Set up the OpenGL FBO data
         var data = mpv_opengl_fbo(
             fbo: Int32(defaultFBO!),
@@ -175,23 +129,9 @@ final class MPVOGLView: GLKView {
                     mpv_render_param(type: MPV_RENDER_PARAM_FLIP_Y, data: flipPtr),
                     mpv_render_param()
                 ]
-                // Call the render function and check for errors
-                let result = mpv_render_context_render(OpaquePointer(mpvGL), &params)
-                if result < 0 {
-                    logger.error("mpv_render_context_render() failed with error code: \(result)")
-                } else {
-                    logger.info("mpv_render_context_render() called successfully.")
-                }
+                mpv_render_context_render(OpaquePointer(mpvGL), &params)
             }
         }
-
-        // Disable the scissor test after rendering if it was enabled
-        if needsPartialUpdate() {
-            glDisable(GLenum(GL_SCISSOR_TEST))
-        }
-
-        // Clear dirty region after drawing
-        clearDirtyRegion()
     }
 }
 

Shared/Player/PlayerDragGesture.swift

@@ -63,7 +63,7 @@ extension VideoPlayerView {
                 }
 
                 // Toggle fullscreen on upward drag only when not disabled
-                if verticalDrag < -50 {
+                if fullscreenPlayerGestureEnabled, verticalDrag < -50 {
                     player.toggleFullScreenAction()
                     disableGestureTemporarily()
                     return

Shared/Player/VideoPlayerView.swift

@@ -66,6 +66,7 @@ struct VideoPlayerView: View {
     #endif
 
     @Default(.horizontalPlayerGestureEnabled) var horizontalPlayerGestureEnabled
+    @Default(.fullscreenPlayerGestureEnabled) var fullscreenPlayerGestureEnabled
     @Default(.seekGestureSpeed) var seekGestureSpeed
     @Default(.seekGestureSensitivity) var seekGestureSensitivity
     @Default(.playerSidebar) var playerSidebar

Shared/Settings/PlayerControlsSettings.swift

@@ -8,6 +8,7 @@ struct PlayerControlsSettings: View {
     @Default(.playerControlsLayout) private var playerControlsLayout
     @Default(.fullScreenPlayerControlsLayout) private var fullScreenPlayerControlsLayout
     @Default(.horizontalPlayerGestureEnabled) private var horizontalPlayerGestureEnabled
+    @Default(.fullscreenPlayerGestureEnabled) private var fullscreenPlayerGestureEnabled
     @Default(.seekGestureSpeed) private var seekGestureSpeed
     @Default(.seekGestureSensitivity) private var seekGestureSensitivity
     @Default(.buttonBackwardSeekDuration) private var buttonBackwardSeekDuration
@@ -64,9 +65,10 @@ struct PlayerControlsSettings: View {
 
     @ViewBuilder var sections: some View {
         #if !os(tvOS)
-            Section(header: SettingsHeader(text: "Controls".localized()), footer: controlsLayoutFooter) {
-                #if !os(tvOS)
-                    avPlayerUsesSystemControlsToggle
+            Section(header: SettingsHeader(text: "Player Controls".localized()), footer: controlsLayoutFooter) {
+                avPlayerUsesSystemControlsToggle
+                #if os(iOS)
+                    fullscreenPlayerGestureEnabledToggle
                 #endif
                 horizontalPlayerGestureEnabledToggle
                 SettingsHeader(text: "Seek gesture sensitivity".localized(), secondary: true)
@@ -112,7 +114,7 @@ struct PlayerControlsSettings: View {
     }
 
     var controlsButtonsSection: some View {
-        Section(header: SettingsHeader(text: "Controls Buttons".localized())) {
+        Section(header: SettingsHeader(text: "Player Control Buttons".localized())) {
             controlButtonToggles
         }
     }
@@ -157,8 +159,12 @@ struct PlayerControlsSettings: View {
         #endif
     }
 
+    private var fullscreenPlayerGestureEnabledToggle: some View {
+        Toggle("Swipe up toggles fullscreen", isOn: $fullscreenPlayerGestureEnabled)
+    }
+
     private var horizontalPlayerGestureEnabledToggle: some View {
-        Toggle("Seek with horizontal swipe on video", isOn: $horizontalPlayerGestureEnabled)
+        Toggle("Seek with horizontal swipe", isOn: $horizontalPlayerGestureEnabled)
     }
 
     private var avPlayerUsesSystemControlsToggle: some View {