taler-ios

commit e309b6b91dce6f4362cbc2dfc7a27f4ac2521690
parent bcc52d9066ffda6af313b4b85a20c516715105fe
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 20 May 2024 08:04:13 +0200

make announce() passable in closures

Diffstat:
M
TalerWallet1/Views/Banking/DepositAmountV.swift
 | 
4
++--
M
TalerWallet1/Views/Banking/ExchangeListView.swift
 | 
2
+-
M
TalerWallet1/Views/HelperViews/SubjectInputV.swift
 | 
2
+-
M
TalerWallet1/Views/HelperViews/View+fitsSideBySide.swift
 | 
2
+-
M
TalerWallet1/Views/Peer2peer/SendAmount.swift
 | 
4
++--

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/TalerWallet1/Views/Banking/DepositAmountV.swift b/TalerWallet1/Views/Banking/DepositAmountV.swift
@@ -157,7 +157,7 @@ struct DepositAmountV: View {
                     }
 
                     if insufficient {
-                        announce(this: "\(amountVoiceOver), \(insufficientLabel2)")
+                        announce("\(amountVoiceOver), \(insufficientLabel2)")
                         feeStr = EMPTYSTRING
                     }
                 }
@@ -171,7 +171,7 @@ struct DepositAmountV: View {
                             if let feeAmount = fee(ppCheck: prepareDepositResult) {
                                 feeStr = feeAmount.string(currencyInfo)
                             } else { feeStr = EMPTYSTRING }
-                            announce(this: "\(amountVoiceOver), \(feeLabel)")
+                            announce("\(amountVoiceOver), \(feeLabel)")
                         } else {
                             prepareDepositResult = nil
                         }
diff --git a/TalerWallet1/Views/Banking/ExchangeListView.swift b/TalerWallet1/Views/Banking/ExchangeListView.swift
@@ -26,7 +26,7 @@ struct ExchangeListView: View {
             symLog.log("adding: \(exchange)")
             if let _ = try? await model.addExchange(url: exchange) {
                 symLog.log("added: \(exchange)")
-                announce(this: "added: \(exchange)")
+                announce("added: \(exchange)")
             }
         }
     }
diff --git a/TalerWallet1/Views/HelperViews/SubjectInputV.swift b/TalerWallet1/Views/HelperViews/SubjectInputV.swift
@@ -48,7 +48,7 @@ struct SubjectInputV<TargetView: View>: View {
                     feeStr = feeAmount.string(currencyInfo)
                 } else { feeStr = EMPTYSTRING }
                 let amountVoiceOver = amount.string(currencyInfo)
-                announce(this: "\(amountVoiceOver), \(feeLabel)")
+                announce("\(amountVoiceOver), \(feeLabel)")
                 preparePayResult = ppCheck
             }
         }
diff --git a/TalerWallet1/Views/HelperViews/View+fitsSideBySide.swift b/TalerWallet1/Views/HelperViews/View+fitsSideBySide.swift
@@ -7,7 +7,7 @@ import UIKit
 
 extension View {
     @MainActor
-    public func announce(this: String) {
+    public func announce(_ this: String) {
         if UIAccessibility.isVoiceOverRunning {
             UIAccessibility.post(notification: .announcement, argument: this)
         }
diff --git a/TalerWallet1/Views/Peer2peer/SendAmount.swift b/TalerWallet1/Views/Peer2peer/SendAmount.swift
@@ -144,7 +144,7 @@ struct SendAmount: View {
             }
 
             if insufficient {
-                announce(this: "\(amountVoiceOver), \(insufficientLabel2)")
+                announce("\(amountVoiceOver), \(insufficientLabel2)")
             } else if amountToTransfer.isZero {
                 feeStr = EMPTYSTRING
             } else {
@@ -155,7 +155,7 @@ struct SendAmount: View {
                     if let feeAmount = fee(ppCheck: peerPushCheck) {
                         feeStr = feeAmount.string(currencyInfo)
                     } else { feeStr = EMPTYSTRING }
-                    announce(this: "\(amountVoiceOver), \(feeLabel)")
+                    announce("\(amountVoiceOver), \(feeLabel)")
                 } else {
                     peerPushCheck = nil
                 }