Merge pull request #1702 from Adyen/feature/toolbar-accessibility

Improve toolbar accessibility

RELEASE_NOTES.md

@@ -10,3 +10,4 @@
 
 ## Improved
 - For UPI Intent an error message will be shown when "Continue" button is pressed without selecting any UPI option.
+- For drop-in, improved accessibility of back/close button in the navigation bar.

drop-in/src/main/res/template/values/strings.xml.tt

@@ -33,6 +33,9 @@
     <string name="checkout_rationale_message_storage_permission">%%storagePermission.rationaleMsg%%</string>
     <string name="checkout_stored_payment_confirmation_message">%%oneClick.confirmationAlert.title%%</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">%%cancelButton%%</string>
+    <string name="checkout_close">%%close%%</string>
+    <string name="checkout_back">%%backButton%%</string>
+
     <!-- Untranslatable strings -->
     <string name="checkout_negative_amount" translatable="false">- %s</string>
     <string name="last_four_digits_format" translatable="false">•••• %s</string>

drop-in/src/main/res/values-ar/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">من أجل حفظ هذه الصورة على جهازك، تحتاج إلى تمكين إذن التخزين</string>
     <string name="checkout_stored_payment_confirmation_message">تأكيد الدفع باستخدام %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">إلغاء</string>
+    <string name="checkout_close">إغلاق</string>
+    <string name="checkout_back">العودة</string>
+
 </resources>

drop-in/src/main/res/values-cs-rCZ/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Chcete-li tento obrázek uložit do vašeho zařízení, musíte povolit oprávnění k uložení</string>
     <string name="checkout_stored_payment_confirmation_message">Potvrdit platbu %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Zrušit</string>
+    <string name="checkout_close">Zavřít</string>
+    <string name="checkout_back">Zpět</string>
+
 </resources>

drop-in/src/main/res/values-da-rDK/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">For at kunne gemme dette billede på din enhed skal du aktivere lagringstilladelse</string>
     <string name="checkout_stored_payment_confirmation_message">Bekræft %s-betaling</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Annuller</string>
+    <string name="checkout_close">Luk</string>
+    <string name="checkout_back">Tilbage</string>
+
 </resources>

drop-in/src/main/res/values-de-rDE/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Um dieses Bild auf Ihrem Gerät zu speichern, müssen Sie uns Speicherberechtigung erteilen.</string>
     <string name="checkout_stored_payment_confirmation_message">Bestätige %s Zahlung</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Abbrechen</string>
+    <string name="checkout_close">Schließen</string>
+    <string name="checkout_back">Zurück</string>
+
 </resources>

drop-in/src/main/res/values-el-rGR/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Για να αποθηκεύσετε αυτήν την εικόνα στη συσκευή σας, πρέπει να εκχωρήσετε δικαίωμα για τον χώρο αποθήκευσης</string>
     <string name="checkout_stored_payment_confirmation_message">Επιβεβαίωση πληρωμής μέσω %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Άκυρο</string>
+    <string name="checkout_close">Κλείσιμο</string>
+    <string name="checkout_back">Πίσω</string>
+
 </resources>

drop-in/src/main/res/values-es-rES/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Para guardar esta imagen en su dispositivo, debe conceder permiso de almacenamiento</string>
     <string name="checkout_stored_payment_confirmation_message">Confirmar pago de %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Cancelar</string>
+    <string name="checkout_close">Cerrar</string>
+    <string name="checkout_back">Atrás</string>
+
 </resources>

drop-in/src/main/res/values-fi-rFI/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Sinun on otettava käyttöön tallennusoikeus tallentaaksesi tämän kuvan laitteeseesi</string>
     <string name="checkout_stored_payment_confirmation_message">Vahvista %s maksu</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Peruuta</string>
+    <string name="checkout_close">Sulje</string>
+    <string name="checkout_back">Takaisin</string>
+
 </resources>

drop-in/src/main/res/values-fr-rFR/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Pour enregistrer cette image sur votre appareil, vous devez activer l\'autorisation de stockage</string>
     <string name="checkout_stored_payment_confirmation_message">Confirmer paiement de %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Annuler</string>
+    <string name="checkout_close">Fermer</string>
+    <string name="checkout_back">Retour</string>
+
 </resources>

drop-in/src/main/res/values-hr-rHR/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Kako biste spremili ovu sliku na svoj uređaj, morate omogućiti dopuštenje za pohranu</string>
     <string name="checkout_stored_payment_confirmation_message">Potvrdite plaćanje: %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Otkaži</string>
