Update Project and Fix Location Edit Bug (#8)

PSchmiedmayer · web-flow · commit ba2b1f2c9015 · 2021-11-14T22:40:17.000Z
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Check Swift version
       run: swift --version
     - name: Build and test
-      run: xcodebuild test -scheme Xpense -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 12'
+      run: xcodebuild test -scheme Xpense -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
   macoswebservice:
     name: macOS Web Service ${{ matrix.configuration }}
     runs-on: macos-11
diff --git a/App/Xpense/Account Subsystem/Edit Account/EditAccount.swift b/App/Xpense/Account Subsystem/Edit Account/EditAccount.swift
@@ -31,7 +31,11 @@ struct EditAccount: View {
                         presentationMode.wrappedValue.dismiss()
                     }
                 }
-            }.onAppear(perform: viewModel.updateStates)
+            }.onAppear {
+                Task {
+                    viewModel.updateStates()
+                }
+            }
                 .navigationTitle(viewModel.id == nil ? "Add Account" : "Edit Account")
                 .toolbar {
                     SaveButton(viewModel: viewModel) {
@@ -93,7 +97,7 @@ private struct DeleteButton: View {
         Task {
             try await viewModel.delete()
             
-            DispatchQueue.main.async {
+            Task(priority: .userInitiated) {
                 onSuccess?()
             }
         }
diff --git a/App/Xpense/Account Subsystem/Edit Account/EditAccountViewModel.swift b/App/Xpense/Account Subsystem/Edit Account/EditAccountViewModel.swift
@@ -47,7 +47,13 @@ class EditAccountViewModel: ObservableObject {
     }
     
     
+    @MainActor
+    private func showDeleteProgressView(_ showDeleteProgressView: Bool) {
+        self.showDeleteProgressView = showDeleteProgressView
+    }
+    
     /// Updates the `EditViews`'s state like the name based on the `id`
+    @MainActor
     func updateStates() {
         guard let account = model?.account(id) else {
             self.name = ""
@@ -65,12 +71,12 @@ class EditAccountViewModel: ObservableObject {
         
         let account = Account(id: self.id, name: self.name, userID: userId)
         
-        self.showSaveProgressView = true
+        await showDeleteProgressView(true)
         
         try await model.save(account)
         
-        self.updateStates()
-        self.showSaveProgressView = false
+        await self.updateStates()
+        await showDeleteProgressView(false)
     }
     
     /// Deletes the `Account` that is currently edited
@@ -79,12 +85,12 @@ class EditAccountViewModel: ObservableObject {
             throw XpenseServiceError.deleteFailed(Account.self)
         }
         
-        self.showDeleteProgressView = true
+        await showDeleteProgressView(true)
         
         try await model.delete(account: id)
         
-        self.updateStates()
-        self.showDeleteProgressView = false
+        await self.updateStates()
+        await showDeleteProgressView(false)
     }
 }
 
diff --git a/App/Xpense/Account Subsystem/Edit Account/SaveButton.swift b/App/Xpense/Account Subsystem/Edit Account/SaveButton.swift
@@ -47,7 +47,7 @@ struct SaveButton<M: SaveButtonViewModel>: View {
         Task {
             try await viewModel.save()
             
-            DispatchQueue.main.async {
+            Task(priority: .userInitiated) {
                 onSuccess?()
             }
         }
diff --git a/App/Xpense/Location Subsystem/EditLocationView.swift b/App/Xpense/Location Subsystem/EditLocationView.swift
@@ -42,14 +42,7 @@ struct EditLocationView: View {
                     }
                     .font(.largeTitle)
                     .foregroundColor(.red)
-            }
-                .navigationBarTitleDisplayMode(.inline)
-                .onAppear {
-                    if let coordinate = coordinate {
-                        coordinateRegion.center = coordinate
-                        coordinateRegion.span = LocationView.Defaults.span
-                    }
-                }
+            }.ignoresSafeArea(edges: .bottom)
                 .toolbar {
                     ToolbarItem(placement: .cancellationAction) {
                         Button("Cancel") {
@@ -63,6 +56,13 @@ struct EditLocationView: View {
                         }
                     }
                 }
+                .onAppear {
+                    if let coordinate = coordinate {
+                        coordinateRegion.center = coordinate
+                        coordinateRegion.span = LocationView.Defaults.span
+                    }
+                }
+                .navigationBarTitleDisplayMode(.inline)
         }
     }
 }
diff --git a/App/Xpense/Transaction Subsystem/Edit Transaction/EditTransaction.swift b/App/Xpense/Transaction Subsystem/Edit Transaction/EditTransaction.swift
@@ -36,7 +36,11 @@ struct EditTransaction: View {
     var body: some View {
         NavigationView {
             self.form
-                .onAppear(perform: viewModel.updateStates)
+                .onAppear {
+                    Task {
+                        viewModel.updateStates()
+                    }
+                }
                 .navigationBarTitle(navigationTitle, displayMode: .inline)
                 .toolbar {
                     ToolbarItem(placement: .primaryAction) {
diff --git a/App/Xpense/Transaction Subsystem/Edit Transaction/EditTransactionViewModel.swift b/App/Xpense/Transaction Subsystem/Edit Transaction/EditTransactionViewModel.swift
@@ -57,7 +57,13 @@ class EditTransactionViewModel: ObservableObject {
     }
     
     
+    @MainActor
+    private func showSaveProgressView(_ showSaveProgressView: Bool) {
+        self.showSaveProgressView = showSaveProgressView
+    }
+    
     /// Updates the `EditTransaction`'s state like the name based on the `id`
+    @MainActor
     func updateStates() {
         guard let transaction = model?.transaction(id), !loaded else {
             return
@@ -92,12 +98,12 @@ class EditTransactionViewModel: ObservableObject {
                                       location: Coordinate(location),
                                       account: selectedAccount)
         
-        self.showSaveProgressView = true
+        await showSaveProgressView(true)
         
         try await model.save(transaction)
         
-        self.updateStates()
-        self.showSaveProgressView = false
+        await self.updateStates()
+        await showSaveProgressView(false)
     }
 }
 
diff --git a/App/Xpense/User Subsystem/Login/ViewModel/LoginViewModel.swift b/App/Xpense/User Subsystem/Login/ViewModel/LoginViewModel.swift
@@ -107,7 +107,7 @@ class LoginViewModel: ObservableObject {
                 try await model?.signUp(username, password: password)
             }
             
-            DispatchQueue.main.async {
+            Task(priority: .userInitiated) {
                 self.loadingInProcess = false
             }
         }
diff --git a/Shared/Package.resolved b/Shared/Package.resolved
diff --git a/Shared/Package.swift b/Shared/Package.swift
@@ -23,8 +23,8 @@ let package = Package(
         .library(name: "RESTfulXpenseModel", targets: ["RESTfulXpenseModel"])
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser", from: "0.4.4"),
-        .package(url: "https://github.com/apple/swift-crypto.git", from: "1.1.6")
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "0.4.0"),
+        .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "3.0.0")
     ],
     targets: [
         .executableTarget(
diff --git a/Shared/Sources/RESTfulXpenseModel/RestfulModel.swift b/Shared/Sources/RESTfulXpenseModel/RestfulModel.swift
@@ -25,11 +25,13 @@ public class RestfulModel: LocalStorageModel {
     /// Creates a new `RestfulModel` and loads the current `User`s, `Account`s and `Transaction`s
     public init() {
         super.init()
-        userDidSet()
+        Task {
+            await userDidSet()
+        }
     }
     
-    override public func userDidSet() {
-        super.userDidSet()
+    override public func userDidSet() async {
+        await super.userDidSet()
         
         guard let token = user?.bearerToken else {
             return
@@ -69,15 +71,15 @@ public class RestfulModel: LocalStorageModel {
     override public func signUp(_ name: String, password: String) async throws -> User {
         let user = try await sendSignUpRequest(name, password: password)
         users.update(with: user)
-        userDidSet()
+        await userDidSet()
         return user
     }
     
     @discardableResult
     override public func login(_ name: String, password: String) async throws -> String {
         let user = try await sendLoginRequest(name, password: password)
         users.update(with: user)
-        userDidSet()
+        await userDidSet()
         
         guard let token = user.tokens.first else {
             throw XpenseServiceError.loginFailed
diff --git a/Shared/Sources/XpenseModel/LocalStorageModel/LocalStorageModel.swift b/Shared/Sources/XpenseModel/LocalStorageModel/LocalStorageModel.swift
@@ -38,18 +38,18 @@ open class LocalStorageModel: Model {
     }
     
     
-    override open func accountsDidSet() {
-        super.accountsDidSet()
+    override open func accountsDidSet() async {
+        await super.accountsDidSet()
         accounts.saveToFile()
     }
     
-    override open func transactionsDidSet() {
-        super.transactionsDidSet()
+    override open func transactionsDidSet() async {
+        await super.transactionsDidSet()
         transactions.saveToFile()
     }
     
-    override open func userDidSet() {
-        super.userDidSet()
+    override open func userDidSet() async {
+        await super.userDidSet()
         users.saveToFile()
     }
     
diff --git a/Shared/Sources/XpenseModel/Model.swift b/Shared/Sources/XpenseModel/Model.swift
@@ -19,19 +19,25 @@ open class Model {
     /// The `Account`s of the Xpense App
     public var accounts: Set<Account> {
         didSet {
-            accountsDidSet()
+            Task {
+                await accountsDidSet()
+            }
         }
     }
     /// The `Transaction`s of the Xpense App
     public var transactions: Set<Transaction> {
         didSet {
-            transactionsDidSet()
+            Task {
+                await transactionsDidSet()
+            }
         }
     }
     /// A `XpenseServiceError` that should be displayed to the user in case of an error in relation with the Xpense Web Service
     public var webServiceError: XpenseServiceError? {
         didSet {
-            webServiceErrorDidSet()
+            Task {
+                await webServiceErrorDidSet()
+            }
         }
     }
     
@@ -53,46 +59,42 @@ open class Model {
     }
     
     
-    #if canImport(Combine)
+    #if canImport(Combine) && canImport(UIKit)
     /// Called when a new `User` was set to the `user` property, calls the `ObservableObject` `objectWillChange` Publisher
-    open func userDidSet() {
-        DispatchQueue.main.async {
-            self.objectWillChange.send()
-        }
+    @MainActor
+    open func userDidSet() async {
+        self.objectWillChange.send()
     }
     
     /// Called when a new `Account` was set to the `accounts` property, calls the `ObservableObject` `objectWillChange` Publisher
-    open func accountsDidSet() {
-        DispatchQueue.main.async {
-            self.objectWillChange.send()
-        }
+    @MainActor
+    open func accountsDidSet() async {
+        self.objectWillChange.send()
     }
     
     /// Called when a new `Transaction` was set to the `transactions` property, calls the `ObservableObject` `objectWillChange` Publisher
-    open func transactionsDidSet() {
-        DispatchQueue.main.async {
-            self.objectWillChange.send()
-        }
+    @MainActor
+    open func transactionsDidSet() async {
+        self.objectWillChange.send()
     }
     
     /// Called when a new `XpenseServiceError` was set to the `webServiceError` property, calls the `ObservableObject` `objectWillChange` Publisher
-    open func webServiceErrorDidSet() {
-        DispatchQueue.main.async {
-            self.objectWillChange.send()
-        }
+    @MainActor
+    open func webServiceErrorDidSet() async {
+        self.objectWillChange.send()
     }
     #else
     /// Called when a new `User` was set to the `user` property
-    open func userDidSet() {}
+    open func userDidSet() async {}
     
     /// Called when a new `Account` was set to the `accounts` property
-    open func accountsDidSet() {}
+    open func accountsDidSet() async {}
     
     /// Called when a new `Transaction` was set to the `transactions` property
-    open func transactionsDidSet() {}
+    open func transactionsDidSet() async {}
     
     /// Called when a new `XpenseServiceError` was set to the `webServiceError` property
-    open func webServiceErrorDidSet() {}
+    open func webServiceErrorDidSet() async {}
     #endif
     
     /// Get an `Account` for a specific ID
@@ -192,7 +194,7 @@ open class Model {
     open func signUp(_ name: String, password: String) async throws -> User {
         let user = User(name: name, password: password)
         users.update(with: user)
-        userDidSet()
+        await userDidSet()
         return user
     }
 
@@ -214,7 +216,7 @@ open class Model {
     open func createToken(for user: inout User) async -> String {
         let token = user.createToken()
         users.update(with: user)
-        userDidSet()
+        await userDidSet()
         return token
     }
     
@@ -242,6 +244,6 @@ open class Model {
     }
 }
 
-#if canImport(Combine)
+#if canImport(Combine) && canImport(UIKit)
 extension Model: ObservableObject {}
 #endif
diff --git a/WebService/Package.resolved b/WebService/Package.resolved
diff --git a/Xpense.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Xpense.xcworkspace/xcshareddata/swiftpm/Package.resolved

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,11 @@ struct EditAccount: View {`
`31`	`31`	`presentationMode.wrappedValue.dismiss()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`- }.onAppear(perform: viewModel.updateStates)`
	`34`	`+ }.onAppear {`
	`35`	`+ Task {`
	`36`	`+ viewModel.updateStates()`
	`37`	`+ }`
	`38`	`+ }`
`35`	`39`	`.navigationTitle(viewModel.id == nil ? "Add Account" : "Edit Account")`
`36`	`40`	`.toolbar {`
`37`	`41`	`SaveButton(viewModel: viewModel) {`
`@@ -93,7 +97,7 @@ private struct DeleteButton: View {`
`93`	`97`	`Task {`
`94`	`98`	`try await viewModel.delete()`
`95`	`99`
`96`		`- DispatchQueue.main.async {`
	`100`	`+ Task(priority: .userInitiated) {`
`97`	`101`	`onSuccess?()`
`98`	`102`	`}`
`99`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ struct SaveButton<M: SaveButtonViewModel>: View {`
`47`	`47`	`Task {`
`48`	`48`	`try await viewModel.save()`
`49`	`49`
`50`		`- DispatchQueue.main.async {`
	`50`	`+ Task(priority: .userInitiated) {`
`51`	`51`	`onSuccess?()`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,7 @@ struct EditLocationView: View {`
`42`	`42`	`}`
`43`	`43`	`.font(.largeTitle)`
`44`	`44`	`.foregroundColor(.red)`
`45`		`- }`
`46`		`- .navigationBarTitleDisplayMode(.inline)`
`47`		`- .onAppear {`
`48`		`- if let coordinate = coordinate {`
`49`		`- coordinateRegion.center = coordinate`
`50`		`- coordinateRegion.span = LocationView.Defaults.span`
`51`		`- }`
`52`		`- }`
	`45`	`+ }.ignoresSafeArea(edges: .bottom)`
`53`	`46`	`.toolbar {`
`54`	`47`	`ToolbarItem(placement: .cancellationAction) {`
`55`	`48`	`Button("Cancel") {`
`@@ -63,6 +56,13 @@ struct EditLocationView: View {`
`63`	`56`	`}`
`64`	`57`	`}`
`65`	`58`	`}`
	`59`	`+ .onAppear {`
	`60`	`+ if let coordinate = coordinate {`
	`61`	`+ coordinateRegion.center = coordinate`
	`62`	`+ coordinateRegion.span = LocationView.Defaults.span`
	`63`	`+ }`
	`64`	`+ }`
	`65`	`+ .navigationBarTitleDisplayMode(.inline)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class LoginViewModel: ObservableObject {`
`107`	`107`	`try await model?.signUp(username, password: password)`
`108`	`108`	`}`
`109`	`109`
`110`		`- DispatchQueue.main.async {`
	`110`	`+ Task(priority: .userInitiated) {`
`111`	`111`	`self.loadingInProcess = false`
`112`	`112`	`}`
`113`	`113`	`}`