Merge pull request #84 from rryam/sample-app-polish

rudrankriyam · web-flow · commit 0102c5e88d9e · 2026-01-27T02:32:39.000+05:30
Surface onboarding and runtime errors in sample app
diff --git a/Musadora/Musadora/Catalog/Station Genres/StationGenreDetailedView.swift b/Musadora/Musadora/Catalog/Station Genres/StationGenreDetailedView.swift
@@ -24,7 +24,7 @@ struct StationGenreDetailedView: View {
       do {
         stations = try await MCatalog.stations(for: stationGenre)
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
diff --git a/Musadora/Musadora/Catalog/Station Genres/StationGenresView.swift b/Musadora/Musadora/Catalog/Station Genres/StationGenresView.swift
@@ -29,7 +29,7 @@ extension StationGenresView {
       do {
         stationGenres = try await MCatalog.stationGenres()
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
     }
   }
 }
diff --git a/Musadora/Musadora/Charts/AlbumChartView.swift b/Musadora/Musadora/Charts/AlbumChartView.swift
@@ -31,7 +31,7 @@ struct AlbumChartView: View {
                   do {
                     try await APlayer.shared.play(album: album)
                   } catch {
-                    print(error)
+                    ErrorPresenter.shared.present(error)
                   }
                 }
               }
diff --git a/Musadora/Musadora/Charts/ChartView.swift b/Musadora/Musadora/Charts/ChartView.swift
@@ -100,7 +100,7 @@ extension ChartView {
     do {
       chart = try await MCatalog.charts(genre: genre, kinds: .all, types: .all)
     } catch {
-      print(error)
+      ErrorPresenter.shared.present(error)
     }
   }
 }
diff --git a/Musadora/Musadora/Charts/ChartsView.swift b/Musadora/Musadora/Charts/ChartsView.swift
@@ -50,7 +50,7 @@ struct ChartsView: View {
       do {
         genres = try await MCatalog.topGenres()
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
diff --git a/Musadora/Musadora/Charts/PlaylistChartView.swift b/Musadora/Musadora/Charts/PlaylistChartView.swift
@@ -29,7 +29,7 @@ struct PlaylistChartView: View {
                 do {
                   try await APlayer.shared.play(playlist: playlist)
                 } catch {
-                  print(error)
+                  ErrorPresenter.shared.present(error)
                 }
               }
             }, label: {
diff --git a/Musadora/Musadora/History/RecentlyAddedView.swift b/Musadora/Musadora/History/RecentlyAddedView.swift
@@ -23,7 +23,7 @@ struct RecentlyAddedView: View {
         recentlyAddedPlaylists = try await MHistory.recentlyAddedPlaylists(limit: 25, offset: 0)
         recentlyAddedAlbums = try await MHistory.recentlyAddedAlbums(limit: 25, offset: 0)
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
diff --git a/Musadora/Musadora/History/RecentlyPlayedView.swift b/Musadora/Musadora/History/RecentlyPlayedView.swift
@@ -23,7 +23,7 @@ struct RecentlyPlayedView: View {
         recentlyPlayedAlbums = try await MHistory.recentlyPlayedAlbums(limit: 25, offset: 0)
         recentlyPlayedPlaylists = try await MHistory.recentlyPlayedPlaylists(limit: 25, offset: 0)
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
diff --git a/Musadora/Musadora/Library/LibraryAlbumsView.swift b/Musadora/Musadora/Library/LibraryAlbumsView.swift
@@ -18,7 +18,7 @@ struct LibraryAlbumsView: View {
         do {
           albums = try await MLibrary.albums()
         } catch {
-          print(error)
+          ErrorPresenter.shared.present(error)
         }
       }
   }
diff --git a/Musadora/Musadora/Library/LibraryPlaylistsTestView.swift b/Musadora/Musadora/Library/LibraryPlaylistsTestView.swift
@@ -102,7 +102,7 @@ struct LibraryPlaylistsTestView: View {
       print("Successfully fetched \(playlists.count) playlists with limit \(limit)")
     } catch {
       errorMessage = error.localizedDescription
-      print("Error fetching playlists: \(error)")
+      ErrorPresenter.shared.present(message: "Error fetching playlists: \(error.localizedDescription)")
     }
 
     isLoading = false
diff --git a/Musadora/Musadora/Library/LibraryPlaylistsView.swift b/Musadora/Musadora/Library/LibraryPlaylistsView.swift
@@ -18,7 +18,7 @@ struct LibraryPlaylistsView: View {
         do {
           playlists = try await MLibrary.playlists()
         } catch {
-          print(error)
+          ErrorPresenter.shared.present(error)
         }
       }
   }
diff --git a/Musadora/Musadora/Library/LibrarySongsView.swift b/Musadora/Musadora/Library/LibrarySongsView.swift
@@ -18,7 +18,7 @@ struct LibrarySongsView: View {
         do {
           songs = try await MLibrary.songs()
         } catch {
-          print(error)
+          ErrorPresenter.shared.present(error)
         }
       }
   }
diff --git a/Musadora/Musadora/Main/MTabView.swift b/Musadora/Musadora/Main/MTabView.swift
@@ -111,7 +111,9 @@ struct PlayerButton: View {
         do {
           try await action()
         } catch {
-          print("Failed to perform player action: \(error)")
+          ErrorPresenter.shared.present(
+            message: "Failed to perform player action: \(error.localizedDescription)"
+          )
         }
       }
     }) {
diff --git a/Musadora/Musadora/Main/MusadoraApp.swift b/Musadora/Musadora/Main/MusadoraApp.swift
@@ -12,6 +12,7 @@ struct MusadoraApp: App {
   var body: some Scene {
     WindowGroup {
       MTabView()
+        .errorAlert()
     }
   }
 }
diff --git a/Musadora/Musadora/Music Items/Album/AlbumRow.swift b/Musadora/Musadora/Music Items/Album/AlbumRow.swift
@@ -31,7 +31,7 @@ struct AlbumRow: View {
                 do {
                   try await APlayer.shared.play(album: album)
                 } catch {
-                  print(error)
+                  ErrorPresenter.shared.present(error)
                 }
               }
             }