+    <string name="checkout_close">Zatvori</string>
+    <string name="checkout_back">Natrag</string>
+
 </resources>

drop-in/src/main/res/values-hu-rHU/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Ahhoz, hogy a képet el tudja menteni a készülékére, hozzáférési engedélyt kell adnia a tárhelyhez</string>
     <string name="checkout_stored_payment_confirmation_message">%s használatával történő fizetés jóváhagyása</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Mégse</string>
+    <string name="checkout_close">Bezárás</string>
+    <string name="checkout_back">Vissza</string>
+
 </resources>

drop-in/src/main/res/values-it-rIT/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Per salvare l\'immagine sul tuo dispositivo, devi abilitare l\'autorizzazione all\'archiviazione</string>
     <string name="checkout_stored_payment_confirmation_message">Conferma il pagamento di %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Annulla</string>
+    <string name="checkout_close">Chiudi</string>
+    <string name="checkout_back">Indietro</string>
+
 </resources>

drop-in/src/main/res/values-ja-rJP/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">この画像をデバイスに保存するには、ストレージ権限を有効にする必要があります</string>
     <string name="checkout_stored_payment_confirmation_message">%sのお支払いをご確認下さい</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">キャンセル</string>
+    <string name="checkout_close">終了</string>
+    <string name="checkout_back">戻る</string>
+
 </resources>

drop-in/src/main/res/values-ko-rKR/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">이 이미지를 장치에 저장하려면 저장 권한을 활성화해야 합니다.</string>
     <string name="checkout_stored_payment_confirmation_message">%s 결제 확인</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">취소</string>
+    <string name="checkout_close">닫기</string>
+    <string name="checkout_back">뒤로</string>
+
 </resources>

drop-in/src/main/res/values-nb-rNO/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Du må aktivere lagringstillatelse for å kunne lagre dette bildet på enheten din</string>
     <string name="checkout_stored_payment_confirmation_message">Bekreft betaling med %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Avbryt</string>
+    <string name="checkout_close">Lukk</string>
+    <string name="checkout_back">Tilbake</string>
+
 </resources>

drop-in/src/main/res/values-nl-rNL/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Om deze afbeelding op te slaan op uw apparaat, moet u toestemming voor opslag inschakelen</string>
     <string name="checkout_stored_payment_confirmation_message">Bevestig %s betaling</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Annuleer</string>
+    <string name="checkout_close">Sluiten</string>
+    <string name="checkout_back">Terug</string>
+
 </resources>

drop-in/src/main/res/values-pl-rPL/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Aby zapisać ten obraz w urządzeniu, należy włączyć zezwolenie na przechowywanie</string>
     <string name="checkout_stored_payment_confirmation_message">Potwierdź płatność %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Anuluj</string>
+    <string name="checkout_close">Zamknij</string>
+    <string name="checkout_back">Wstecz</string>
+
 </resources>

drop-in/src/main/res/values-pt-rBR/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Para salvar esta imagem no seu dispositivo, habilite a permissão de armazenamento</string>
     <string name="checkout_stored_payment_confirmation_message">Confirmar pagamento %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Cancelar</string>
+    <string name="checkout_close">Fechar</string>
+    <string name="checkout_back">Voltar</string>
+
 </resources>

drop-in/src/main/res/values-pt-rPT/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Para guardar esta imagem no seu dispositivo, tem de ativar a permissão de armazenamento</string>
     <string name="checkout_stored_payment_confirmation_message">Confirmar %s pagamento</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Cancelar</string>
+    <string name="checkout_close">Fechar</string>
+    <string name="checkout_back">Voltar</string>
+
 </resources>

drop-in/src/main/res/values-ro-rRO/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Pentru a salva această imagine pe dispozitivul dvs., trebuie să activați permisiunea de stocare</string>
     <string name="checkout_stored_payment_confirmation_message">Confirmați plata %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Anulare</string>
+    <string name="checkout_close">Închidere</string>
+    <string name="checkout_back">Înapoi</string>
+
 </resources>

drop-in/src/main/res/values-ru-rRU/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Для сохранения данного изображения на устройстве необходимо предоставить на это разрешение</string>
     <string name="checkout_stored_payment_confirmation_message">Подтвердить оплату %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Отменить</string>
