Merge pull request #181 from makinosp/develop

Develop

Author: makinosp

Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -22,3 +22,9 @@ struct ApplicationError: LocalizedError {
         ApplicationError(text: "User is not set")
     }
 }
+
+extension ApplicationError {
+    init(_ error: Error) {
+        text = error.localizedDescription
+    }
+}

harmonie/Models/ApplicationError.swift

@@ -14,23 +14,44 @@ extension View {
     }
 }
 
-@MemberwiseInit
+@MainActor @MemberwiseInit
 private struct ErrorAlertModifier {
     @Environment(AppViewModel.self) var appVM: AppViewModel
     @Init(.internal, escaping: true, label: "_") private let action: () -> Void
+
+    typealias ErrorKeyPath<E> = ReferenceWritableKeyPath<AppViewModel, E?>
+
+    func isThrownError<E>(_ errorKeyPath: ErrorKeyPath<E>) -> Binding<Bool> where E: Error {
+        Binding<Bool>(
+            get: { appVM[keyPath: errorKeyPath] != nil },
+            set: { isErrorActive in
+                guard !isErrorActive else { return }
+                appVM[keyPath: errorKeyPath] = nil
+            }
+        )
+    }
 }
 
 extension ErrorAlertModifier: ViewModifier {
     func body(content: Content) -> some View {
         @Bindable var appVM = appVM
         content
             .alert(
-                isPresented: $appVM.isPresentedAlert,
+                isPresented: isThrownError(\.vrckError),
                 error: appVM.vrckError
             ) { _ in
                 Button("OK") {
                     action()
-                    appVM.vrckError = nil
+                }
+            } message: { error in
+                Text(error.failureReason ?? "Try again later.")
+            }
+            .alert(
+                isPresented: isThrownError(\.applicationError),
+                error: appVM.applicationError
+            ) { _ in
+                Button("OK") {
+                    action()
                 }
             } message: { error in
                 Text(error.failureReason ?? "Try again later.")

harmonie/Modifiers/View+ErrorAlertModifier.swift

@@ -13,8 +13,8 @@ import VRCKit
 final class AppViewModel {
     var user: User?
     var step: Step = .initializing
-    var isPresentedAlert = false
     var vrckError: VRCKitError?
+    var applicationError: ApplicationError?
     var services: APIServiceUtil
     var verifyType: VerifyType?
     @ObservationIgnored var client: APIClient
@@ -128,9 +128,10 @@ final class AppViewModel {
                 return
             }
             vrckError = error
+        } else if let error = error as? ApplicationError {
+            applicationError = error
         } else if !error.isCancelled {
-            vrckError = .unexpected
+            applicationError = ApplicationError(error)
         }
-        isPresentedAlert = vrckError != nil
     }
 }

harmonie/ViewModels/AppViewModel.swift

@@ -155,7 +155,7 @@ struct FavoritesView: View {
         _ title: any StringProtocol,
         count: Int,
         max: Constants.MaxCountInFavoriteList
-    ) -> some View {
+    ) -> LabeledContent<some View, some View> {
         LabeledContent {
             Text("\(count.description) / \(max.description)")
         } label: {