@@ -46,7 +46,7 @@ struct AlbumRow: View {
                   await MainActor.run { isFavorited = true }
                 }
               } catch {
-                print(error)
+                ErrorPresenter.shared.present(error)
               }
               await MainActor.run { isFavoriting = false }
             }
diff --git a/Musadora/Musadora/Music Items/Album/AlbumsView.swift b/Musadora/Musadora/Music Items/Album/AlbumsView.swift
@@ -130,7 +130,7 @@ private extension AlbumsView {
       do {
         try await APlayer.shared.play(album: album)
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
@@ -146,7 +146,7 @@ private extension AlbumsView {
           _ = await MainActor.run { favoritedAlbumIDs.insert(album.id) }
         }
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
       _ = await MainActor.run { favoritingAlbumIDs.remove(album.id) }
     }
diff --git a/Musadora/Musadora/Music Items/Playlist/PlaylistRow.swift b/Musadora/Musadora/Music Items/Playlist/PlaylistRow.swift
@@ -28,7 +28,7 @@ struct PlaylistRow: View {
               do {
                 try await APlayer.shared.play(playlist: playlist)
               } catch {
-                print(error)
+                ErrorPresenter.shared.present(error)
               }
             }
           }
diff --git a/Musadora/Musadora/Music Items/Song/SongRow.swift b/Musadora/Musadora/Music Items/Song/SongRow.swift
@@ -31,7 +31,7 @@ struct SongRow: View {
                 do {
                   try await APlayer.shared.play(song: song)
                 } catch {
-                  print(error)
+                  ErrorPresenter.shared.present(error)
                 }
               }
             }
@@ -46,7 +46,7 @@ struct SongRow: View {
                   await MainActor.run { isFavorited = true }
                 }
               } catch {
-                print(error)
+                ErrorPresenter.shared.present(error)
               }
               await MainActor.run { isFavoriting = false }
             }
