From c4064a2ed1bd9006035bfcb60af7e92f196f8219 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 3 Sep 2021 19:50:17 +0200 Subject: [PATCH] Fix various small accessibility issues --- CHANGELOG.md | 4 ++++ .../protect/card_locker/BarcodeImageWriterTask.java | 11 +++++++++-- .../protect/card_locker/BarcodeSelectorActivity.java | 4 ++-- .../protect/card_locker/LoyaltyCardEditActivity.java | 4 ++-- .../protect/card_locker/LoyaltyCardViewActivity.java | 1 + .../main/res/layout/barcode_selector_activity.xml | 12 ------------ .../main/res/layout/loyalty_card_edit_activity.xml | 1 - app/src/main/res/layout/loyalty_card_view_layout.xml | 4 ++-- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el-rGR/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-oc/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 3 ++- 31 files changed, 22 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e6f4ac60..be3295711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased - 82 (2021-09-03) + +- Improved support for screen readers + ## v2.4.0 - 81 (2021-08-29) - Improve card list for landscape and tablet display diff --git a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java index 39d13c4a2..622b053e6 100644 --- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java +++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java @@ -1,5 +1,6 @@ package protect.card_locker; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.PorterDuff; @@ -26,6 +27,7 @@ class BarcodeImageWriterTask extends AsyncTask private static final String TAG = "Catima"; private static final int IS_VALID = 999; + private Context mContext; private boolean isSuccesful; // When drawn in a smaller window 1D barcodes for some reason end up @@ -42,10 +44,12 @@ class BarcodeImageWriterTask extends AsyncTask private final boolean showFallback; private final Runnable callback; - BarcodeImageWriterTask(ImageView imageView, String cardIdString, + BarcodeImageWriterTask(Context context, ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat, TextView textView, boolean showFallback, Runnable callback) { + mContext = context; + isSuccesful = true; this.callback = callback; @@ -243,9 +247,12 @@ class BarcodeImageWriterTask extends AsyncTask return; } + String formatPrettyName = format.name().replace("_", " "); + imageView.setTag(isSuccesful); imageView.setImageBitmap(result); + imageView.setContentDescription(mContext.getString(R.string.barcodeImageDescriptionWithType, formatPrettyName)); TextView textView = textViewReference.get(); if(result != null) @@ -261,7 +268,7 @@ class BarcodeImageWriterTask extends AsyncTask if (textView != null) { textView.setVisibility(View.VISIBLE); - textView.setText(format.name()); + textView.setText(formatPrettyName); } } else diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java index 3d2c9c668..942de9d81 100644 --- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java +++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java @@ -194,7 +194,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity image.getViewTreeObserver().removeOnGlobalLayoutListener(this); Log.d(TAG, "Generating barcode for type " + formatType); - BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null); + BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null); barcodeGeneratorTasks.add(task); task.execute(); } @@ -203,7 +203,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity else { Log.d(TAG, "Generating barcode for type " + formatType); - BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null); + BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null); barcodeGeneratorTasks.add(task); task.execute(); } diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index b0ace1710..0c7befd0b 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -1144,12 +1144,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this); Log.d(TAG, "ImageView size now known"); - new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute(); + new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute(); } }); } else { Log.d(TAG, "ImageView size known known, creating barcode"); - new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute(); + new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute(); } showBarcode(); diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 774e32780..bd291e99c 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -659,6 +659,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity Log.d(TAG, "ImageView size now known"); new BarcodeImageWriterTask( + getApplicationContext(), barcodeImage, barcodeIdString != null ? barcodeIdString : cardIdString, format, diff --git a/app/src/main/res/layout/barcode_selector_activity.xml b/app/src/main/res/layout/barcode_selector_activity.xml index d2c258844..83d280398 100644 --- a/app/src/main/res/layout/barcode_selector_activity.xml +++ b/app/src/main/res/layout/barcode_selector_activity.xml @@ -82,7 +82,6 @@ android:layout_height="@dimen/barcode_disp_height" android:layout_gravity="center_horizontal" android:id="@+id/aztecBarcode" - android:contentDescription="@string/barcodeImageDescription" android:layout_weight="1.0"/> diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml index 96061fa53..571eb4918 100644 --- a/app/src/main/res/layout/loyalty_card_view_layout.xml +++ b/app/src/main/res/layout/loyalty_card_view_layout.xml @@ -71,8 +71,7 @@ app:layout_constraintBottom_toTopOf="@+id/centerGuideline" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/maximizeButton" - android:contentDescription="@string/barcodeImageDescription"/> + app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 800ad356e..fa37f8992 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -28,7 +28,6 @@ Снимка на предната страна на карта Снимка на задната страна на карта %s не изглежда истинска наличност. - Изображение на щрихкода на картата Не Да Снимка на задната страна diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c8b4bb94e..2e34851e6 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -16,7 +16,6 @@ Editovat věrnostní kartu Přidat věrnostní kartu Skenování Čárový Kód Karty - Obrázek čárového kódu karty Zadáno žádné jméno Žádné ID karty zadáno Import/Export diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f79668924..1e6e0997d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -24,7 +24,6 @@ Barcode scannen Shortcut zu einer Karte Füge zuerst eine Karte hinzu - Bild des Barcodes Kein Name eingegeben Keine Kartennummer angegeben Karte konnte nicht gefunden werden diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 5f3ddf1c0..34295aa50 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -20,7 +20,6 @@ Σαρώστε τον κωδικό της κάρτας Συντόμευση Κάρτας Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα - Εικόνα του barcode της κάρτας Δεν δώσατε κατάστημα Δεν δώσατε κωδικό κάρτας Δεν ήταν δυνατό να εντοπιστεί κάρτα diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index fd7553d60..08b1b8ed1 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -72,7 +72,6 @@ Ne eblis trovi karto Neniu karto ID eniris Neniu eniris nomo - Bildo de barcode card Aldoni karto unua Karto Mallongirejo Scintigrafio Barcode Card diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5c912c1a0..7651b0dae 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -20,7 +20,6 @@ Escanear código de barras de la tarjeta Atajo de tarjeta Añada una tarjeta primero - Imagen del código de barras de la tarjeta No se proporcionó ningún nombre Id. de tarjeta no especificado No se ha podido encontrar la tarjeta diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index d566934a3..28590e201 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -117,7 +117,6 @@ Korttia ei löytynyt Kortin ID-tunnusta ei annettu Nimeä ei annettu - Kuva kortin viivakoodista Kopioidut korttitunnukset Lisää ensin kortti Kortin pikakuvake diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aff1fb3fa..ea2aa2c6a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -20,7 +20,6 @@ Scanner le code-barres Raccourci de carte Ajoutez d\'abord une carte - Image du code-barres Aucun nom saisi Aucun numéro de carte saisi Aucune carte trouvée diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 415f1dcae..5a6829048 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -24,7 +24,6 @@ Scansiona il codice carta Scorciatoia per la carta Aggiungi prima una carta - Immagine del codice della carta Nessun nome inserito Nessun codice carta inserito Impossibile trovare la carta diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 112daf683..44a50aa11 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -110,7 +110,6 @@ カードが見つかりません カード番号が入力されていません 名前が入力されていません - バーコードの画像 カードを追加 カードのショートカット カードのバーコードをスキャン diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8709ccd17..5b2a49fa5 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -63,7 +63,6 @@ 가져오기 실패 가져오기 완료 카드 ID를 입력하지 않음 - 카드 바코드 이미지 매장 카드 섬네일 외부 앱 사용 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 63ca2f993..b63011388 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -15,7 +15,6 @@ Redaguoti lojalumo kortelę Pridėti lojalumo kortelę Skenuoti kortelės brūkšninį kodą - Kortelės brūkšninio kodo vaizdas Neįvestas pavadinimas Neįvestas kortelės ID Importuoti/Exportuoti diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index de942b084..88f7f21bf 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -21,7 +21,6 @@ Skann kortets strekkode Kort-snarvei Legg til et kort først - Bilde av kortets strekkode Navn ikke angitt Ingen kort-ID innskrevet Kunne ikke finne kort diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0623ea867..a092be5ea 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -25,7 +25,6 @@ Scan de barcode van de kaart Kaartsnelkoppeling Voeg eerst een kaart toe - Afbeelding van barcode Geen naam ingevoerd Geen kaartnummer ingevoerd De kaart is niet aangetroffen diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 4e1dcf7bc..478044d5e 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -14,7 +14,6 @@ Cap de carta pas trobada Cap de numèro de carta pas picat Cap de nom pas picat - Imatge del còdi de barras Num. de la carta copiada Apondètz d’en primièr una carta Acorchi de carta diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 34cb22621..e7db30e27 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -24,7 +24,6 @@ Zeskanuj kod kreskowy karty lojalnościowej Skrót karty Najpierw dodaj kartę - Obraz kodu kreskowego karty Nie wprowadzono nazwy Nie wprowadzono identyfikatora karty Nie można wyszukać karty lojalnościowej diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e5256dd57..883a6755e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -25,7 +25,6 @@ Отсканируйте штрих-код Ярлык карты Сначала добавьте карту - Изображение штрих-кода карты Название не указано Номер карты не указан Карта не найдена diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 093efca22..286fc6d2c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -20,7 +20,6 @@ Zosnímajte čiarový kód na karte Skratka Nie sú uložené žiadne karty, vložte prvú - Obrázok čiarového kódu karty Nebol zadaný obchod Nebolo zadané ID karty Nie je možné vyhľadať vernostnú kartu diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index aec6a7643..8a0944a57 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -20,7 +20,6 @@ Skeniraj črtno kodo Bližnjica do kartice Najprej dodajte kartico - Slika črtne kode na kartici Ime trgovine ni bilo vnešeno Številka kartice ni bila vnešena Te kartice zvestobe ni bilo moč najti diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 45c9174d7..f1fd53124 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -15,7 +15,6 @@ Kunde inte läsa bilden Valuta Kunde inte skapa en delningsbar URL. Var snäll och rapportera detta. - Bild av kortets streckkod Kopierade kort ID:n %d kort valt diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index db1a5ce68..6c0567e74 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -7,7 +7,6 @@ Яскравіший штрих-код Введіть ID карти та оберіть тип штрих-коду чи \"Ця карта не має штрих-коду\". Оберіть штрих-код - Зображення штрих-коду карти Відсканувати штрих-код карти Без штрих-коду Ця карта не має штрих-коду diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c1647be41..64bb4bf4b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -15,7 +15,6 @@ Copyright © 2019–%d Sylvia van Os. 使用其他应用 从文件系统 - 卡片二维码图像 从收藏中删除 我想和你分享一些卡片 已将卡号复制到剪贴板 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dae6f959e..6b97d2d89 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,7 +56,7 @@ Add a card first Copied Card ID(s) - Image of card barcode + Image of card barcode of type %s No name entered No card ID entered @@ -240,4 +240,5 @@ brown_theme Made possible by: %s + Toggle showing more info