mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-10 10:28:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix various small accessibility issues

Browse Source
This commit is contained in:
Sylvia van Os
2021-09-03 19:50:17 +02:00
parent 0ac0fad091
commit c4064a2ed1
31 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -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

11
app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
View File

@@ -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<Void, Void, Bitmap>
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<Void, Void, Bitmap>
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<Void, Void, Bitmap>
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<Void, Void, Bitmap>
if (textView != null) {
textView.setVisibility(View.VISIBLE);
textView.setText(format.name());
textView.setText(formatPrettyName);
}
}
else

4
app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
View File

@@ -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();
}

4
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -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();

1
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -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,

12
app/src/main/res/layout/barcode_selector_activity.xml
View File

@@ -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"/>
<TextView
android:id="@+id/aztecBarcodeText"
@@ -103,7 +102,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/code39Barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/code39BarcodeText"
@@ -124,7 +122,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/code128Barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/code128BarcodeText"
@@ -145,7 +142,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/codabarBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/codabarBarcodeText"
@@ -166,7 +162,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/datamatrixBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/datamatrixBarcodeText"
@@ -187,7 +182,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/ean8Barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/ean8BarcodeText"
@@ -208,7 +202,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/ean13Barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/ean13BarcodeText"
@@ -229,7 +222,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/itfBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/itfBarcodeText"
@@ -250,7 +242,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/pdf417Barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/pdf417BarcodeText"
@@ -271,7 +262,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/qrcodeBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/qrcodeBarcodeText"
@@ -292,7 +282,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/upcaBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/upcaBarcodeText"
@@ -313,7 +302,6 @@
android:layout_height="@dimen/barcode_disp_height"
android:layout_gravity="center_horizontal"
android:id="@+id/upceBarcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
<TextView
android:id="@+id/upceBarcodeText"

1
app/src/main/res/layout/loyalty_card_edit_activity.xml
View File

@@ -313,7 +313,6 @@
android:padding="10.0dp"
android:background="#ffffff"
android:id="@+id/barcode"
android:contentDescription="@string/barcodeImageDescription"
android:layout_weight="1.0"/>
</LinearLayout>

4
app/src/main/res/layout/loyalty_card_view_layout.xml
View File

@@ -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"/>
<ImageButton
android:id="@+id/minimizeButton"
@@ -148,6 +147,7 @@
android:layout_height="80dp"
android:layout_gravity="top|start"
android:scaleType="fitCenter"
android:contentDescription="@string/toggleMoreInfo"
app:tint="#ffffff"
app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />

1
app/src/main/res/values-bg/strings.xml
View File

@@ -28,7 +28,6 @@
<string name="frontImageDescription">Снимка на предната страна на карта</string>
<string name="backImageDescription">Снимка на задната страна на карта</string>
<string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
<string name="barcodeImageDescription">Изображение на щрихкода на картата</string>
<string name="no">Не</string>
<string name="yes">Да</string>
<string name="setBackImage">Снимка на задната страна</string>

1
app/src/main/res/values-cs/strings.xml
View File

@@ -16,7 +16,6 @@
<string name="editCardTitle">Editovat věrnostní kartu</string>
<string name="addCardTitle">Přidat věrnostní kartu</string>
<string name="scanCardBarcode">Skenování Čárový Kód Karty</string>
<string name="barcodeImageDescription">Obrázek čárového kódu karty</string>
<string name="noStoreError">Zadáno žádné jméno</string>
<string name="noCardIdError">Žádné ID karty zadáno</string>
<string name="importExport">Import/Export</string>

1
app/src/main/res/values-de/strings.xml
View File

@@ -24,7 +24,6 @@
<string name="scanCardBarcode">Barcode scannen</string>
<string name="cardShortcut">Shortcut zu einer Karte</string>
<string name="noCardsMessage">Füge zuerst eine Karte hinzu</string>
<string name="barcodeImageDescription">Bild des Barcodes</string>
<string name="noStoreError">Kein Name eingegeben</string>
<string name="noCardIdError">Keine Kartennummer angegeben</string>
<string name="noCardExistsError">Karte konnte nicht gefunden werden</string>

1
app/src/main/res/values-el-rGR/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
<string name="cardShortcut">Συντόμευση Κάρτας</string>
<string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
<string name="barcodeImageDescription">Εικόνα του barcode της κάρτας</string>
<string name="noStoreError">Δεν δώσατε κατάστημα</string>
<string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
<string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>

1
app/src/main/res/values-eo/strings.xml
View File

@@ -72,7 +72,6 @@
<string name="noCardExistsError">Ne eblis trovi karto</string>
<string name="noCardIdError">Neniu karto ID eniris</string>
<string name="noStoreError">Neniu eniris nomo</string>
<string name="barcodeImageDescription">Bildo de barcode card</string>
<string name="noCardsMessage">Aldoni karto unua</string>
<string name="cardShortcut">Karto Mallongirejo</string>
<string name="scanCardBarcode">Scintigrafio Barcode Card</string>