diff --git a/Musadora/Musadora/Music Items/Song/SongsView.swift b/Musadora/Musadora/Music Items/Song/SongsView.swift
@@ -56,7 +56,7 @@ struct SongsView: View {
                 do {
                   try await APlayer.shared.play(song: song)
                 } catch {
-                  print(error)
+                  ErrorPresenter.shared.present(error)
                 }
               }
             } label: {
@@ -76,7 +76,7 @@ struct SongsView: View {
                     _ = await MainActor.run { favoritedSongIDs.insert(song.id) }
                   }
                 } catch {
-                  print(error)
+                  ErrorPresenter.shared.present(error)
                 }
                 _ = await MainActor.run { favoritingSongIDs.remove(song.id) }
               }
@@ -95,7 +95,7 @@ struct SongsView: View {
             do {
               try await APlayer.shared.play(song: song)
             } catch {
-              print(error)
+              ErrorPresenter.shared.present(error)
             }
           }
         }
diff --git a/Musadora/Musadora/Music Items/Station/StationRow.swift b/Musadora/Musadora/Music Items/Station/StationRow.swift
@@ -28,7 +28,7 @@ struct StationRow: View {
               do {
                 try await APlayer.shared.play(station: station)
               } catch {
-                print(error)
+                ErrorPresenter.shared.present(error)
               }
             }
           }
diff --git a/Musadora/Musadora/Onboarding/WelcomeView.swift b/Musadora/Musadora/Onboarding/WelcomeView.swift
@@ -6,6 +6,7 @@
 //
 
 import MusicKit
+import MusadoraKit
 import Observation
 import SwiftUI
 
@@ -109,7 +110,19 @@ struct WelcomeView: View {
         case .notDetermined:
             Task {
                 let musicAuthorizationStatus = await MusicAuthorization.request()
-                update(with: musicAuthorizationStatus)
+                await update(with: musicAuthorizationStatus)
+
+                guard musicAuthorizationStatus == .authorized else {
+                    return
+                }
+
+                do {
+                    try await MusadoraKit.test()
+                } catch {
+                    ErrorPresenter.shared.present(
+                        message: "Apple Music connection failed. \(error.localizedDescription)"
+                    )
+                }
             }
         case .denied:
             #if os(iOS)
@@ -138,9 +151,7 @@ struct WelcomeView: View {
         
         private init() {
             let authorizationStatus = MusicAuthorization.currentStatus
-            
-            debugPrint(MusicAuthorization.currentStatus.rawValue)
-            
+
             musicAuthorizationStatus = authorizationStatus
             isWelcomeViewPresented = (authorizationStatus != .authorized)
         }
diff --git a/Musadora/Musadora/Recommendations/RecommendationView.swift b/Musadora/Musadora/Recommendations/RecommendationView.swift
@@ -30,7 +30,7 @@ struct RecommendationRow: View {
           APlayer.shared.queue = [item]
           try await APlayer.shared.play()
         } catch {
-          print(error)
+          ErrorPresenter.shared.present(error)
         }
       }
     }, label: {
diff --git a/Musadora/Musadora/Recommendations/RecommendationsView.swift b/Musadora/Musadora/Recommendations/RecommendationsView.swift
@@ -66,7 +66,7 @@ struct RecommendationsView: View {
         hundredBestAlbums = try await MRecommendation.allHundredBestAlbums()
         //   recommendations = try await MRecommendation.default()
       } catch {
-        print(error)
+        ErrorPresenter.shared.present(error)
       }
     }
   }
