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

Shared/Navigation/AppSidebarNavigation.swift

@@ -63,24 +63,6 @@ struct AppSidebarNavigation: View {
             }
         }
         .environment(\.navigationStyle, .sidebar)
-        #if os(iOS)
-            .background(
-                EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                    VideoPlayerView()
-                        .environmentObject(accounts)
-                        .environmentObject(comments)
-                        .environmentObject(instances)
-                        .environmentObject(navigation)
-                        .environmentObject(player)
-                        .environmentObject(playerControls)
-                        .environmentObject(playlists)
-                        .environmentObject(recents)
-                        .environmentObject(subscriptions)
-                        .environmentObject(thumbnailsModel)
-                        .environment(\.navigationStyle, .sidebar)
-                }
-            )
-        #endif
     }
 
     var toolbarContent: some ToolbarContent {

Shared/Navigation/AppTabNavigation.swift

@@ -51,14 +51,11 @@ struct AppTabNavigation: View {
                         ChannelVideosView(channel: channel)
                             .environment(\.managedObjectContext, persistenceController.container.viewContext)
                             .environment(\.inChannelView, true)
-                            .environment(\.inNavigationView, true)
                             .environmentObject(accounts)
                             .environmentObject(navigation)
                             .environmentObject(player)
                             .environmentObject(subscriptions)
                             .environmentObject(thumbnailsModel)
-
-                            .background(playerNavigationLink)
                     }
                 }
             }
@@ -69,25 +66,15 @@ struct AppTabNavigation: View {
                     NavigationView {
                         ChannelPlaylistView(playlist: playlist)
                             .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                            .environment(\.inNavigationView, true)
                             .environmentObject(accounts)
                             .environmentObject(navigation)
                             .environmentObject(player)
                             .environmentObject(subscriptions)
                             .environmentObject(thumbnailsModel)
-
-                            .background(playerNavigationLink)
                     }
                 }
             }
         )
-        .background(
-            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                videoPlayer
-                    .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                    .environment(\.navigationStyle, .tab)
-            }
-        )
     }
 
     private var favoritesNavigationView: some View {
@@ -172,15 +159,6 @@ struct AppTabNavigation: View {
         .tag(TabSelection.search)
     }
 
-    private var playerNavigationLink: some View {
-        NavigationLink(isActive: $player.playerNavigationLinkActive, destination: {
-            videoPlayer
-                .environment(\.inNavigationView, true)
-        }) {
-            EmptyView()
-        }
-    }
-
     private var videoPlayer: some View {
         VideoPlayerView()
             .environmentObject(accounts)

Shared/Navigation/ContentView.swift

@@ -57,50 +57,54 @@ struct ContentView: View {
         .environmentObject(subscriptions)
         .environmentObject(thumbnailsModel)
 
-        // iOS 14 has problem with multiple sheets in one view
-        // but it's ok when it's in background
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
-                WelcomeScreen()
-                    .environmentObject(accounts)
-                    .environmentObject(navigation)
-            }
-        )
-        #if !os(tvOS)
-        .onOpenURL { OpenURLHandler(accounts: accounts, player: player).handle($0) }
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
-                AddToPlaylistView(video: navigation.videoToAddToPlaylist)
-                    .environmentObject(playlists)
-            }
-        )
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
-                PlaylistFormView(playlist: $navigation.editedPlaylist)
-                    .environmentObject(accounts)
-                    .environmentObject(playlists)
-            }
-        )
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
-                SettingsView()
-                    .environmentObject(accounts)
-                    .environmentObject(instances)
-                    .environmentObject(player)
-            }
-        )
+        #if !os(macOS)
+            .overlay(videoPlayer)
         #endif
-        .alert(isPresented: $navigation.presentingUnsubscribeAlert) {
-            Alert(
-                title: Text(
-                    "Are you sure you want to unsubscribe from \(navigation.channelToUnsubscribe.name)?"
-                ),
-                primaryButton: .destructive(Text("Unsubscribe")) {
-                    subscriptions.unsubscribe(navigation.channelToUnsubscribe.id)
-                },
-                secondaryButton: .cancel()
+
+            // iOS 14 has problem with multiple sheets in one view
+            // but it's ok when it's in background
+            .background(
+                EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
+                    WelcomeScreen()
+                        .environmentObject(accounts)
+                        .environmentObject(navigation)
+                }
             )
-        }
+        #if !os(tvOS)
+            .onOpenURL { OpenURLHandler(accounts: accounts, player: player).handle($0) }
+            .background(
+                EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
+                    AddToPlaylistView(video: navigation.videoToAddToPlaylist)
+                        .environmentObject(playlists)
+                }
+            )
+            .background(
+                EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
+                    PlaylistFormView(playlist: $navigation.editedPlaylist)
+                        .environmentObject(accounts)
+                        .environmentObject(playlists)
+                }
+            )
+            .background(
+                EmptyView().sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
+                    SettingsView()
+                        .environmentObject(accounts)
+                        .environmentObject(instances)
+                        .environmentObject(player)
+                }
+            )
+        #endif
+            .alert(isPresented: $navigation.presentingUnsubscribeAlert) {
+                Alert(
+                    title: Text(
+                        "Are you sure you want to unsubscribe from \(navigation.channelToUnsubscribe.name)?"
+                    ),
+                    primaryButton: .destructive(Text("Unsubscribe")) {
+                        subscriptions.unsubscribe(navigation.channelToUnsubscribe.id)
+                    },
+                    secondaryButton: .cancel()
+                )
+            }
     }
 
     func configure() {
@@ -222,6 +226,21 @@ struct ContentView: View {
 
         navigation.presentingWelcomeScreen = true
     }
+
+    var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(comments)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playerControls)
+            .environmentObject(playlists)
+            .environmentObject(recents)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+            .environment(\.navigationStyle, .sidebar)
+    }
 }
 
 struct ContentView_Previews: PreviewProvider {