[taler-taler-ios] 02/36: Transaction, L10N

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

commit a93686d71c845cd724966f61c43b2c9097b59f41
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Nov 9 14:10:28 2023 +0100

    Transaction, L10N
---
 TalerWallet1/Model/Transaction.swift               | 72 ++++++++++++++++------
 .../Views/HelperViews/TransactionButton.swift      | 71 +++++++--------------
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/TalerWallet1/Model/Transaction.swift 
b/TalerWallet1/Model/Transaction.swift
index ea1e599..307e548 100644
--- a/TalerWallet1/Model/Transaction.swift
+++ b/TalerWallet1/Model/Transaction.swift
@@ -23,7 +23,7 @@ enum TransactionMinorState: String, Codable {
     case aml        // AmlRequired
     case mergeKycRequired = "merge-kyc"
     case track
-    case pay
+    case submitPayment = "submit-payment"
     case rebindSession = "rebind-session"
     case refresh
     case pickup
@@ -40,17 +40,16 @@ enum TransactionMinorState: String, Codable {
     case repurchase
     case bankRegisterReserve = "bank-register-reserve"
     case bankConfirmTransfer = "bank-confirm-transfer"
-    case exchangeWaitReserve = "exchange-wait-reserve"
     case withdrawCoins = "withdraw-coins"
+    case exchangeWaitReserve = "exchange-wait-reserve"
     case abortingBank = "aborting-bank"
+    case aborting
     case refused
     case withdraw
     case merchantOrderProposed = "merchant-order-proposed"
     case proposed
     case refundAvailable = "refund-available"
     case acceptRefund = "accept-refund"
-
-    case submitPayment = "submit-payment"
 }
 
 enum TransactionMajorState: String, Codable {
@@ -67,23 +66,20 @@ enum TransactionMajorState: String, Codable {
     case expired
       // Only used for the notification, never in the transaction history
     case deleted
-      // Placeholder until D37 is fully implemented
-    case unknown
 
     var localizedState: String {
         switch self {
             case .none:      return                   "none"
-            case .pending:   return String(localized: "MajorState.Pending", 
defaultValue: "Pending", comment: "TransactionMajorState")
-            case .done:      return String(localized: "MajorState.Done", 
defaultValue: "Done", comment: "TransactionMajorState")
-            case .aborting:  return String(localized: "MajorState.Aborting", 
defaultValue: "Aborting", comment: "TransactionMajorState")
-            case .aborted:   return String(localized: "MajorState.Aborted", 
defaultValue: "Aborted", comment: "TransactionMajorState")
+            case .pending:   return String(localized: "MajorState.Pending", 
defaultValue: "Pending", comment: "TxMajorState heading")
+            case .done:      return String(localized: "MajorState.Done", 
defaultValue: "Done", comment: "TxMajorState heading")
+            case .aborting:  return String(localized: "MajorState.Aborting", 
defaultValue: "Aborting", comment: "TxMajorState heading")
+            case .aborted:   return String(localized: "MajorState.Aborted", 
defaultValue: "Aborted", comment: "TxMajorState heading")
             case .suspended: return                   "Suspended"
-            case .dialog:    return String(localized: "MajorState.Dialog", 
defaultValue: "Dialog", comment: "TransactionMajorState")
+            case .dialog:    return String(localized: "MajorState.Dialog", 
defaultValue: "Dialog", comment: "TxMajorState heading")
             case .suspendedAborting: return           "AbortingSuspended"
-            case .failed:    return String(localized: "MajorState.Failed", 
defaultValue: "Failed", comment: "TransactionMajorState")
-            case .expired:   return String(localized: "MajorState.Expired", 
defaultValue: "Expired", comment: "TransactionMajorState")
-            case .deleted:   return String(localized: "MajorState.Deleted", 
defaultValue: "Deleted", comment: "TransactionMajorState")
-            case .unknown:   return String(localized: "MajorState.Unknown", 
defaultValue: "Unknown", comment: "TransactionMajorState")
+            case .failed:    return String(localized: "MajorState.Failed", 
defaultValue: "Failed", comment: "TxMajorState heading")
+            case .expired:   return String(localized: "MajorState.Expired", 
defaultValue: "Expired", comment: "TxMajorState heading")
+            case .deleted:   return String(localized: "MajorState.Deleted", 
defaultValue: "Deleted", comment: "TxMajorState heading")
         }
     }
 }
@@ -104,12 +100,52 @@ struct TransactionTransition: Codable {             // 
Notification
 }
 
 enum TxAction: String, Codable {
-    case abort      // pending,dialog,suspended -> aborting
-//  case revive     // aborting -> pending ?? maybe post 1.0
-    case fail       // aborting -> failed
     case delete     // dialog,done,expired,aborted,failed -> ()
     case suspend    // pending -> suspended; aborting -> ab_suspended
     case resume     // suspended -> pending; ab_suspended -> aborting
+    case abort      // pending,dialog,suspended -> aborting
+//  case revive     // aborting -> pending ?? maybe post 1.0
+    case fail       // aborting -> failed
+    case retry      //
+
+    var localizedActionTitle: String {
+        return switch self {
+            case .delete:   String(localized: "TxAction.Delete", defaultValue: 
"Delete from list", comment: "TxAction button")
+            case .suspend:  String("Suspend")
+            case .resume:   String("Resume")
+            case .abort:    String(localized: "TxAction.Abort", defaultValue: 
"Abort", comment: "TxAction button")
+//            case .revive:   String(localized: "TxAction.Revive", 
defaultValue: "Revive", comment: "TxAction button")
+            case .fail:     String(localized: "TxAction.Fail", defaultValue: 
"Fail", comment: "TxAction button")
+            case .retry:    String(localized: "TxAction.Retry", defaultValue: 
"Retry", comment: "TxAction button")
+        }
+    }
+    var localizedActionImage: String? {
+        return switch self {
+            case .delete:   "trash"                     // 􀈑
+            case .suspend:
+                if #available(iOS 16.0, *) {
+                    "clock.badge.xmark"                 // 􁜒
+                } else {
+                    "clock.badge.exclamationmark"       // 􀹶
+                }
+            case .resume:   "clock.arrow.circlepath"    // 􀣔
+            case .abort:    "x.circle"                  // 􀀲
+//            case .revive:   "clock.arrow.circlepath"    // 􀣔
+            case .fail:     "play.slash"                // 􀪅
+            case .retry:    "arrow.circlepath"          // 􁹠
+        }
+    }
+    var localizedActionExecuted: String {
+        switch self {
+            case .delete:   return String(localized: "TxActionDone.Delete", 
defaultValue: "Deleted from list", comment: "TxAction button")
+            case .suspend:  return String("Suspending...")
+            case .resume:   return String("Resuming...")
+            case .abort:    return String(localized: "TxActionDone.Abort", 
defaultValue: "Abort pending...", comment: "TxAction button")
+//            case .revive:   return String(localized: "TxActionDone.Revive", 
defaultValue: "Revive", comment: "TxAction button")
+            case .fail:     return String(localized: "TxActionDone.Fail", 
defaultValue: "Failing...", comment: "TxAction button")
+            case .retry:    return String(localized: "TxActionDone.Retry", 
defaultValue: "Retrying...", comment: "TxAction button")
+        }
+    }
 }
 
 enum TransactionType: String, Codable {
diff --git a/TalerWallet1/Views/HelperViews/TransactionButton.swift 
b/TalerWallet1/Views/HelperViews/TransactionButton.swift
index 0ac465e..40b0c5e 100644
--- a/TalerWallet1/Views/HelperViews/TransactionButton.swift
+++ b/TalerWallet1/Views/HelperViews/TransactionButton.swift
@@ -15,58 +15,29 @@ struct TransactionButton: View {
     @State var executed: Bool = false
     var body: some View {
         let isDestructive = (command == .delete) || (command == .fail)
-        let role: ButtonRole? = (command == .abort) ? .cancel
-                              :  isDestructive ? .destructive
-                                               : nil
+        let isCancel = (command == .abort)
+        let role: ButtonRole? = isDestructive ? .destructive
+                              : isCancel      ? .cancel
+                                              : nil
         Button(role: role, action: {
-            Task { // runs on MainActor
+            if !disabled {
                 disabled = true     // don't try this more than once
-                do {
-                    try await action(transactionId)
+                Task { // runs on MainActor
+                    do {
+                        try await action(transactionId)
 //                    symLog.log("\(executed) \(transactionId)")
-                    executed = true
-                } catch {    // TODO: error
+                        executed = true
+                    } catch {    // TODO: error
 //                    symLog.log(error.localizedDescription)
+                    }
                 }
             }
         }, label: {
-            HStack {
-                if executed {
-                    switch command {
-                        case .delete:
-                            Text("Deleted from list")
-                        case .abort:
-                            Text("Abort pending...")
-                        case .fail:
-                            Text("Failing...")
-                        case .suspend:
-                            Text("Suspending...")
-                        case .resume:
-                            Text("Resuming...")
-                    }
-                } else {
-                    let spaces = "        "
-                    switch command {
-                        case .delete:
-                            Text("Delete from list" + spaces)
-                            Image(systemName: "trash")                         
 // 􀈑
-                        case .abort:
-                            Text("Abort" + spaces)
-                            Image(systemName: "x.circle")                      
 // 􀀲
-                        case .fail:
-                            Text("Fail" + spaces)
-                            Image(systemName: "play.slash")                    
 // 􀪅
-                        case .suspend:
-                            Text("Suspend" + spaces)
-                            if #available(iOS 16.0, *) {
-                                Image(systemName: "clock.badge.xmark")         
 // 􁜒
-                            } else {
-                                Image(systemName: 
"clock.badge.exclamationmark")// 􀹶
-                            }
-                        case .resume:
-                            Text("Resume" + spaces)
-                            Image(systemName: "clock.arrow.circlepath")        
 // 􀣔
-                    }
+            HStack(spacing: 50) {
+                Text(executed ? command.localizedActionExecuted
+                              : command.localizedActionTitle)
+                if let imageName = command.localizedActionImage {
+                    Image(systemName: imageName)
                 }
             }
             .accessibilityFont(.title2)
@@ -76,16 +47,18 @@ struct TransactionButton: View {
         .controlSize(.large)
         .disabled(disabled)
     }
-
 }
-
-
+// MARK: -
 #if DEBUG
 struct TransactionButton_Previews: PreviewProvider {
 
+    static func action(_ transactionId: String) async throws {
+        print(transactionId)
+    }
+
     static var previews: some View {
         List {
-            TransactionButton(transactionId: "String", command: .abort, 
action: {transactionId in })
+            TransactionButton(transactionId: "Button pressed", command: 
.abort, action: action)
         }
     }
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.