diff --git a/Musadora/Musadora/Shared/ErrorPresenter.swift b/Musadora/Musadora/Shared/ErrorPresenter.swift
@@ -0,0 +1,55 @@
+import SwiftUI
+
+@MainActor
+final class ErrorPresenter: ObservableObject {
+  static let shared = ErrorPresenter()
+
+  @Published var message: String?
+  @Published var title: String = "Error"
+
+  private init() {}
+
+  nonisolated func present(_ error: Error, title: String = "Error") {
+    present(message: error.localizedDescription, title: title)
+  }
+
+  nonisolated func present(message: String, title: String = "Error") {
+    Task { @MainActor in
+      self.title = title
+      self.message = message
+    }
+  }
+
+  func clear() {
+    message = nil
+  }
+}
+
+private struct ErrorAlertModifier: ViewModifier {
+  @StateObject private var presenter = ErrorPresenter.shared
+
+  func body(content: Content) -> some View {
+    content.alert(presenter.title, isPresented: isPresentedBinding) {
+      Button("OK", role: .cancel) {}
+    } message: {
+      Text(presenter.message ?? "")
+    }
+  }
+
+  private var isPresentedBinding: Binding<Bool> {
+    Binding(
+      get: { presenter.message != nil },
+      set: { isPresented in
+        if !isPresented {
+          presenter.clear()
+        }
+      }
+    )
+  }
+}
+
+extension View {
+  func errorAlert() -> some View {
+    modifier(ErrorAlertModifier())
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ struct StationGenreDetailedView: View {`
`24`	`24`	`do {`
`25`	`25`	`stations = try await MCatalog.stations(for: stationGenre)`
`26`	`26`	`} catch {`
`27`		`- print(error)`
	`27`	`+ ErrorPresenter.shared.present(error)`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ extension StationGenresView {`
`29`	`29`	`do {`
`30`	`30`	`stationGenres = try await MCatalog.stationGenres()`
`31`	`31`	`} catch {`
`32`		`- print(error)`
	`32`	`+ ErrorPresenter.shared.present(error)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ struct AlbumChartView: View {`
`31`	`31`	`do {`
`32`	`32`	`try await APlayer.shared.play(album: album)`
`33`	`33`	`} catch {`
`34`		`- print(error)`
	`34`	`+ ErrorPresenter.shared.present(error)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ extension ChartView {`
`100`	`100`	`do {`
`101`	`101`	`chart = try await MCatalog.charts(genre: genre, kinds: .all, types: .all)`
`102`	`102`	`} catch {`
`103`		`- print(error)`
	`103`	`+ ErrorPresenter.shared.present(error)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct ChartsView: View {`
`50`	`50`	`do {`
`51`	`51`	`genres = try await MCatalog.topGenres()`
`52`	`52`	`} catch {`
`53`		`- print(error)`
	`53`	`+ ErrorPresenter.shared.present(error)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ struct PlaylistChartView: View {`
`29`	`29`	`do {`
`30`	`30`	`try await APlayer.shared.play(playlist: playlist)`
`31`	`31`	`} catch {`
`32`		`- print(error)`
	`32`	`+ ErrorPresenter.shared.present(error)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}, label: {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct RecentlyAddedView: View {`
`23`	`23`	`recentlyAddedPlaylists = try await MHistory.recentlyAddedPlaylists(limit: 25, offset: 0)`
`24`	`24`	`recentlyAddedAlbums = try await MHistory.recentlyAddedAlbums(limit: 25, offset: 0)`
`25`	`25`	`} catch {`
`26`		`- print(error)`
	`26`	`+ ErrorPresenter.shared.present(error)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct RecentlyPlayedView: View {`
`23`	`23`	`recentlyPlayedAlbums = try await MHistory.recentlyPlayedAlbums(limit: 25, offset: 0)`
`24`	`24`	`recentlyPlayedPlaylists = try await MHistory.recentlyPlayedPlaylists(limit: 25, offset: 0)`
`25`	`25`	`} catch {`
`26`		`- print(error)`
	`26`	`+ ErrorPresenter.shared.present(error)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ struct LibraryAlbumsView: View {`
`18`	`18`	`do {`
`19`	`19`	`albums = try await MLibrary.albums()`
`20`	`20`	`} catch {`
`21`		`- print(error)`
	`21`	`+ ErrorPresenter.shared.present(error)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ struct LibraryPlaylistsTestView: View {`
`102`	`102`	`print("Successfully fetched \(playlists.count) playlists with limit \(limit)")`
`103`	`103`	`} catch {`
`104`	`104`	`errorMessage = error.localizedDescription`
`105`		`- print("Error fetching playlists: \(error)")`
	`105`	`+ ErrorPresenter.shared.present(message: "Error fetching playlists: \(error.localizedDescription)")`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`isLoading = false`