1
app/src/main/res/values-es/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="scanCardBarcode">Escanear código de barras de la tarjeta</string>
<string name="cardShortcut">Atajo de tarjeta</string>
<string name="noCardsMessage">Añada una tarjeta primero</string>
<string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
<string name="noStoreError">No se proporcionó ningún nombre</string>
<string name="noCardIdError">Id. de tarjeta no especificado</string>
<string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>

1
app/src/main/res/values-fi/strings.xml
View File

@@ -117,7 +117,6 @@
<string name="noCardExistsError">Korttia ei löytynyt</string>
<string name="noCardIdError">Kortin ID-tunnusta ei annettu</string>
<string name="noStoreError">Nimeä ei annettu</string>
<string name="barcodeImageDescription">Kuva kortin viivakoodista</string>
<string name="card_ids_copied">Kopioidut korttitunnukset</string>
<string name="noCardsMessage">Lisää ensin kortti</string>
<string name="cardShortcut">Kortin pikakuvake</string>

1
app/src/main/res/values-fr/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="scanCardBarcode">Scanner le code-barres</string>
<string name="cardShortcut">Raccourci de carte</string>
<string name="noCardsMessage">Ajoutez d\'abord une carte</string>
<string name="barcodeImageDescription">Image du code-barres</string>
<string name="noStoreError">Aucun nom saisi</string>
<string name="noCardIdError">Aucun numéro de carte saisi</string>
<string name="noCardExistsError">Aucune carte trouvée</string>

1
app/src/main/res/values-it/strings.xml
View File

@@ -24,7 +24,6 @@
<string name="scanCardBarcode">Scansiona il codice carta</string>
<string name="cardShortcut">Scorciatoia per la carta</string>
<string name="noCardsMessage">Aggiungi prima una carta</string>
<string name="barcodeImageDescription">Immagine del codice della carta</string>
<string name="noStoreError">Nessun nome inserito</string>
<string name="noCardIdError">Nessun codice carta inserito</string>
<string name="noCardExistsError">Impossibile trovare la carta</string>

1
app/src/main/res/values-ja/strings.xml
View File

@@ -110,7 +110,6 @@
<string name="noCardExistsError">カードが見つかりません</string>
<string name="noCardIdError">カード番号が入力されていません</string>
<string name="noStoreError">名前が入力されていません</string>
<string name="barcodeImageDescription">バーコードの画像</string>
<string name="noCardsMessage">カードを追加</string>
<string name="cardShortcut">カードのショートカット</string>
<string name="scanCardBarcode">カードのバーコードをスキャン</string>

1
app/src/main/res/values-ko/strings.xml
View File

@@ -63,7 +63,6 @@
<string name="importFailedTitle">가져오기 실패</string>
<string name="importSuccessfulTitle">가져오기 완료</string>
<string name="noCardIdError">카드 ID를 입력하지 않음</string>
<string name="barcodeImageDescription">카드 바코드 이미지</string>
<string name="storeName">매장</string>
<string name="thumbnailDescription">카드 섬네일</string>
<string name="importOptionApplicationButton">외부 앱 사용</string>

1
app/src/main/res/values-lt/strings.xml
View File

@@ -15,7 +15,6 @@
<string name="editCardTitle">Redaguoti lojalumo kortelę</string>
<string name="addCardTitle">Pridėti lojalumo kortelę</string>
<string name="scanCardBarcode">Skenuoti kortelės brūkšninį kodą</string>
<string name="barcodeImageDescription">Kortelės brūkšninio kodo vaizdas</string>
<string name="noStoreError">Neįvestas pavadinimas</string>
<string name="noCardIdError">Neįvestas kortelės ID</string>
<string name="importExport">Importuoti/Exportuoti</string>

1
app/src/main/res/values-nb-rNO/strings.xml
View File

@@ -21,7 +21,6 @@
<string name="scanCardBarcode">Skann kortets strekkode</string>
<string name="cardShortcut">Kort-snarvei</string>
<string name="noCardsMessage">Legg til et kort først</string>
<string name="barcodeImageDescription">Bilde av kortets strekkode</string>
<string name="noStoreError">Navn ikke angitt</string>
<string name="noCardIdError">Ingen kort-ID innskrevet</string>
<string name="noCardExistsError">Kunne ikke finne kort</string>

1
app/src/main/res/values-nl/strings.xml
View File

@@ -25,7 +25,6 @@
<string name="scanCardBarcode">Scan de barcode van de kaart</string>
<string name="cardShortcut">Kaartsnelkoppeling</string>
<string name="noCardsMessage">Voeg eerst een kaart toe</string>
<string name="barcodeImageDescription">Afbeelding van barcode</string>
<string name="noStoreError">Geen naam ingevoerd</string>
<string name="noCardIdError">Geen kaartnummer ingevoerd</string>
<string name="noCardExistsError">De kaart is niet aangetroffen</string>

