taler-ios

commit f7f015c5fcc4448762436e00b6fcd45357a0a69b
parent 8475ec0956e195fbe8b08d74511f099901d2482a
Author: Marc Stibane <marc@taler.net>
Date:   Wed, 21 Feb 2024 13:35:12 +0100

Accessibility: don't automatically show keyboard when VoiceOver is on

Diffstat:
M
TalerWallet1/Views/Banking/DepositIbanV.swift
 | 
10
++++++----
M
TalerWallet1/Views/HelperViews/CurrencyInputView.swift
 | 
2
+-
M
TalerWallet1/Views/HelperViews/SubjectInputV.swift
 | 
10
++++++----
M
TalerWallet1/Views/Peer2peer/P2PSubjectV.swift
 | 
12
+++++++-----

4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/TalerWallet1/Views/Banking/DepositIbanV.swift b/TalerWallet1/Views/Banking/DepositIbanV.swift
@@ -85,10 +85,12 @@ struct DepositIbanV: View {
                 .textFieldStyle(.roundedBorder)
                 .padding(minimalistic ? .bottom : .vertical)
                 .onAppear {
-                    symLog.log("dispatching kbd...")
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
-                        isFocused = true        // make first responder - raise keybord
-                        symLog.log("...kbd isFocused")
+                    if !UIAccessibility.isVoiceOverRunning {
+                        symLog.log("dispatching kbd...")
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
+                            isFocused = true        // make first responder - raise keybord
+                            symLog.log("...kbd isFocused")
+                        }
                     }
                 }
 
diff --git a/TalerWallet1/Views/HelperViews/CurrencyInputView.swift b/TalerWallet1/Views/HelperViews/CurrencyInputView.swift
@@ -145,7 +145,7 @@ struct CurrencyInputView: View {
         }.onAppear {   // make CurrencyField show the keyboard after 0.4 seconds
             if hasBeenShown {
 //                print("❗️Yikes: CurrencyInputView hasBeenShown")
-            } else {
+            } else if !UIAccessibility.isVoiceOverRunning {
                 print("❗️CurrencyInputView❗️")
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
                     hasBeenShown = true
diff --git a/TalerWallet1/Views/HelperViews/SubjectInputV.swift b/TalerWallet1/Views/HelperViews/SubjectInputV.swift
@@ -92,10 +92,12 @@ struct SubjectInputV<TargetView: View>: View {
             .background(WalletColors().fieldBackground)
             .textFieldStyle(.roundedBorder)
             .onAppear {
-                symLog.log("dispatching kbd...")
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
-                    isFocused = true        // make first responder - raise keybord
-                    symLog.log("...kbd isFocused")
+                if !UIAccessibility.isVoiceOverRunning {
+                    symLog.log("dispatching kbd...")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
+                        isFocused = true        // make first responder - raise keybord
+                        symLog.log("...kbd isFocused")
+                    }
                 }
             }
 
diff --git a/TalerWallet1/Views/Peer2peer/P2PSubjectV.swift b/TalerWallet1/Views/Peer2peer/P2PSubjectV.swift
@@ -19,7 +19,7 @@ struct P2PSubjectV: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
     let feeLabel: String?
-    let feeIsNotZero: Bool?            // nil = no fees at all, false = no fee for this tx
+    let feeIsNotZero: Bool?             // nil = no fees at all, false = no fee for this tx
     let currencyInfo: CurrencyInfo
     let amountToSend: Bool
     @Binding var amountToTransfer: Amount
@@ -89,10 +89,12 @@ struct P2PSubjectV: View {
                     .background(WalletColors().fieldBackground)
                     .textFieldStyle(.roundedBorder)
                     .onAppear {
-                        symLog.log("dispatching kbd...")
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
-                            isFocused = true        // make first responder - raise keybord
-                            symLog.log("...kbd isFocused")
+                        if !UIAccessibility.isVoiceOverRunning {
+                            symLog.log("dispatching kbd...")
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
+                                isFocused = true        // make first responder - raise keybord
+                                symLog.log("...kbd isFocused")
+                            }
                         }
                     }
                 Text(verbatim: "\(summary.count)/100")                          // maximum 100 characters