Player overlaying other views and swipe gesture (fix #44, #130)

Model/Player/Backends/MPVBackend.swift

@@ -1,5 +1,6 @@
 import AVFAudio
 import CoreMedia
+import Defaults
 import Foundation
 import Logging
 import SwiftUI
@@ -247,7 +248,13 @@ final class MPVBackend: PlayerBackend {
         client?.stop()
     }
 
-    func enterFullScreen() {}
+    func enterFullScreen() {
+        model.toggleFullscreen(controls?.playingFullscreen ?? false)
+
+        if Defaults[.lockLandscapeWhenEnteringFullscreen] {
+            Orientation.lockOrientation(.landscape, andRotateTo: UIDevice.current.orientation.isLandscape ? nil : .landscapeRight)
+        }
+    }
 
     func exitFullScreen() {}
 

Model/Player/Backends/MPVClient.swift

@@ -134,11 +134,11 @@ final class MPVClient: ObservableObject {
     }
 
     var currentTime: CMTime {
-        CMTime.secondsInDefaultTimescale(getDouble("time-pos"))
+        CMTime.secondsInDefaultTimescale(mpv.isNil ? -1 : getDouble("time-pos"))
     }
 
     var duration: CMTime {
-        CMTime.secondsInDefaultTimescale(getDouble("duration"))
+        CMTime.secondsInDefaultTimescale(mpv.isNil ? -1 : getDouble("duration"))
     }
 
     func seek(relative time: CMTime, completionHandler: ((Bool) -> Void)? = nil) {

Model/Player/PlayerModel.swift

@@ -57,8 +57,6 @@ final class PlayerModel: ObservableObject {
 
     @Published var preservedTime: CMTime?
 
-    @Published var playerNavigationLinkActive = false { didSet { handleNavigationViewPlayerPresentationChange() } }
-
     @Published var sponsorBlock = SponsorBlockAPI()
     @Published var segmentRestorationTime: CMTime?
     @Published var lastSkipped: Segment? { didSet { rebuildTVMenu() } }
@@ -120,23 +118,24 @@ final class PlayerModel: ObservableObject {
     }
 
     func show() {
-        guard !presentingPlayer else {
-            #if os(macOS)
+        #if os(macOS)
+            if presentingPlayer {
                 Windows.player.focus()
-            #endif
-            return
-        }
+                return
+            }
+        #endif
+
+        presentingPlayer = true
+
         #if os(macOS)
             Windows.player.open()
             Windows.player.focus()
         #endif
-        presentingPlayer = true
     }
 
     func hide() {
         controls.playingFullscreen = false
         presentingPlayer = false
-        playerNavigationLinkActive = false
 
         #if os(iOS)
             if Defaults[.lockPortraitWhenBrowsing] {
@@ -206,18 +205,25 @@ final class PlayerModel: ObservableObject {
         backend.pause()
     }
 
-    func play(_ video: Video, at time: CMTime? = nil, inNavigationView: Bool = false) {
-        playNow(video, at: time)
+    func play(_ video: Video, at time: CMTime? = nil) {
+        var delay = 0.0
+        #if !os(macOS)
+            delay = 0.3
+        #endif
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+            guard let self = self else {
+                return
+            }
+
+            self.playNow(video, at: time)
+        }
 
         guard !playingInPictureInPicture else {
             return
         }
 
-        if inNavigationView {
-            playerNavigationLinkActive = true
-        } else {
-            show()
-        }
+        show()
     }
 
     func playStream(
@@ -297,7 +303,18 @@ final class PlayerModel: ObservableObject {
     }
 
     private func handlePresentationChange() {
-        backend.setNeedsDrawing(presentingPlayer)
+        var delay = 0.0
+
+        #if os(iOS)
+            if presentingPlayer {
+                delay = 0.2
+            }
+        #endif
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+            self?.backend.setNeedsDrawing(self?.presentingPlayer ?? false)
+        }
+
         controls.hide()
 
         #if !os(macOS)
@@ -323,17 +340,6 @@ final class PlayerModel: ObservableObject {
         }
     }
 
-    private func handleNavigationViewPlayerPresentationChange() {
-        backend.setNeedsDrawing(playerNavigationLinkActive)
-        controls.hide()
-
-        if pauseOnHidingPlayer, !playingInPictureInPicture, !playerNavigationLinkActive {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                self.pause()
-            }
-        }
-    }
-
     func changeActiveBackend(from: PlayerBackendType, to: PlayerBackendType) {
         Defaults[.activeBackend] = to
         self.activeBackend = to

Model/Player/PlayerQueue.swift

@@ -8,7 +8,7 @@ extension PlayerModel {
         currentItem?.video
     }
 
-    func play(_ videos: [Video], shuffling: Bool = false, inNavigationView: Bool = false) {
+    func play(_ videos: [Video], shuffling: Bool = false) {
         let videosToPlay = shuffling ? videos.shuffled() : videos
 
         guard let first = videosToPlay.first else {
@@ -27,11 +27,7 @@ extension PlayerModel {
             }
         }
 
-        if inNavigationView {
-            playerNavigationLinkActive = true
-        } else {
-            show()
-        }
+        show()
     }
 
     func playNext(_ video: Video) {