1
app/src/main/res/values-oc/strings.xml
View File

@@ -14,7 +14,6 @@
<string name="noCardExistsError">Cap de carta pas trobada</string>
<string name="noCardIdError">Cap de numèro de carta pas picat</string>
<string name="noStoreError">Cap de nom pas picat</string>
<string name="barcodeImageDescription">Imatge del còdi de barras</string>
<string name="card_ids_copied">Num. de la carta copiada</string>
<string name="noCardsMessage">Apondètz d’en primièr una carta</string>
<string name="cardShortcut">Acorchi de carta</string>

1
app/src/main/res/values-pl/strings.xml
View File

@@ -24,7 +24,6 @@
<string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
<string name="cardShortcut">Skrót karty</string>
<string name="noCardsMessage">Najpierw dodaj kartę</string>
<string name="barcodeImageDescription">Obraz kodu kreskowego karty</string>
<string name="noStoreError">Nie wprowadzono nazwy</string>
<string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
<string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>

1
app/src/main/res/values-ru/strings.xml
View File

@@ -25,7 +25,6 @@
<string name="scanCardBarcode">Отсканируйте штрих-код</string>
<string name="cardShortcut">Ярлык карты</string>
<string name="noCardsMessage">Сначала добавьте карту</string>
<string name="barcodeImageDescription">Изображение штрих-кода карты</string>
<string name="noStoreError">Название не указано</string>
<string name="noCardIdError">Номер карты не указан</string>
<string name="noCardExistsError">Карта не найдена</string>

1
app/src/main/res/values-sk/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
<string name="cardShortcut">Skratka</string>
<string name="noCardsMessage">Nie sú uložené žiadne karty, vložte prvú</string>
<string name="barcodeImageDescription">Obrázok čiarového kódu karty</string>
<string name="noStoreError">Nebol zadaný obchod</string>
<string name="noCardIdError">Nebolo zadané ID karty</string>
<string name="noCardExistsError">Nie je možné vyhľadať vernostnú kartu</string>

1
app/src/main/res/values-sl/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="scanCardBarcode">Skeniraj črtno kodo</string>
<string name="cardShortcut">Bližnjica do kartice</string>
<string name="noCardsMessage">Najprej dodajte kartico</string>
<string name="barcodeImageDescription">Slika črtne kode na kartici</string>
<string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
<string name="noCardIdError">Številka kartice ni bila vnešena</string>
<string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>

1
app/src/main/res/values-sv/strings.xml
View File

@@ -15,7 +15,6 @@
<string name="errorReadingImage">Kunde inte läsa bilden</string>
<string name="currency">Valuta</string>
<string name="failedGeneratingShareURL">Kunde inte skapa en delningsbar URL. Var snäll och rapportera detta.</string>
<string name="barcodeImageDescription">Bild av kortets streckkod</string>
<string name="card_ids_copied">Kopierade kort ID:n</string>
<plurals name="selectedCardCount">
<item quantity="one"><xliff:g>%d</xliff:g> kort valt</item>

1
app/src/main/res/values-uk/strings.xml
View File

@@ -7,7 +7,6 @@
<string name="settings_display_barcode_max_brightness">Яскравіший штрих-код</string>
<string name="enterBarcodeInstructions">Введіть ID карти та оберіть тип штрих-коду чи \"Ця карта не має штрих-коду\".</string>
<string name="selectBarcodeTitle">Оберіть штрих-код</string>
<string name="barcodeImageDescription">Зображення штрих-коду карти</string>
<string name="scanCardBarcode">Відсканувати штрих-код карти</string>
<string name="noBarcode">Без штрих-коду</string>
<string name="barcodeNoBarcode">Ця карта не має штрих-коду</string>

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -15,7 +15,6 @@
<string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
<string name="importOptionApplicationButton">使用其他应用</string>
<string name="importOptionFilesystemButton">从文件系统</string>
<string name="barcodeImageDescription">卡片二维码图像</string>
<string name="unstar">从收藏中删除</string>
<string name="intent_import_card_from_url_share_multiple_text">我想和你分享一些卡片</string>
<string name="copy_to_clipboard_multiple_toast">已将卡号复制到剪贴板</string>

3
app/src/main/res/values/strings.xml
View File

@@ -56,7 +56,7 @@
<string name="noCardsMessage">Add a card first</string>
<string name="card_ids_copied">Copied Card ID(s)</string>
<string name="barcodeImageDescription">Image of card barcode</string>
<string name="barcodeImageDescriptionWithType">Image of card barcode of type <xliff:g>%s</xliff:g></string>
<string name="noStoreError">No name entered</string>
<string name="noCardIdError">No card ID entered</string>
@@ -240,4 +240,5 @@
<string name="settings_key_brown_theme" translatable="false">brown_theme</string>
<string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
<string name="toggleMoreInfo">Toggle showing more info</string>
</resources>