commit 1f02c74dd02d0cbc3b6c0680e8dcac5337b318e2
parent 4b7fc67004dc39fca926ded4b317b0cb133f74f8
Author: Marc Stibane <marc@taler.net>
Date: Sun, 3 Nov 2024 07:53:42 +0100
cleanup
Diffstat:
4 files changed, 3 insertions(+), 354 deletions(-)
diff --git a/TalerWallet1/Controllers/DebugViewC.swift b/TalerWallet1/Controllers/DebugViewC.swift
@@ -27,11 +27,9 @@ import os.log
// MARK: - Main View
public let VIEW_EMPTY_WALLET = 10 // 10 WalletEmptyView
public let VIEW_BALANCES = VIEW_EMPTY_WALLET + 1 // 11 BalancesListView
-public let VIEW_OVERVIEW = VIEW_BALANCES + 1 // 12 ListView
-public let VIEW_SETTINGS = VIEW_OVERVIEW + 1 // 13 SettingsView
-public let VIEW_ABOUT = VIEW_SETTINGS + 1 // 14 AboutView
-public let VIEW_BANKING = VIEW_ABOUT + 1 // 15 ExchangeListView
-//public let VIEW_PENDING = VIEW_BANKING + 1 // 16 PendingOpsListView
+public let VIEW_SETTINGS = VIEW_BALANCES + 1 // 12 SettingsView
+public let VIEW_ABOUT = VIEW_SETTINGS + 1 // 13 AboutView
+public let VIEW_BANKING = VIEW_ABOUT + 1 // 14 ExchangeListView
// MARK: Transactions
public let VIEW_EMPTY_HISTORY = VIEW_EMPTY_WALLET + 10 // 20 TransactionsEmptyView
diff --git a/TalerWallet1/Fonts/Nunito/OFL.txt b/TalerWallet1/Fonts/Nunito/Nunito-OFL.txt
diff --git a/TalerWallet1/Views/Overview/OverviewRowV.swift b/TalerWallet1/Views/Overview/OverviewRowV.swift
@@ -1,125 +0,0 @@
-/*
- * This file is part of GNU Taler, ©2022-24 Taler Systems S.A.
- * See LICENSE.md
- */
-/**
- * @author Marc Stibane
- */
-import SwiftUI
-import taler_swift
-
-struct CurrenciesCell: View {
- let stack: CallStack
- @Binding var currencyInfo: CurrencyInfo
- let amount: Amount
- let sizeCategory: ContentSizeCategory
- let rowAction: () -> Void
- let balanceDest: LazyView<TransactionsListView>?
-
- @Environment(\.colorScheme) private var colorScheme
- @Environment(\.colorSchemeContrast) private var colorSchemeContrast
- @AppStorage("minimalistic") var minimalistic: Bool = false
-
- /// Renders the Balance button. "Balance" leading, amountStr trailing. If it doesn't fit in one row then
- /// amount (trailing) goes underneath "Balance" (leading).
- var body: some View {
- let amountV = AmountV(stack: stack.push(),
- currencyInfo: $currencyInfo,
- amount: amount,
- isNegative: nil, // don't show the + sign
- strikethrough: false,
- large: true)
- .foregroundColor(.primary)
- let hLayout = amountV
- .frame(maxWidth: .infinity, alignment: .trailing)
- let balanceCell = Group {
- if minimalistic {
- hLayout
- } else {
- let balanceText = Text("Balance:", comment: "Main view")
- .talerFont(.title2)
- .foregroundColor(WalletColors().secondary(colorScheme, colorSchemeContrast))
- let vLayout = VStack(alignment: .leading, spacing: 0) {
- balanceText
- hLayout
- }
-
- if #available(iOS 16.0, *) {
- ViewThatFits(in: .horizontal) {
- HStack(spacing: HSPACING) {
- balanceText
- hLayout
- }
- vLayout
- }
- } else { vLayout } // view for iOS 15
- }
- }
- NavigationLink { balanceDest } label: {
- balanceCell
- .accessibilityElement(children: .combine)
- .accessibilityHint(String(localized: "Will go to main transactions list."))
-// .accessibilityLabel(balanceTitleStr + " " + amountStr) // TODO: CurrencyFormatter!
- }
- }
-}
-
-
-/// This view shows the currency row in a currency section, and two action buttons below
-/// Balance: amount
-/// [Send Money] [Request Payment]
-struct OverviewRowV: View {
- let stack: CallStack
- @Binding var currencyInfo: CurrencyInfo
- let amount: Amount
- let sendAction: () -> Void
- let recvAction: () -> Void
- let rowAction: () -> Void
- let balanceDest: LazyView<TransactionsListView>?
-
- @Environment(\.sizeCategory) var sizeCategory
- @EnvironmentObject private var controller: Controller
- @AppStorage("minimalistic") var minimalistic: Bool = false
- @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
-
- var body: some View {
- VStack (alignment: .trailing, spacing: 6) {
- CurrenciesCell(stack: stack.push(),
- currencyInfo: $currencyInfo,
- amount: amount,
- sizeCategory: sizeCategory,
- rowAction: rowAction,
- balanceDest: balanceDest)
-// .border(.red)
- }
- }
-}
-// MARK: -
-#if DEBUG
-struct OverviewRowV_Previews: PreviewProvider {
- @MainActor
- struct StateContainer: View {
- @State private var currencyInfoD: CurrencyInfo = CurrencyInfo.zero(DEMOCURRENCY)
- @State private var currencyInfoT: CurrencyInfo = CurrencyInfo.zero(TESTCURRENCY)
-
- var body: some View {
- let test = Amount(currency: TESTCURRENCY, cent: 123)
- let demo = Amount(currency: DEMOCURRENCY, cent: 123456)
-
- List {
- Section {
- OverviewRowV(stack: CallStack("Preview"), currencyInfo: $currencyInfoD, amount: demo,
- sendAction: {}, recvAction: {}, rowAction: {}, balanceDest: nil)
- }
- OverviewRowV(stack: CallStack("Preview"), currencyInfo: $currencyInfoT, amount: test,
- sendAction: {}, recvAction: {}, rowAction: {}, balanceDest: nil)
- }
- }
- }
-
- static var previews: some View {
- StateContainer()
-// .environment(\.sizeCategory, .extraExtraLarge) Canvas Device Settings
- }
-}
-#endif
diff --git a/TalerWallet1/Views/Overview/OverviewSectionV.swift b/TalerWallet1/Views/Overview/OverviewSectionV.swift
@@ -1,224 +0,0 @@
-/*
- * This file is part of GNU Taler, ©2022-23 Taler Systems S.A.
- * See LICENSE.md
- */
-import SwiftUI
-import taler_swift
-import SymLog
-
-/// This view shows a currency section
-/// Currency Name
-/// [Send Coins] [Receive Coins] Balance
-/// tapping on Balance leads to completed Transactions (.done)
-/// optional: Pending Incoming
-/// optional: Pending Outgoing
-/// optional: Suspended / Aborting / Aborted / Expired
-
-struct OverviewSectionV {
- private let symLog = SymLogV(0)
- let stack: CallStack
- let balance: Balance // this is the currency to be used
- let sectionCount: Int
- @Binding var amountToTransfer: Amount // does still have the wrong currency
- @Binding var summary: String
- @Binding var shouldReloadBalances: Int
-
- @EnvironmentObject private var model: WalletModel
- @Environment(\.colorScheme) private var colorScheme
- @Environment(\.colorSchemeContrast) private var colorSchemeContrast
- @EnvironmentObject private var controller: Controller
-#if DEBUG
- @AppStorage("developerMode") var developerMode: Bool = true
-#else
- @AppStorage("developerMode") var developerMode: Bool = false
-#endif
- @AppStorage("minimalistic") var minimalistic: Bool = false
-
- @State private var showSpendingHint = true
- @State private var isShowingDetailView = false
- @State private var completedTransactions: [Transaction] = []
- @State private var recentTransactions: [Transaction] = []
- @State private var pendingTransactions: [Transaction] = []
- @State private var currencyInfo: CurrencyInfo = CurrencyInfo.zero(UNKNOWN)
- @State private var currencyName: String = UNKNOWN
- @State private var currencySymbol: String = UNKNOWN
-
- func reloadOneAction(_ transactionId: String, _ viewHandles: Bool) async throws -> Transaction {
- return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
- }
-
- @State private var sectionID = UUID()
- @State private var shownSectionID = UUID() // guaranteed to be different the first time
-
- func loadRecent(_ stack: CallStack) async -> () {
- if let transactions = try? await model.transactionsT(stack.push(),
- scopeInfo: balance.scopeInfo,
-// filterByState: .done, // TODO: .done
- includeRefreshes: false) {
- let recent = WalletModel.completedTransactions(transactions)
- // TODO: only load the MAXRECENT most recent transactions
- let slice = recent.prefix(MAXRECENT) // already sorted
- withAnimation { recentTransactions = Array(slice) }
- }
- }
- func loadCompleted(_ stack: CallStack) async -> () {
- if let transactions = try? await model.transactionsT(stack.push(),
- scopeInfo: balance.scopeInfo,
-// filterByState: .final, // TODO: .final
- includeRefreshes: developerMode) {
- let completed = WalletModel.completedTransactions(transactions)
- withAnimation { completedTransactions = completed }
- }
- }
- func loadPending(_ stack: CallStack) async -> () {
- if let transactions = try? await model.transactionsT(stack.push(),
- scopeInfo: balance.scopeInfo,
- filterByState: .nonfinal,
- includeRefreshes: developerMode) {
- withAnimation { pendingTransactions = WalletModel.pendingTransactions(transactions) }
- }
- }
-}
-
-extension OverviewSectionV: View {
- var body: some View {
-#if PRINT_CHANGES
- let _ = Self._printChanges()
- let _ = symLog.vlog() // just to get the # to compare it with .onAppear & onDisappear
-#endif
- let scopeInfo = balance.scopeInfo
- let currency = scopeInfo.currency
-// let currencyInfo = controller.info(for: currency, controller.currencyTicker)
-// let currencyName = currencyInfo.scope.currency
-
- Section {
- if scopeInfo.type == .exchange {
- let baseURL = scopeInfo.url?.trimURL ?? String(localized: "Unknown Payment Provider", comment: "exchange url")
- Text(baseURL)
- .talerFont(.headline)
- .listRowSeparator(.hidden)
- }
- CurrenciesNavigationLinksV(symLog: symLog,
- stack: stack.push(),
- currencyInfo: $currencyInfo,
- balance: balance,
- amountToTransfer: $amountToTransfer, // does still have the wrong currency
- summary: $summary,
- completedTransactions: $completedTransactions,
- reloadAllAction: loadCompleted,
- reloadOneAction: reloadOneAction)
- if pendingTransactions.count > 0 {
- BalancesPendingRowV(//symLog: symLog,
- stack: stack.push(),
- currencyInfo: $currencyInfo,
- balance: balance,
- pendingTransactions: $pendingTransactions,
- reloadPending: loadPending,
- reloadOneAction: reloadOneAction)
- .padding(.leading, ICONLEADING)
- }
- } header: {
- BarGraphHeader(stack: stack.push(),
- scopeInfo: scopeInfo,
- currencyName: $currencyName,
- currencySymbol: $currencySymbol,
- shouldReloadBalances: $shouldReloadBalances)
- }.id(sectionID)
- .task(id: controller.currencyTicker) {
- currencyInfo = controller.info(for: currency, controller.currencyTicker)
- currencyName = currencyInfo.scope.currency
- currencySymbol = currencyInfo.altUnitSymbol ?? currencyName
- }
- .task(id: shouldReloadBalances + 1_000_000) {
- symLog.log(".task for OverviewSectionV - load recent+completed+pending")
- await loadRecent(stack.push(".task - load recent"))
- await loadCompleted(stack.push(".task - load completed"))
- await loadPending(stack.push(".task - load pending"))
- shownSectionID = sectionID
- }
- /// if there is only one currency, then show MAXRECENT recent transactions
- if sectionCount == 1 && recentTransactions.count > 0 {
- Section {
- let _ = symLog.log("recent transactions")
- TransactionsArraySliceV(symLog: symLog,
- stack: stack.push(),
- currencyInfo: $currencyInfo,
- scopeInfo: scopeInfo,
- transactions: $recentTransactions,
- reloadAllAction: loadRecent,
- reloadOneAction: reloadOneAction)
- .padding(.leading, ICONLEADING)
- } header: {
- if !minimalistic {
- let recentHeader = recentTransactions.count > 1
- ? String(localized: "Recent transactions", comment: "section header plural")
- : String(localized: "Recent transaction", comment: "section header singular")
- Text(recentHeader)
- .talerFont(.title3)
- .foregroundColor(WalletColors().secondary(colorScheme, colorSchemeContrast))
- }
- }
- } // recent transactions
- } // body
-} // OverviewSectionV
-// MARK: -
-fileprivate struct CurrenciesNavigationLinksV: View {
- let symLog: SymLogV?
- let stack: CallStack
- @Binding var currencyInfo: CurrencyInfo
- let balance: Balance
-
-// let sectionCount: Int
- @Binding var amountToTransfer: Amount // does still have the wrong currency
- @Binding var summary: String
- @Binding var completedTransactions: [Transaction]
- let reloadAllAction: (_ stack: CallStack) async -> ()
- let reloadOneAction: ((_ transactionId: String, _ viewHandles: Bool) async throws -> Transaction)
-// @EnvironmentObject private var model: WalletModel
-
- @State private var buttonSelected: Int? = nil
-
- func selectAndUpdate(_ button: Int) {
- let currency = balance.scopeInfo.currency
- amountToTransfer.setCurrency(currency) // replace wrong currency here
- symLog?.log("balance.scopeInfo.currency: \(currency)")
-
- buttonSelected = button // will trigger NavigationLink
- // while navigation animation runs, contact Exchange to update Fees
-// Task { // runs on MainActor
-// do {
-// try await model.updateExchange(scopeInfo: balance.scopeInfo)
-// } catch { // TODO: error handling - couldn't updateExchange
-// symLog.log("error: \(error)")
-// }
-// }
- }
-
- var body: some View {
- let scopeInfo = balance.scopeInfo
- HStack(spacing: 0) {
- let balanceDest = LazyView {
- TransactionsListView(stack: stack.push(),
- currencyInfo: $currencyInfo,
- navTitle: String(localized: "Transactions", comment: "ViewTitle of TransactionList"),
- scopeInfo: scopeInfo,
- transactions: $completedTransactions,
- reloadAllAction: reloadAllAction,
- reloadOneAction: reloadOneAction)
- }
- NavigationLink(destination: balanceDest, tag: 3, selection: $buttonSelected)
- { EmptyView() }.frame(width: 0).opacity(0).hidden() // TransactionsListView
-
- OverviewRowV(stack: stack.push(),
- currencyInfo: $currencyInfo,
- amount: balance.available,
- sendAction: {
- selectAndUpdate(1) // trigger SendAmount NavigationLink
- }, recvAction: {
- selectAndUpdate(2) // trigger RequestPayment NavigationLink
- }, rowAction: {
- buttonSelected = 3 // trigger TransactionList NavigationLink
- }, balanceDest: balanceDest)
- }
- }
-}
