Accessibility

6 files changed, 12 insertions, 3 deletions

diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
index ca0bd58..4a1b119 100644
--- a/TalerWallet1/Views/Balances/BalanceRowView.swift
+++ b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -93,6 +93,7 @@ struct BalanceRowView: View {
             let twoRowButtons = TwoRowButtons(stack: stack.push(),
                                           sendTitle: sendTitle,
                                           recvTitle: requTitle,
+                                           recvA11y: requTitle.tabbed(oneLine: true),
                                      fitsSideBySide: false,
                                           lineLimit: 5,
                                        sendDisabled: amount.isZero,
diff --git a/TalerWallet1/Views/Balances/TwoRowButtons.swift b/TalerWallet1/Views/Balances/TwoRowButtons.swift
index d9c0713..334f474 100644
--- a/TalerWallet1/Views/Balances/TwoRowButtons.swift
+++ b/TalerWallet1/Views/Balances/TwoRowButtons.swift
@@ -9,6 +9,7 @@ struct TwoRowButtons: View {
     let stack: CallStack
     let sendTitle: String
     let recvTitle: String
+    let recvA11y: String
     let fitsSideBySide: Bool
     let lineLimit: Int
     let sendDisabled: Bool
@@ -20,6 +21,7 @@ struct TwoRowButtons: View {
         TwoRowButtons(stack: stack.push(),
                   sendTitle: sendTitle,
                   recvTitle: recvTitle,
+                   recvA11y: recvA11y,
              fitsSideBySide: fitsSideBySide,
                   lineLimit: lineLimit,
                sendDisabled: sendDisabled,
@@ -40,9 +42,8 @@ struct TwoRowButtons: View {
                                           disabled: sendDisabled,
                                            aligned: .center))
             let recvButtonTitle = recvTitle.tabbed(oneLine: !fitsSideBySide)
-            let recvVoiceOverTitle = recvTitle.tabbed(oneLine: true)
             Button(recvButtonTitle, action: recvAction)
-                .accessibilityLabel(Text(recvVoiceOverTitle))
+                .accessibilityLabel(Text(recvA11y))
                 .lineLimit(lineLimit)
                 .disabled(false)
                 .buttonStyle(TalerButtonStyle(type: .bordered,
@@ -59,6 +60,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
             TwoRowButtons(stack: CallStack("Preview"),
                       sendTitle: "Send " + TESTCURRENCY,
                       recvTitle: "Request " + LONGCURRENCY,
+                       recvA11y: "Request " + LONGCURRENCY,
                  fitsSideBySide: false,
                       lineLimit: 2, sendDisabled: true,
                      sendAction: {}, recvAction: {})
@@ -66,6 +68,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
             TwoRowButtons(stack: CallStack("Preview"),
                       sendTitle: "Send " + DEMOCURRENCY,
                       recvTitle: "Request " + DEMOCURRENCY,
+                       recvA11y: "Request " + DEMOCURRENCY,
                  fitsSideBySide: true,
                       lineLimit: 2, sendDisabled: true,
                      sendAction: {}, recvAction: {})
diff --git a/TalerWallet1/Views/Banking/DepositWithdrawV.swift b/TalerWallet1/Views/Banking/DepositWithdrawV.swift
index d538360..d38b283 100644
--- a/TalerWallet1/Views/Banking/DepositWithdrawV.swift
+++ b/TalerWallet1/Views/Banking/DepositWithdrawV.swift
@@ -68,6 +68,7 @@ struct DepositWithdrawV: View {
         let twoRowButtons = TwoRowButtons(stack: stack.push(),
                                       sendTitle: minimalistic ? depositTitle0 : depositTitle1,
                                       recvTitle: minimalistic ? withdrawTitle0 : withdrawTitle1,
+                                       recvA11y: withdrawTitle1.tabbed(oneLine: true),
                                  fitsSideBySide: false,
                                       lineLimit: 5,
                                    sendDisabled: disableDeposit,
diff --git a/TalerWallet1/Views/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Banking/ManualWithdraw.swift
index 0499fc4..e8a0d13 100644
--- a/TalerWallet1/Views/Banking/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Banking/ManualWithdraw.swift
@@ -45,6 +45,9 @@ struct ManualWithdraw: View {
             let navTitle = String(localized: "NavTitle_Withdraw (currency)",
                                defaultValue: "Withdraw \(currencySymbol)",
                                     comment: "NavTitle: Withdraw 'currencySymbol'")
+            let navA11y = String(localized: "NavTitle_Withdraw (currency) A11y",
+                                 defaultValue: "Withdraw \(currency)",
+                                 comment: "NavTitle: Withdraw 'currency'")
 //          let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge: $selectedAge)
 
             let someCoins = SomeCoins(details: withdrawalAmountDetails)
diff --git a/TalerWallet1/Views/HelperViews/AmountV.swift b/TalerWallet1/Views/HelperViews/AmountV.swift
index 9e4b48a..f2bd5be 100644
--- a/TalerWallet1/Views/HelperViews/AmountV.swift
+++ b/TalerWallet1/Views/HelperViews/AmountV.swift
@@ -24,6 +24,7 @@ struct AmountV: View {
             .talerFont(large ? .title : .title2)
 //            .fontWeight(large ? .medium : .regular)       // @available(iOS 16.0, *)
             .monospacedDigit()
+            .accessibilityLabel(amount.readableDescription)
     }
 }
 extension AmountV {
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
index 7c06807..fe1d858 100644
--- a/TalerWallet1/Views/Transactions/ManualDetailsV.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -36,7 +36,7 @@ struct SegmentControl: View {
                     let amount = detail.transferAmount
                     let bankName = detail.bankLabel
                     let amountStr = amount?.readableDescription ?? ""
-                    let a11yLabel = bankName != nil ? (bankName! + amountStr) : amountStr
+                    let a11yLabel = bankName != nil ? (bankName! + " " + amountStr) : amountStr
                     VStack(spacing: 6) {
                         Text(amountStr)
                             .talerFont(.title3)