Settings for iOS/macOS

Shared/Playlists/PlaylistFormView.swift

@@ -2,6 +2,8 @@ import Siesta
 import SwiftUI
 
 struct PlaylistFormView: View {
+    @Binding var playlist: Playlist!
+
     @State private var name = ""
     @State private var visibility = Playlist.Visibility.public
 
@@ -10,11 +12,10 @@ struct PlaylistFormView: View {
 
     @FocusState private var focused: Bool
 
-    @Binding var playlist: Playlist!
-
     @Environment(\.dismiss) private var dismiss
 
-    @EnvironmentObject<Playlists> private var playlists
+    @EnvironmentObject<InvidiousAPI> private var api
+    @EnvironmentObject<PlaylistsModel> private var playlists
 
     var editing: Bool {
         playlist != nil
@@ -33,6 +34,8 @@ struct PlaylistFormView: View {
                         dismiss()
                     }.keyboardShortcut(.cancelAction)
                 }
+                .padding(.horizontal)
+
                 Form {
                     TextField("Name", text: $name, onCommit: validate)
                         .frame(maxWidth: 450)
@@ -46,8 +49,7 @@ struct PlaylistFormView: View {
                     }
                     .pickerStyle(.segmented)
                 }
-                Divider()
-                    .padding(.vertical, 4)
+
                 HStack {
                     if editing {
                         deletePlaylistButton
@@ -59,11 +61,14 @@ struct PlaylistFormView: View {
                         .disabled(!valid)
                         .keyboardShortcut(.defaultAction)
                 }
+                .frame(minHeight: 35)
+                .padding(.horizontal)
             }
             .onChange(of: name) { _ in validate() }
             .onAppear(perform: initializeForm)
-            .padding(.horizontal)
-            #if !os(iOS)
+            #if os(iOS)
+                .padding(.vertical)
+            #else
                 .frame(width: 400, height: 150)
             #endif
 
@@ -141,14 +146,14 @@ struct PlaylistFormView: View {
                 playlist = modifiedPlaylist
             }
 
-            playlists.reload()
+            playlists.load(force: true)
 
             dismiss()
         }
     }
 
     var resource: Resource {
-        editing ? InvidiousAPI.shared.playlist(playlist.id) : InvidiousAPI.shared.playlists
+        editing ? api.playlist(playlist.id) : api.playlists
     }
 
     var visibilityButton: some View {
@@ -189,9 +194,9 @@ struct PlaylistFormView: View {
     }
 
     func deletePlaylistAndDismiss() {
-        let resource = InvidiousAPI.shared.playlist(playlist.id)
-        resource.request(.delete).onSuccess { _ in
+        api.playlist(playlist.id).request(.delete).onSuccess { _ in
             playlist = nil
+            playlists.load(force: true)
             dismiss()
         }
     }

Shared/Playlists/PlaylistsView.swift

@@ -3,9 +3,9 @@ import Siesta
 import SwiftUI
 
 struct PlaylistsView: View {
-    @ObservedObject private var store = Store<[Playlist]>()
+    @StateObject private var store = Store<[Playlist]>()
 
-    @Default(.selectedPlaylistID) private var selectedPlaylistID
+    @EnvironmentObject<InvidiousAPI> private var api
 
     @State private var showingNewPlaylist = false
     @State private var createdPlaylist: Playlist?
@@ -13,49 +13,32 @@ struct PlaylistsView: View {
     @State private var showingEditPlaylist = false
     @State private var editedPlaylist: Playlist?
 
-    var resource: Resource {
-        InvidiousAPI.shared.playlists
-    }
+    @Default(.selectedPlaylistID) private var selectedPlaylistID
 
-    init() {
-        resource.addObserver(store)
+    var resource: Resource {
+        api.playlists
     }
 
     var videos: [Video] {
         currentPlaylist?.videos ?? []
     }
 
-    var videosViewMaxHeight: Double {
-        #if os(tvOS)
-            videos.isEmpty ? 150 : .infinity
-        #else
-            videos.isEmpty ? 0 : .infinity
-        #endif
-    }
-
     var body: some View {
-        VStack {
-            #if os(tvOS)
-                toolbar
-                    .font(.system(size: 28))
+        SignInRequiredView(title: "Playlists") {
+            VStack {
+                #if os(tvOS)
+                    toolbar
+                        .font(.system(size: 28))
 
-            #endif
-            if currentPlaylist != nil, videos.isEmpty {
-                hintText("Playlist is empty\n\nTap and hold on a video and then tap \"Add to Playlist\"")
-            } else if store.collection.isEmpty {
-                hintText("You have no playlists\n\nTap on \"New Playlist\" to create one")
-            } else {
-                VideosView(videos: videos)
+                #endif
+                if currentPlaylist != nil, videos.isEmpty {
+                    hintText("Playlist is empty\n\nTap and hold on a video and then tap \"Add to Playlist\"")
+                } else if store.collection.isEmpty {
+                    hintText("You have no playlists\n\nTap on \"New Playlist\" to create one")
+                } else {
+                    VideosView(videos: videos)
+                }
             }
-
-            #if os(iOS)
-                toolbar
-                    .font(.system(size: 14))
-                    .padding(.horizontal)
-                    .padding(.vertical, 10)
-                    .overlay(Divider().offset(x: 0, y: -2), alignment: .topTrailing)
-                    .transaction { t in t.animation = .none }
-            #endif
         }
         #if os(tvOS)
             .fullScreenCover(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
@@ -85,21 +68,37 @@ struct PlaylistsView: View {
                 #endif
                 newPlaylistButton
             }
+
+            #if os(iOS)
+                ToolbarItemGroup(placement: .bottomBar) {
+                    Group {
+                        if store.collection.isEmpty {
+                            Text("No Playlists")
+                                .foregroundColor(.secondary)
+                        } else {
+                            Text("Current Playlist")
+                                .foregroundColor(.secondary)
+
+                            selectPlaylistButton
+                        }
+
+                        Spacer()
+
+                        if currentPlaylist != nil {
+                            editPlaylistButton
+                        }
+                    }
+                    .transaction { t in t.animation = .none }
+                }
+            #endif
         }
         .onAppear {
+            resource.addObserver(store)
+
             resource.loadIfNeeded()?.onSuccess { _ in
                 selectPlaylist(selectedPlaylistID)
             }
         }
-        #if !os(tvOS)
-            .navigationTitle("Playlists")
-        #elseif os(iOS)
-            .navigationBarItems(trailing: newPlaylistButton)
-        #endif
-    }
-
-    var scaledToolbar: some View {
-        toolbar.scaleEffect(0.85)
     }
 
     var toolbar: some View {
@@ -233,6 +232,6 @@ struct PlaylistsView: View {
 struct PlaylistsView_Provider: PreviewProvider {
     static var previews: some View {
         PlaylistsView()
-            .environmentObject(NavigationState())
+            .environmentObject(NavigationModel())
     }
 }