commit 834f11840acf469d1651aa373f9aa1cbce2156e5 parent 2eb25f7c2392174c97816efa868ba0413cce3750 Author: Marc Stibane <marc@taler.net> Date: Sat, 14 Dec 2024 15:06:20 +0100 cleanup Diffstat:
7 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift @@ -259,7 +259,7 @@ class Controller: ObservableObject { if backendState == .instantiated { backendState = .initing do { - let versionInfo = try await model.initWalletCoreT(setTesting: setTesting) + let versionInfo = try await model.initWalletCore(setTesting: setTesting) WalletCore.shared.versionInfo = versionInfo backendState = .ready // dismiss the launch animation } catch { // rethrows diff --git a/TalerWallet1/Model/WalletModel.swift b/TalerWallet1/Model/WalletModel.swift @@ -177,8 +177,7 @@ fileprivate struct ConfigRequest: WalletBackendFormattedRequest { extension WalletModel { /// initalize Wallet-Core. Will do networking - func setConfigT(setTesting: Bool) async throws -> VersionInfo { - // T for any Thread + nonisolated func setConfig(setTesting: Bool) async throws -> VersionInfo { let request = ConfigRequest(setTesting: setTesting) let response = try await sendRequest(request, 0) // no Delay return response.versionInfo @@ -216,8 +215,7 @@ fileprivate struct InitRequest: WalletBackendFormattedRequest { extension WalletModel { /// initalize Wallet-Core. Might do networking - func initWalletCoreT(setTesting: Bool, viewHandles: Bool = false) async throws -> VersionInfo { - // T for any Thread + nonisolated func initWalletCore(setTesting: Bool, viewHandles: Bool = false) async throws -> VersionInfo { let dbPath = try dbPath() // logger.debug("dbPath: \(dbPath)") let request = InitRequest(persistentStoragePath: dbPath, setTesting: setTesting) @@ -313,7 +311,7 @@ extension WalletModel { } } - private func cachePath () throws -> String { + private func cachePath() throws -> String { let fileManager = FileManager.default if let cachesURL = fileManager.urls(for: .cachesDirectory, in: .userDomainMask).first { let cacheURL = cachesURL.appendingPathComponent("cache.json") @@ -347,8 +345,7 @@ fileprivate struct ResetRequest: WalletBackendFormattedRequest { extension WalletModel { /// reset Wallet-Core - func resetWalletCoreT(viewHandles: Bool = false) async throws { - // T for any Thread + nonisolated func resetWalletCore(viewHandles: Bool = false) async throws { let request = ResetRequest() _ = try await sendRequest(request, 0, viewHandles: viewHandles) } @@ -368,7 +365,7 @@ fileprivate struct DevExperimentRequest: WalletBackendFormattedRequest { extension WalletModel { /// tell wallet-core to mock new transactions - func devExperimentT(talerUri: String, viewHandles: Bool = false) async throws { + nonisolated func devExperimentT(talerUri: String, viewHandles: Bool = false) async throws { // T for any Thread let request = DevExperimentRequest(talerUri: talerUri) _ = try await sendRequest(request, 0, viewHandles: viewHandles) diff --git a/TalerWallet1/Views/HelperViews/View+NavLink.swift b/TalerWallet1/Views/HelperViews/View+NavLink.swift @@ -48,10 +48,10 @@ struct NavLink <Content : View> : View { } var body: some View { - if tag != 0 { + if tag != 0 { // actions: $navModel.actionSelected will hide the tabBar NavigationLink(destination: content, tag: tag, selection: $selection) { EmptyView() }.frame(width: 0).opacity(0).hidden() - } else { + } else { // shortcuts, AddButton NavigationLink(destination: content, isActive: $isActive) { EmptyView() }.frame(width: 0).opacity(0).hidden() } diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift @@ -365,7 +365,7 @@ extension MainView { }.navigationViewStyle(.stack) let settingsStack = NavigationView { SettingsView(stack: stack.push(), - navTitle: settingsTitle) + navTitle: settingsTitle) .background(settingsActions) }.navigationViewStyle(.stack) /// our custom tabBar with the Actions button in the middle diff --git a/TalerWallet1/Views/Settings/Bank/BankEditView.swift b/TalerWallet1/Views/Settings/Bank/BankEditView.swift @@ -210,10 +210,10 @@ struct BankEditView: View { let warningText1 = String(localized: "Are you sure you want to forget this bank account?") WarningButton(warningText: warningText1, buttonTitle: buttonTitle, - buttonIcon: "trash", - role: .destructive, - disabled: $disabled, - action: deleteAccount) + buttonIcon: "trash", + role: .destructive, // TODO: WalletColors().errorColor + disabled: $disabled, + action: deleteAccount) .padding(.top) }.listRowSeparator(.hidden) } // List diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift @@ -75,7 +75,6 @@ struct ExchangeListCommonV: View { let symLog: SymLogV? let stack: CallStack - @EnvironmentObject private var model: WalletModel @EnvironmentObject private var controller: Controller @AppStorage("minimalistic") var minimalistic: Bool = false @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic diff --git a/TalerWallet1/Views/Settings/SettingsView.swift b/TalerWallet1/Views/Settings/SettingsView.swift @@ -59,12 +59,12 @@ struct SettingsView: View { } } private var resetButton: some View { - Button("Reset", role: .destructive) { + Button("Reset", role: .destructive) { // TODO: WalletColors().errorColor didReset = true showResetAlert = false Task { // runs on MainActor symLog.log("❗️Reset wallet-core❗️") - try? await model.resetWalletCoreT() + try? await model.resetWalletCore() } } } @@ -223,7 +223,7 @@ struct SettingsView: View { Button(title) { Task { // runs on MainActor symLog.log("running applyDevExperiment Refresh") - try? await model.setConfigT(setTesting: true) + try? await model.setConfig(setTesting: true) try? await model.devExperimentT(talerUri: "taler://dev-experiment/start-block-refresh") try? await model.devExperimentT(talerUri: "taler://dev-experiment/insert-pending-refresh") }