Editing playlists

Apple TV/CoverSectionView.swift

@@ -3,22 +3,35 @@ import SwiftUI
 struct CoverSectionView<Content: View>: View {
     let title: String?
 
-    let rowsView: Content
+    let actionsView: Content
     let divider: Bool
+    let inline: Bool
 
-    init(_ title: String? = nil, divider: Bool = true, @ViewBuilder rowsView: @escaping () -> Content) {
+    init(_ title: String? = nil, divider: Bool = true, inline: Bool = false, @ViewBuilder actionsView: @escaping () -> Content) {
         self.title = title
         self.divider = divider
-        self.rowsView = rowsView()
+        self.inline = inline
+        self.actionsView = actionsView()
     }
 
     var body: some View {
         VStack(alignment: .leading) {
-            if title != nil {
+            if inline {
+                HStack {
+                    if title != nil {
+                        sectionTitle
+                    }
+
+                    Spacer()
+                    actionsView
+                }
+            } else if title != nil {
                 sectionTitle
             }
 
-            rowsView
+            if !inline {
+                actionsView
+            }
         }
 
         if divider {

Apple TV/NewPlaylistView.swift

@@ -1,74 +0,0 @@
-import SwiftUI
-import SwiftyJSON
-
-struct NewPlaylistView: View {
-    @State private var name = ""
-    @State private var visibility = PlaylistVisibility.public
-
-    @State private var valid = false
-
-    @Binding var createdPlaylist: Playlist?
-
-    @Environment(\.dismiss) private var dismiss
-
-    var body: some View {
-        HStack {
-            Spacer()
-
-            VStack {
-                Spacer()
-
-                CoverSectionView("New Playlist") {
-                    CoverSectionRowView("Name") {
-                        TextField("Playlist Name", text: $name, onCommit: validate)
-                            .frame(maxWidth: 450)
-                    }
-
-                    CoverSectionRowView("Visibility") { visibilityButton }
-                }
-
-                CoverSectionRowView {
-                    Button("Create", action: createPlaylistAndDismiss).disabled(!valid)
-                }
-
-                Spacer()
-            }
-            .frame(maxWidth: 800)
-
-            Spacer()
-        }
-        .background(.thinMaterial)
-        .onAppear {
-            createdPlaylist = nil
-        }
-    }
-
-    func validate() {
-        valid = !name.isEmpty
-    }
-
-    func createPlaylistAndDismiss() {
-        let resource = InvidiousAPI.shared.playlists
-        let body = ["title": name, "privacy": visibility.rawValue]
-
-        resource.request(.post, json: body).onSuccess { response in
-            if let playlist: Playlist = response.typedContent() {
-                createdPlaylist = playlist
-                dismiss()
-            }
-        }
-    }
-
-    var visibilityButton: some View {
-        Button(self.visibility.name) {
-            self.visibility = self.visibility.next()
-        }
-        .contextMenu {
-            ForEach(PlaylistVisibility.allCases) { visibility in
-                Button(visibility.name) {
-                    self.visibility = visibility
-                }
-            }
-        }
-    }
-}

Apple TV/PlaylistFormView.swift

@@ -0,0 +1,120 @@
+import Siesta
+import SwiftUI
+
+struct PlaylistFormView: View {
+    @State private var name = ""
+    @State private var visibility = PlaylistVisibility.public
+
+    @State private var valid = false
+    @State private var showingDeleteConfirmation = false
+
+    @Binding var playlist: Playlist!
+
+    @Environment(\.dismiss) private var dismiss
+
+    var editing: Bool {
+        playlist != nil
+    }
+
+    var body: some View {
+        HStack {
+            Spacer()
+
+            VStack {
+                Spacer()
+
+                CoverSectionView(editing ? "Edit Playlist" : "Create Playlist") {
+                    CoverSectionRowView("Name") {
+                        TextField("Playlist Name", text: $name, onCommit: validate)
+                            .frame(maxWidth: 450)
+                    }
+
+                    CoverSectionRowView("Visibility") { visibilityButton }
+                }
+
+                CoverSectionRowView {
+                    Button("Save", action: submitForm).disabled(!valid)
+                }
+
+                if editing {
+                    CoverSectionView("Delete Playlist", divider: false, inline: true) { deletePlaylistButton }
+                        .padding(.top, 50)
+                }
+
+                Spacer()
+            }
+            .frame(maxWidth: 800)
+
+            Spacer()
+        }
+        .background(.thinMaterial)
+        .onAppear {
+            guard editing else {
+                return
+            }
+
+            self.name = self.playlist.title
+            self.visibility = self.playlist.visibility
+
+            validate()
+        }
+    }
+
+    func validate() {
+        valid = !name.isEmpty
+    }
+
+    func submitForm() {
+        guard valid else {
+            return
+        }
+
+        let body = ["title": name, "privacy": visibility.rawValue]
+
+        resource.request(editing ? .patch : .post, json: body).onSuccess { response in
+            if let createdPlaylist: Playlist = response.typedContent() {
+                playlist = createdPlaylist
+            }
+
+            dismiss()
+        }
+    }
+
+    var resource: Resource {
+        editing ? InvidiousAPI.shared.playlist(playlist.id) : InvidiousAPI.shared.playlists
+    }
+
+    var visibilityButton: some View {
+        Button(self.visibility.name) {
+            self.visibility = self.visibility.next()
+        }
+        .contextMenu {
+            ForEach(PlaylistVisibility.allCases) { visibility in
+                Button(visibility.name) {
+                    self.visibility = visibility
+                }
+            }
+        }
+    }
+
+    var deletePlaylistButton: some View {
+        Button("Delete", role: .destructive) {
+            showingDeleteConfirmation = true
+        }.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."),
+                primaryButton: .destructive(Text("Delete"), action: deletePlaylistAndDismiss),
+                secondaryButton: .cancel()
+            )
+        }
+    }
+
+    func deletePlaylistAndDismiss() {
+        let resource = InvidiousAPI.shared.playlist(playlist.id)
+        resource.request(.delete).onSuccess { _ in
+            playlist = nil
+            dismiss()
+        }
+    }
+}

Apple TV/PlaylistsView.swift

@@ -1,14 +1,19 @@
+import Defaults
 import Siesta
 import SwiftUI
 
 struct PlaylistsView: View {
     @ObservedObject private var store = Store<[Playlist]>()
 
+    @Default(.selectedPlaylistID) private var selectedPlaylistID
     @State private var selectedPlaylist: Playlist?
 
     @State private var showingNewPlaylist = false
     @State private var createdPlaylist: Playlist?
 
+    @State private var showingEditPlaylist = false
+    @State private var editedPlaylist: Playlist?
+
     var resource: Resource {
         InvidiousAPI.shared.playlists
     }
@@ -23,6 +28,10 @@ struct PlaylistsView: View {
                 HStack {
                     selectPlaylistButton
 
+                    if currentPlaylist != nil {
+                        editPlaylistButton
+                    }
+
                     newPlaylistButton
                 }
                 .scaleEffect(0.85)
@@ -35,20 +44,44 @@ struct PlaylistsView: View {
             }
         }
         .fullScreenCover(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
-            NewPlaylistView(createdPlaylist: $createdPlaylist)
+            PlaylistFormView(playlist: $createdPlaylist)
+        }
+        .fullScreenCover(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
+            PlaylistFormView(playlist: $editedPlaylist)
         }
         .onAppear {
-            resource.loadIfNeeded()
+            resource.loadIfNeeded()?.onSuccess { _ in
+                selectPlaylist(selectedPlaylistID)
+            }
         }
     }
 
+    func selectPlaylist(_ id: String?) {
+        selectedPlaylist = store.collection.first { $0.id == id }
+        selectedPlaylistID = id
+    }
+
     func selectCreatedPlaylist() {
         guard createdPlaylist != nil else {
             return
         }
 
         resource.load().onSuccess { _ in
-            self.selectedPlaylist = store.collection.first { $0 == createdPlaylist }
+            self.selectPlaylist(createdPlaylist?.id)
+
+            self.createdPlaylist = nil
+        }
+    }
+
+    func selectEditedPlaylist() {
+        if editedPlaylist == nil {
+            selectPlaylist(nil)
+        }
+
+        resource.load().onSuccess { _ in
+            selectPlaylist(editedPlaylist?.id)
+
+            self.editedPlaylist = nil
         }
     }
 
@@ -62,17 +95,26 @@ struct PlaylistsView: View {
                 return
             }
 
-            selectedPlaylist = store.collection.next(after: currentPlaylist!)
+            selectPlaylist(store.collection.next(after: currentPlaylist!)?.id)
         }
         .contextMenu {
             ForEach(store.collection) { playlist in
                 Button(playlist.title) {
-                    selectedPlaylist = playlist
+                    selectPlaylist(playlist.id)
                 }
             }
         }
     }
 
+    var editPlaylistButton: some View {
+        Button(action: {
+            self.editedPlaylist = self.currentPlaylist
+            self.showingEditPlaylist = true
+        }) {
+            Image(systemName: "pencil")
+        }
+    }
+
     var newPlaylistButton: some View {
         Button(action: { self.showingNewPlaylist = true }) {
             Image(systemName: "plus")