Pull to refresh fixes, added alert for playlist error

Model/PlaylistsModel.swift

@@ -53,8 +53,9 @@ final class PlaylistsModel: ObservableObject {
                     onSuccess()
                 }
             }
-            .onFailure { _ in
+            .onFailure { error in
                 self.playlists = []
+                NavigationModel.shared.presentAlert(title: "Could not refresh Playlists", message: error.userMessage)
             }
     }
 

Shared/Playlists/PlaylistsView.swift

@@ -129,6 +129,21 @@ struct PlaylistsView: View {
         .onChange(of: model.reloadPlaylists) { _ in
             resource?.load()
         }
+        #if os(iOS)
+        .refreshControl { refreshControl in
+            model.load(force: true) {
+                model.reloadPlaylists.toggle()
+                refreshControl.endRefreshing()
+            }
+        }
+        .backport
+        .refreshable {
+            DispatchQueue.main.async {
+                model.load(force: true) { model.reloadPlaylists.toggle() }
+            }
+        }
+        .navigationBarTitleDisplayMode(RefreshControl.navigationBarTitleDisplayMode)
+        #endif
         #if os(tvOS)
         .fullScreenCover(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
             PlaylistFormView(playlist: $createdPlaylist)
@@ -155,15 +170,22 @@ struct PlaylistsView: View {
                 }
         )
         #endif
-        #if os(iOS)
+
-        .navigationBarTitleDisplayMode(RefreshControl.navigationBarTitleDisplayMode)
-        #endif
         #if !os(macOS)
         .onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
             model.load()
             resource?.loadIfNeeded()
         }
         #endif
+        #if !os(tvOS)
+        .background(
+            Button("Refresh") {
+                resource?.load()
+            }
+            .keyboardShortcut("r")
+            .opacity(0)
+        )
+        #endif
     }
 
     #if os(tvOS)

Shared/Trending/TrendingView.swift

@@ -140,8 +140,10 @@ struct TrendingView: View {
         }
         .backport
         .refreshable {
-            resource.load().onFailure { error in
+            DispatchQueue.main.async {
-                NavigationModel.shared.presentAlert(title: "Could not refresh Trending", message: error.userMessage)
+                resource.load().onFailure { error in
+                    NavigationModel.shared.presentAlert(title: "Could not refresh Trending", message: error.userMessage)
+                }
             }
         }
         .navigationBarTitleDisplayMode(RefreshControl.navigationBarTitleDisplayMode)

Shared/Views/PopularView.swift

@@ -50,7 +50,9 @@ struct PopularView: View {
         }
         .backport
         .refreshable {
-            resource?.load()
+            DispatchQueue.main.async {
+                resource?.load()
+            }
         }
         .navigationBarTitleDisplayMode(RefreshControl.navigationBarTitleDisplayMode)
         #endif

Shared/Views/SubscriptionsView.swift

@@ -32,7 +32,7 @@ struct SubscriptionsView: View {
                     }
                     .backport
                     .refreshable {
-                        loadResources(force: true)
+                        await loadResources(force: true)
                     }
                 #endif
             }