Improve PiP

Fix #186
Fix #196

Shared/Defaults.swift

@@ -127,6 +127,7 @@ extension Defaults.Keys {
     #if !os(macOS)
         static let closePiPAndOpenPlayerOnEnteringForeground = Key<Bool>("closePiPAndOpenPlayerOnEnteringForeground", default: false)
     #endif
+    static let closePlayerOnOpeningPiP = Key<Bool>("closePlayerOnOpeningPiP", default: false)
 
     static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: [])
 

Shared/Player/AppleAVPlayerViewController.swift

@@ -95,7 +95,7 @@ extension AppleAVPlayerViewController: AVPlayerViewControllerDelegate {
     }
 
     func playerViewControllerWillBeginDismissalTransition(_: AVPlayerViewController) {
-        if Defaults[.pauseOnHidingPlayer] {
+        if Defaults[.pauseOnHidingPlayer], !playerModel.playingInPictureInPicture {
             playerModel.pause()
         }
         dismiss(animated: false)
@@ -121,15 +121,12 @@ extension AppleAVPlayerViewController: AVPlayerViewControllerDelegate {
             self.playerModel.show()
             self.playerModel.setNeedsDrawing(true)
 
-            #if os(tvOS)
-                if self.playerModel.playingInPictureInPicture {
-                    self.present(self.playerView, animated: false) {
-                        completionHandler(true)
-                    }
+            if self.playerModel.playingInPictureInPicture {
+                self.present(self.playerView, animated: false) {
+                    completionHandler(true)
                 }
-            #else
-                completionHandler(true)
-            #endif
+            }
+            completionHandler(true)
         }
     }
 

Shared/Player/Controls/PlayerControls.swift

@@ -277,9 +277,11 @@ struct PlayerControls: View {
     }
 
     private var pipButton: some View {
-        button("PiP", systemImage: "pip") {
-            model.startPiP()
+        let image = player.transitioningToPiP ? "pip.fill" : player.pipController?.isPictureInPictureActive ?? false ? "pip.exit" : "pip.enter"
+        return button("PiP", systemImage: image) {
+            (player.pipController?.isPictureInPictureActive ?? false) ? player.closePiP() : player.startPiP()
         }
+        .disabled(!player.pipPossible)
     }
 
     #if os(iOS)

Shared/Settings/PlayerSettings.swift

@@ -17,6 +17,7 @@ struct PlayerSettings: View {
     #endif
     @Default(.closePiPOnNavigation) private var closePiPOnNavigation
     @Default(.closePiPOnOpeningPlayer) private var closePiPOnOpeningPlayer
+    @Default(.closePlayerOnOpeningPiP) private var closePlayerOnOpeningPiP
     #if !os(macOS)
         @Default(.closePlayerOnItemClose) private var closePlayerOnItemClose
         @Default(.pauseOnEnteringBackground) private var pauseOnEnteringBackground
@@ -96,6 +97,7 @@ struct PlayerSettings: View {
             Section(header: SettingsHeader(text: "Picture in Picture")) {
                 closePiPOnNavigationToggle
                 closePiPOnOpeningPlayerToggle
+                closePlayerOnOpeningPiPToggle
                 #if !os(macOS)
                     closePiPAndOpenPlayerOnEnteringForegroundToggle
                 #endif
@@ -201,6 +203,10 @@ struct PlayerSettings: View {
         Toggle("Close PiP when player is opened", isOn: $closePiPOnOpeningPlayer)
     }
 
+    private var closePlayerOnOpeningPiPToggle: some View {
+        Toggle("Close player when starting PiP", isOn: $closePlayerOnOpeningPiP)
+    }
+
     #if !os(macOS)
         private var closePiPAndOpenPlayerOnEnteringForegroundToggle: some View {
             Toggle("Close PiP and open player when application enters foreground", isOn: $closePiPAndOpenPlayerOnEnteringForeground)

Shared/Views/VideoContextMenuView.swift

@@ -167,7 +167,15 @@ struct VideoContextMenuView: View {
 
     private var playNowInPictureInPictureButton: some View {
         Button {
-            player.controls.startPiP(startImmediately: player.presentingPlayer && player.activeBackend == .appleAVPlayer)
+            player.avPlayerBackend.startPictureInPictureOnPlay = true
+
+            #if !os(macOS)
+                player.exitFullScreen()
+            #endif
+
+            if player.activeBackend != PlayerBackendType.appleAVPlayer {
+                player.changeActiveBackend(from: .mpv, to: .appleAVPlayer)
+            }
             player.hide()
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {