taler-ios

commit 4531aab1e20165db8dad12e9f776b11991c3666b
parent ac300494f5689c1fe6fab4b9cbb26775fa3616be
Author: Marc Stibane <marc@taler.net>
Date:   Sat, 13 Jul 2024 18:06:03 +0200

iconName

Diffstat:
M
TalerWallet1/Controllers/PublicConstants.swift
 | 
28
+++++++++++++++++++++++-----
M
TalerWallet1/Model/Transaction.swift
 | 
21
++++++++++++++++++++-

2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift
@@ -1,7 +1,10 @@
 /*
- * This file is part of GNU Taler, ©2022-23 Taler Systems S.A.
+ * This file is part of GNU Taler, ©2022-24 Taler Systems S.A.
  * See LICENSE.md
  */
+/**
+ * @author Marc Stibane
+ */
 import Foundation
 
 public let MAXRECENT = 4
@@ -19,10 +22,25 @@ public let EMPTYSTRING = ""                         // avoid automatic translati
 public let NONBREAKING: Character = "\u{00A0}"
 public let CONFIRM_BANK = "circle.fill"             // badge in PendingRow, TransactionRow and TransactionSummary
 public let NEEDS_KYC = "star.fill"                  // badge in PendingRow, TransactionRow and TransactionSummary
-public let PENDING_INCOMING = "plus.diamond"
-public let PENDING_OUTGOING = "minus.diamond"
-public let DONE_INCOMING = "plus.circle.fill"
-public let DONE_OUTGOING = "minus.circle.fill"
+//public let PENDING_INCOMING = "plus.diamond"      // 􀡿 􀢀
+public let PENDING_INCOMING = "plus"                // 􀅼 􀢀
+public let PENDING_OUTGOING = "minus.diamond"       // 􀢁 􀢂
+public let DONE_INCOMING = "plus.circle.fill"       // 􀁌 􀁍
+public let DONE_OUTGOING = "minus.circle"           // 􀁎 􀁏
+
+public let ICONNAME_FILL = ".fill"
+public let ICONNAME_DUMMY = "taler.circle"                          // 􀀀 􀀁
+public let ICONNAME_WITHDRAWAL = "taler.down"                       // 􁾬 􁾭
+public let ICONNAME_DEPOSIT = "taler.up"                            // 􁾨 􁾩
+public let ICONNAME_REFUND = "taler.turn.up.backward"               // 􀰚 􀰛
+public let ICONNAME_PAYMENT = "taler.turn.up.forward"               // 􀉐 􀰟
+public let ICONNAME_INCOMING_P2P = "taler.backward"                 // 􁉈 􁉅
+public let ICONNAME_OUTGOING_P2P = "taler.forward"                  // 􁉆 􁉇
+public let ICONNAME_REFRESH = "taler.counterclockwise"              // 􁹠   no fill variant!
+//public let ICONNAME_REFRESH1 = "arrow.counterclockwise.circle"    // 􀚃 􀚄
+//public let ICONNAME_REFRESH2 = "arrow.counterclockwise.square"    // 􂅟 􂅠
+public let ICONNAME_RECOUP = "taler.exclamationmark.circle"         // 􀁞 􀁟
+public let ICONNAME_DENOMLOSS = "taler.exclamationmark.triangle"    // 􀇾 􀇿
 
 public let HTTPS = "https://"
 //public let DEMOBANK = HTTPS + "bAnK.dEmO.tAlEr.nEt"             // should be weird to read, but still work
diff --git a/TalerWallet1/Model/Transaction.swift b/TalerWallet1/Model/Transaction.swift
@@ -209,7 +209,7 @@ enum TransactionType: String, Codable {
     case peerPullCredit = "peer-pull-credit"    // request payment from peer, show QR
     case scanPullDebit  = "peer-pull-debit"     // scan QR, pay requested
 //    case internalWithdrawal = "internal-withdrawal"
-    case recoup
+    case recoup                                 // denomination revoked
     case denomLoss      = "denom-loss"          // coins are lost, denomination no longer available
 
     var isWithdrawal : Bool { self == .withdrawal }
@@ -225,6 +225,25 @@ enum TransactionType: String, Codable {
     var isP2pOutgoing: Bool { isSendCoins || isPayInvoice}
     var isP2pIncoming: Bool { isSendInvoice || isRcvCoins}
     var isIncoming   : Bool { isP2pIncoming || isWithdrawal || isRefund }
+    func iconName(_ done: Bool = false) -> String {
+        let iconName = switch self {
+            case .dummy:            ICONNAME_DUMMY
+            case .withdrawal:       ICONNAME_WITHDRAWAL
+            case .deposit:          ICONNAME_DEPOSIT
+            case .payment:          ICONNAME_PAYMENT
+            case .refund:           ICONNAME_REFUND
+            case .refresh:          ICONNAME_REFRESH
+            case .peerPushDebit:    ICONNAME_OUTGOING_P2P
+            case .scanPushCredit:   ICONNAME_INCOMING_P2P
+            case .peerPullCredit:   ICONNAME_INCOMING_P2P
+            case .scanPullDebit:    ICONNAME_OUTGOING_P2P
+            case .recoup:           ICONNAME_RECOUP
+            case .denomLoss:        ICONNAME_DENOMLOSS
+        }
+        return isRefresh ? iconName        // refresh has no fill
+                  : done ? iconName + ICONNAME_FILL
+                         : iconName
+    }
 }
 
 struct TransactionCommon: Decodable, Sendable {