iOS 14/macOS Big Sur Support

Shared/Playlists/AddToPlaylistView.swift

@@ -7,7 +7,7 @@ struct AddToPlaylistView: View {
 
     @State private var selectedPlaylistID: Playlist.ID = ""
 
-    @Environment(\.dismiss) private var dismiss
+    @Environment(\.presentationMode) private var presentationMode
     @EnvironmentObject<PlaylistsModel> private var model
 
     var body: some View {
@@ -37,7 +37,7 @@ struct AddToPlaylistView: View {
         .padding(.vertical)
         #elseif os(tvOS)
         .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
-        .background(.thickMaterial)
+        .background(Color.tertiaryBackground)
         #else
         .padding(.vertical)
         #endif
@@ -70,7 +70,7 @@ struct AddToPlaylistView: View {
 
             #if !os(tvOS)
                 Button("Cancel") {
-                    dismiss()
+                    presentationMode.wrappedValue.dismiss()
                 }
                 .keyboardShortcut(.cancelAction)
             #endif
@@ -155,7 +155,7 @@ struct AddToPlaylistView: View {
         Defaults[.lastUsedPlaylistID] = id
 
         model.addVideo(playlistID: id, videoID: video.videoID) {
-            dismiss()
+            presentationMode.wrappedValue.dismiss()
         }
     }
 

Shared/Playlists/PlaylistFormView.swift

@@ -10,9 +10,7 @@ struct PlaylistFormView: View {
     @State private var valid = false
     @State private var showingDeleteConfirmation = false
 
-    @FocusState private var focused: Bool
-
-    @Environment(\.dismiss) private var dismiss
+    @Environment(\.presentationMode) private var presentationMode
 
     @EnvironmentObject<AccountsModel> private var accounts
     @EnvironmentObject<PlaylistsModel> private var playlists
@@ -22,77 +20,68 @@ struct PlaylistFormView: View {
     }
 
     var body: some View {
-        #if os(macOS) || os(iOS)
-            VStack(alignment: .leading) {
-                HStack(alignment: .center) {
-                    Text(editing ? "Edit Playlist" : "Create Playlist")
-                        .font(.title2.bold())
+        Group {
+            #if os(macOS) || os(iOS)
+                VStack(alignment: .leading) {
+                    HStack(alignment: .center) {
+                        Text(editing ? "Edit Playlist" : "Create Playlist")
+                            .font(.title2.bold())
 
-                    Spacer()
+                        Spacer()
 
-                    Button("Cancel") {
-                        dismiss()
-                    }.keyboardShortcut(.cancelAction)
+                        Button("Cancel") {
+                            presentationMode.wrappedValue.dismiss()
+                        }.keyboardShortcut(.cancelAction)
+                    }
+                    .padding(.horizontal)
+
+                    Form {
+                        TextField("Name", text: $name, onCommit: validate)
+                            .frame(maxWidth: 450)
+                            .padding(.leading, 10)
+
+                        visibilityFormItem
+                            .pickerStyle(.segmented)
+                    }
+                    #if os(macOS)
+                    .padding(.horizontal)
+                    #endif
+
+                    HStack {
+                        if editing {
+                            deletePlaylistButton
+                        }
+
+                        Spacer()
+
+                        Button("Save", action: submitForm)
+                            .disabled(!valid)
+                            .keyboardShortcut(.defaultAction)
+                    }
+                    .frame(minHeight: 35)
+                    .padding(.horizontal)
                 }
-                .padding(.horizontal)
 
-                Form {
-                    TextField("Name", text: $name, onCommit: validate)
-                        .frame(maxWidth: 450)
-                        .padding(.leading, 10)
-                        .focused($focused)
-
-                    visibilityFormItem
-                        .pickerStyle(.segmented)
-                }
-                #if os(macOS)
-                .padding(.horizontal)
+                #if os(iOS)
+                .padding(.vertical)
+                #else
+                .frame(width: 400, height: 150)
                 #endif
 
-                HStack {
-                    if editing {
-                        deletePlaylistButton
-                    }
-
-                    Spacer()
-
-                    Button("Save", action: submitForm)
-                        .disabled(!valid)
-                        .keyboardShortcut(.defaultAction)
-                }
-                .frame(minHeight: 35)
-                .padding(.horizontal)
-            }
-            .onChange(of: name) { _ in validate() }
-            .onAppear(perform: initializeForm)
-            #if os(iOS)
-                .padding(.vertical)
             #else
-                .frame(width: 400, height: 150)
+                VStack {
+                    Group {
+                        header
+                        form
+                    }
+                    .frame(maxWidth: 1000)
+                }
+                .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
+                .background(Color.tertiaryBackground)
             #endif
-
-        #else
-            VStack {
-                Group {
-                    header
-                    form
-                }
-                .frame(maxWidth: 1000)
-            }
-            .onAppear {
-                guard editing else {
-                    return
-                }
-
-                self.name = self.playlist.title
-                self.visibility = self.playlist.visibility
-
-                validate()
-            }
-
-            .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
-            .background(.thickMaterial)
-        #endif
+        }
+        .onChange(of: name) { _ in validate() }
+        .onAppear(perform: initializeForm)
     }
 
     #if os(tvOS)
@@ -152,16 +141,16 @@ struct PlaylistFormView: View {
     #endif
 
     func initializeForm() {
-        focused = true
-
         guard editing else {
             return
         }
 
-        name = playlist.title
-        visibility = playlist.visibility
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            name = playlist.title
+            visibility = playlist.visibility
 
-        validate()
+            validate()
+        }
     }
 
     func validate() {
@@ -182,7 +171,7 @@ struct PlaylistFormView: View {
 
             playlists.load(force: true)
 
-            dismiss()
+            presentationMode.wrappedValue.dismiss()
         }
     }
 
@@ -194,7 +183,7 @@ struct PlaylistFormView: View {
         #if os(macOS)
             Picker("Visibility", selection: $visibility) {
                 ForEach(Playlist.Visibility.allCases) { visibility in
-                    Text(visibility.name)
+                    Text(visibility.name).tag(visibility)
                 }
             }
         #else
@@ -216,9 +205,10 @@ struct PlaylistFormView: View {
     }
 
     var deletePlaylistButton: some View {
-        Button("Delete", role: .destructive) {
+        Button("Delete") {
             showingDeleteConfirmation = true
-        }.alert(isPresented: $showingDeleteConfirmation) {
+        }
+        .alert(isPresented: $showingDeleteConfirmation) {
             Alert(
                 title: Text("Are you sure you want to delete playlist?"),
                 message: Text("Playlist \"\(playlist.title)\" will be deleted.\nIt cannot be undone."),
@@ -226,16 +216,14 @@ struct PlaylistFormView: View {
                 secondaryButton: .cancel()
             )
         }
-        #if os(macOS)
         .foregroundColor(.red)
-        #endif
     }
 
     func deletePlaylistAndDismiss() {
         accounts.api.playlist(playlist.id)?.request(.delete).onSuccess { _ in
             playlist = nil
             playlists.load(force: true)
-            dismiss()
+            presentationMode.wrappedValue.dismiss()
         }
     }
 }

Shared/Playlists/PlaylistsView.swift

@@ -71,17 +71,20 @@ struct PlaylistsView: View {
                     ToolbarItemGroup {
                         #if !os(iOS)
                             if !model.isEmpty {
-                                selectPlaylistButton
-                                    .prefersDefaultFocus(in: focusNamespace)
+                                if #available(macOS 12.0, *) {
+                                    selectPlaylistButton
+                                        .prefersDefaultFocus(in: focusNamespace)
+                                } else {
+                                    selectPlaylistButton
+                                }
                             }
 
                             if currentPlaylist != nil {
                                 editPlaylistButton
                             }
                         #endif
-                        FavoriteButton(item: FavoriteItem(section: .playlist(selectedPlaylistID)))
 
-                        newPlaylistButton
+                        FavoriteButton(item: FavoriteItem(section: .playlist(selectedPlaylistID)))
                     }
 
                     #if os(iOS)
@@ -99,6 +102,8 @@ struct PlaylistsView: View {
 
                                 Spacer()
 
+                                newPlaylistButton
+
                                 if currentPlaylist != nil {
                                     editPlaylistButton
                                 }
@@ -168,7 +173,7 @@ struct PlaylistsView: View {
         }
         .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
         #if os(macOS)
-            .background()
+            .background(Color.tertiaryBackground)
         #endif
     }