mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-02 11:12:23 -05: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

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,