Improve PiP

Fix #186
Fix #196

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)