+    <string name="checkout_close">Закрыть</string>
+    <string name="checkout_back">Назад</string>
+
 </resources>

drop-in/src/main/res/values-sk-rSK/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Ak chcete tento obrázok uložiť do zariadenia, musíte zapnúť povolenie na ukladanie</string>
     <string name="checkout_stored_payment_confirmation_message">Potvrďte platbu pomocou %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Zrušiť</string>
+    <string name="checkout_close">Zavrieť</string>
+    <string name="checkout_back">Späť</string>
+
 </resources>

drop-in/src/main/res/values-sl-rSI/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">Če želite to sliko shraniti v napravo, morate omogočiti dovoljenje za shranjevanje</string>
     <string name="checkout_stored_payment_confirmation_message">Potrdite plačilo: %s</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Prekliči</string>
+    <string name="checkout_close">Zapri</string>
+    <string name="checkout_back">Nazaj</string>
+
 </resources>

drop-in/src/main/res/values-sv-rSE/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">För att kunna spara bilden på din enhet måste du aktivera lagringsbehörighet</string>
     <string name="checkout_stored_payment_confirmation_message">Bekräfta %s-betalning</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Avbryt</string>
+    <string name="checkout_close">Stäng</string>
+    <string name="checkout_back">Tillbaka</string>
+
 </resources>

drop-in/src/main/res/values-zh-rCN/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">要将此图片保存到设备，您需要启用存储权限</string>
     <string name="checkout_stored_payment_confirmation_message">确认 %s 支付</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">取消</string>
+    <string name="checkout_close">关闭</string>
+    <string name="checkout_back">返回</string>
+
 </resources>

drop-in/src/main/res/values-zh-rTW/strings.xml

@@ -33,4 +33,7 @@
     <string name="checkout_rationale_message_storage_permission">必須啟用儲存空間權限，才能將此影像儲存到您的裝置</string>
     <string name="checkout_stored_payment_confirmation_message">確認 %s 付款</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">取消</string>
+    <string name="checkout_close">關閉</string>
+    <string name="checkout_back">返回</string>
+
 </resources>

drop-in/src/main/res/values/strings.xml

@@ -33,6 +33,9 @@
     <string name="checkout_rationale_message_storage_permission">In order to save this image to your device, you need to enable storage permission</string>
     <string name="checkout_stored_payment_confirmation_message">Confirm %s payment</string>
     <string name="checkout_stored_payment_confirmation_cancel_button">Cancel</string>
+    <string name="checkout_close">Close</string>
+    <string name="checkout_back">Back</string>
+
     <!-- Untranslatable strings -->
     <string name="checkout_negative_amount" translatable="false">- %s</string>
     <string name="last_four_digits_format" translatable="false">•••• %s</string>

drop-in/src/main/res/values/styles.xml

@@ -12,26 +12,26 @@
     <style name="ThreeDS2Theme" parent="AdyenCheckout" tools:ignore="PrivateResource" />
 
     <style name="AdyenCheckout.BottomSheetToolbar">
-        <item name="android:layout_marginStart">@dimen/standard_half_margin</item>
-        <item name="android:layout_marginTop">@dimen/standard_margin</item>
-        <item name="android:layout_marginEnd">@dimen/standard_half_margin</item>
-        <item name="android:layout_marginBottom">@dimen/standard_half_margin</item>
     </style>
 
     <style name="AdyenCheckout.Toolbar" />
 
     <style name="AdyenCheckout.Toolbar.Navigation">
         <item name="android:tint">?attr/colorControlNormal</item>
-        <item name="android:paddingStart">@dimen/standard_half_margin</item>
-        <item name="android:paddingEnd">@dimen/standard_half_margin</item>
+        <item name="android:padding">@dimen/standard_margin</item>
+        <item name="android:minWidth">48dp</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
     <style name="AdyenCheckout.Toolbar.Navigation.Back" parent="AdyenCheckout.Toolbar.Navigation">
         <item name="srcCompat">@drawable/ic_back</item>
+        <item name="android:contentDescription">@string/checkout_back</item>
     </style>
 
     <style name="AdyenCheckout.Toolbar.Navigation.Close" parent="AdyenCheckout.Toolbar.Navigation">
         <item name="srcCompat">@drawable/ic_close</item>
+        <item name="android:contentDescription">@string/checkout_close</item>
     </style>
 
     <style name="AdyenCheckout.Toolbar.HeaderTitle">