taler-ios

commit 1b2a9c70b0a729f1c3878abe12fa44889abbdc09
parent 2276b6e7fcc052ac84616141c999d232149ae0b9
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 15 Apr 2024 20:52:01 +0200

improve a11y

Diffstat:
M
TalerWallet1/Views/Balances/BalanceRowView.swift
 | 
1
+
M
TalerWallet1/Views/Balances/TwoRowButtons.swift
 | 
7
+++++--
M
TalerWallet1/Views/Banking/DepositWithdrawV.swift
 | 
1
+

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -92,6 +92,7 @@ struct BalanceRowView: View {
             let requTitle = minimalistic ? requestTitle0 : requestTitle1
             let twoRowButtons = TwoRowButtons(stack: stack.push(),
                                           sendTitle: sendTitle,
+                                           sendA11y: sendTitle.tabbed(oneLine: true),
                                           recvTitle: requTitle,
                                            recvA11y: requTitle.tabbed(oneLine: true),
                                      fitsSideBySide: false,
diff --git a/TalerWallet1/Views/Balances/TwoRowButtons.swift b/TalerWallet1/Views/Balances/TwoRowButtons.swift
@@ -8,6 +8,7 @@ import taler_swift
 struct TwoRowButtons: View {
     let stack: CallStack
     let sendTitle: String
+    let sendA11y: String
     let recvTitle: String
     let recvA11y: String
     let fitsSideBySide: Bool
@@ -20,6 +21,7 @@ struct TwoRowButtons: View {
     func makeCopy(fitsSideBySide: Bool) -> TwoRowButtons {
         TwoRowButtons(stack: stack.push(),
                   sendTitle: sendTitle,
+                   sendA11y: sendA11y,
                   recvTitle: recvTitle,
                    recvA11y: recvA11y,
              fitsSideBySide: fitsSideBySide,
@@ -32,9 +34,8 @@ struct TwoRowButtons: View {
     var body: some View {
         Group {
             let sendButtonTitle = sendTitle.tabbed(oneLine: !fitsSideBySide)
-            let sendVoiceOverTitle = sendTitle.tabbed(oneLine: true)
             Button(sendButtonTitle, action: sendAction)
-                .accessibilityLabel(Text(sendVoiceOverTitle))
+                .accessibilityLabel(Text(sendA11y))
                 .lineLimit(lineLimit)
                 .disabled(sendDisabled)
                 .buttonStyle(TalerButtonStyle(type: .bordered,
@@ -59,6 +60,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
         List {
             TwoRowButtons(stack: CallStack("Preview"),
                       sendTitle: "Send " + TESTCURRENCY,
+                       sendA11y: "Send " + TESTCURRENCY,
                       recvTitle: "Request " + LONGCURRENCY,
                        recvA11y: "Request " + LONGCURRENCY,
                  fitsSideBySide: false,
@@ -67,6 +69,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
                 .listRowSeparator(.hidden)
             TwoRowButtons(stack: CallStack("Preview"),
                       sendTitle: "Send " + DEMOCURRENCY,
+                       sendA11y: "Send " + DEMOCURRENCY,
                       recvTitle: "Request " + DEMOCURRENCY,
                        recvA11y: "Request " + DEMOCURRENCY,
                  fitsSideBySide: true,
diff --git a/TalerWallet1/Views/Banking/DepositWithdrawV.swift b/TalerWallet1/Views/Banking/DepositWithdrawV.swift
@@ -67,6 +67,7 @@ struct DepositWithdrawV: View {
         let disableDeposit = amountAvailable?.isZero ?? false
         let twoRowButtons = TwoRowButtons(stack: stack.push(),
                                       sendTitle: minimalistic ? depositTitle0 : depositTitle1,
+                                       sendA11y: depositTitle1.tabbed(oneLine: true),
                                       recvTitle: minimalistic ? withdrawTitle0 : withdrawTitle1,
                                        recvA11y: withdrawTitle1.tabbed(oneLine: true),
                                  fitsSideBySide: false,