Fix sheets and covers on iOS 14

Shared/Navigation/ContentView.swift

@@ -24,7 +24,7 @@ struct ContentView: View {
     #endif
 
     var body: some View {
-        Section {
+        Group {
             #if os(iOS)
                 if horizontalSizeClass == .compact {
                     AppTabNavigation()
@@ -49,55 +49,66 @@ struct ContentView: View {
         .environmentObject(subscriptions)
         .environmentObject(thumbnailsModel)
 
-        .sheet(isPresented: $navigation.presentingWelcomeScreen) {
+        // iOS 14 has problem with multiple sheets in one view
-            WelcomeScreen()
+        // but it's ok when it's in background
-                .environmentObject(accounts)
+        .background(
-                .environmentObject(navigation)
+            EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
-        }
+                WelcomeScreen()
+                    .environmentObject(accounts)
+                    .environmentObject(navigation)
+            }
+        )
         #if os(iOS)
-        .fullScreenCover(isPresented: $player.presentingPlayer) {
+        .background(
-            VideoPlayerView()
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                .environmentObject(accounts)
+                videoPlayer
-                .environmentObject(instances)
+            }
-                .environmentObject(navigation)
+        )
-                .environmentObject(player)
-                .environmentObject(playlists)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
-        }
         #elseif os(macOS)
-        .sheet(isPresented: $player.presentingPlayer) {
+        .background(
-            VideoPlayerView()
+            EmptyView().sheet(isPresented: $player.presentingPlayer) {
-                .frame(minWidth: 900, minHeight: 800)
+                videoPlayer
-                .environmentObject(accounts)
+                    .frame(minWidth: 900, minHeight: 800)
-                .environmentObject(instances)
+            }
-                .environmentObject(navigation)
+        )
-                .environmentObject(player)
-                .environmentObject(playlists)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
-        }
         #endif
         #if !os(tvOS)
         .handlesExternalEvents(preferring: Set(["*"]), allowing: Set(["*"]))
         .onOpenURL(perform: handleOpenedURL)
-        .sheet(isPresented: $navigation.presentingAddToPlaylist) {
+        .background(
-            AddToPlaylistView(video: navigation.videoToAddToPlaylist)
+            EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
-                .environmentObject(playlists)
+                AddToPlaylistView(video: navigation.videoToAddToPlaylist)
-        }
+                    .environmentObject(playlists)
-        .sheet(isPresented: $navigation.presentingPlaylistForm) {
+            }
-            PlaylistFormView(playlist: $navigation.editedPlaylist)
+        )
-                .environmentObject(accounts)
+        .background(
-                .environmentObject(playlists)
+            EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
-        }
+                PlaylistFormView(playlist: $navigation.editedPlaylist)
-        .sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
+                    .environmentObject(accounts)
-            SettingsView()
+                    .environmentObject(playlists)
-                .environmentObject(accounts)
+            }
-                .environmentObject(instances)
+        )
-        }
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
+                SettingsView()
+                    .environmentObject(accounts)
+                    .environmentObject(instances)
+            }
+        )
         #endif
     }
 
+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
     func configure() {
         SiestaLog.Category.enabled = .common
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)

Shared/Player/VideoDetails.swift

@@ -318,17 +318,21 @@ struct VideoDetails: View {
                 .foregroundColor(.secondary)
             }
         }
-        .sheet(isPresented: $presentingAddToPlaylist) {
+        .background(
-            if let video = video {
+            EmptyView().sheet(isPresented: $presentingAddToPlaylist) {
-                AddToPlaylistView(video: video)
+                if let video = video {
+                    AddToPlaylistView(video: video)
+                }
             }
-        }
+        )
         #if os(iOS)
-        .sheet(isPresented: $presentingShareSheet) {
+        .background(
-            if let shareURL = shareURL {
+            EmptyView().sheet(isPresented: $presentingShareSheet) {
-                ShareSheet(activityItems: [shareURL])
+                if let shareURL = shareURL {
+                    ShareSheet(activityItems: [shareURL])
+                }
             }
-        }
+        )
         #endif
     }
 

Shared/Playlists/PlaylistsView.swift

@@ -58,14 +58,20 @@ struct PlaylistsView: View {
                 .environmentObject(accounts)
         }
         #else
-                .sheet(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
+                .background(
-                    PlaylistFormView(playlist: $createdPlaylist)
+                    EmptyView()
-                        .environmentObject(accounts)
+                        .sheet(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
-                }
+                            PlaylistFormView(playlist: $createdPlaylist)
-                .sheet(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
+                                .environmentObject(accounts)
-                    PlaylistFormView(playlist: $editedPlaylist)
+                        }
-                        .environmentObject(accounts)
+                )
-                }
+                .background(
+                    EmptyView()
+                        .sheet(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
+                            PlaylistFormView(playlist: $editedPlaylist)
+                                .environmentObject(accounts)
+                        }
+                )
         #endif
                 .toolbar {
                     ToolbarItemGroup {