taler-ios

commit d66b0de7bee6e4d4ee3ba9e2c678ad65d7f539d7
parent 936e8d4ec64b6170d19bb86b99ce73043211e1dd
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 24 Jul 2023 16:31:14 +0200

Expiration Constants

Diffstat:
M
TalerWallet1/Controllers/PublicConstants.swift
 | 
4
++++
M
TalerWallet1/Views/HelperViews/SelectDays.swift
 | 
34
+++++++++++++++++++++++-----------
M
TalerWallet1/Views/Peer2peer/PaymentPurpose.swift
 | 
2
+-
M
TalerWallet1/Views/Peer2peer/SendAmount.swift
 | 
2
+-
M
TalerWallet1/Views/Peer2peer/SendPurpose.swift
 | 
2
+-

5 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift
@@ -7,6 +7,10 @@ import Foundation
 public let LAUNCHDURATION: Double = 1.60
 public let SLIDEDURATION: Double = 0.45
 
+public let ONEDAY: UInt = 1         // 1..3
+public let SEVENDAYS: UInt = 7      // 3..9
+public let THIRTYDAYS: UInt = 30    // 10..30
+
 public let HTTPS = "https://"
 //public let DEMOBANK = HTTPS + "bAnK.dEmO.tAlEr.nEt"             // should be weird to read, but still work
 //public let DEMOEXCHANGE = HTTPS + "eXcHaNgE.dEmO.tAlEr.nEt"
diff --git a/TalerWallet1/Views/HelperViews/SelectDays.swift b/TalerWallet1/Views/HelperViews/SelectDays.swift
@@ -19,36 +19,48 @@ struct SelectDays: View {
     let maxExpiration: UInt
 
     func oneDayAction() -> Void {
-        selected = 1
+        selected = ONEDAY
         symLog.log(selected)
     }
 
     func sevenDayAction() -> Void {
-        selected = 7
+        selected = SEVENDAYS
         symLog.log(selected)
     }
 
     func thirtyDayAction() -> Void {
-        selected = 30
+        selected = THIRTYDAYS
         symLog.log(selected)
     }
 
     var body: some View {
         HStack {
             Button(action: oneDayAction) {
-                Text(developerMode ? "3 Min." : "1 Day")
-            }.buttonStyle(TalerButtonStyle(type: (selected == 1) ? .prominent : .bordered, dimmed: true))
+                if developerMode {
+                    Text(verbatim: "3 Min.")
+                } else {
+                    Text("\(ONEDAY) Day", comment: "1 Day, might get plural (e.g. 2..3 Days), 4 letters max., abbreviate if longer")     // TODO: Plural
+                }
+            }.buttonStyle(TalerButtonStyle(type: (selected == ONEDAY) ? .prominent : .bordered, dimmed: true))
                 .disabled(!isEnabled)
 
             Button(action: sevenDayAction) {
-                Text(developerMode ? "1 Hour" : "7 Days")
-            }.buttonStyle(TalerButtonStyle(type: (selected == 7) ? .prominent : .bordered, dimmed: true))
-                .disabled(!isEnabled || maxExpiration < 7)
+                if developerMode {
+                    Text(verbatim: "1 Hour")
+                } else {
+                    Text("\(SEVENDAYS) Days", comment: "7 Days, always plural (3..9), 4 letters max., abbreviate if longer")
+                }
+            }.buttonStyle(TalerButtonStyle(type: (selected == SEVENDAYS) ? .prominent : .bordered, dimmed: true))
+                .disabled(!isEnabled || maxExpiration < SEVENDAYS)
 
             Button(action: thirtyDayAction) {
-                Text(developerMode ? "1 Day" : "30 Days")
-            }.buttonStyle(TalerButtonStyle(type: (selected == 30) ? .prominent : .bordered, dimmed: true))
-                .disabled(!isEnabled || maxExpiration < 30)
+                if developerMode {
+                    Text(verbatim: "1 Day")
+                } else {
+                    Text("\(THIRTYDAYS) Days", comment: "30 Days, always plural (10..30), 4 letters max., abbreviate if longer")
+                }
+            }.buttonStyle(TalerButtonStyle(type: (selected == THIRTYDAYS) ? .prominent : .bordered, dimmed: true))
+                .disabled(!isEnabled || maxExpiration < THIRTYDAYS)
         } // 3 buttons
     }
 }
diff --git a/TalerWallet1/Views/Peer2peer/PaymentPurpose.swift b/TalerWallet1/Views/Peer2peer/PaymentPurpose.swift
@@ -58,7 +58,7 @@ struct PaymentPurpose: View {
                 Text("Expires in:")
                     .font(.title3)
 
-                SelectDays(selected: $expireDays, maxExpiration: 35)
+                SelectDays(selected: $expireDays, maxExpiration: THIRTYDAYS)
                     .disabled(false)
                     .padding(.bottom)
 
diff --git a/TalerWallet1/Views/Peer2peer/SendAmount.swift b/TalerWallet1/Views/Peer2peer/SendAmount.swift
@@ -17,7 +17,7 @@ struct SendAmount: View {
     @EnvironmentObject private var model: WalletModel
 
     @State var peerPushCheck: CheckPeerPushDebitResponse? = nil
-    @State private var expireDays: UInt = 0
+    @State private var expireDays: UInt = SEVENDAYS
 
     private func fee(ppCheck: CheckPeerPushDebitResponse?) -> String {
         do {
diff --git a/TalerWallet1/Views/Peer2peer/SendPurpose.swift b/TalerWallet1/Views/Peer2peer/SendPurpose.swift
@@ -58,7 +58,7 @@ struct SendPurpose: View {
                     .font(.title3)
 
                 // TODO: compute max Expiration day from peerPushCheck to disable 30 (and even 7)
-                SelectDays(selected: $expireDays, maxExpiration: 35)
+                SelectDays(selected: $expireDays, maxExpiration: THIRTYDAYS)
                     .disabled(false)
                     .padding(.bottom)