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

Consistent barcode naming

Browse Source
This commit is contained in:
Sylvia van Os
2021-09-10 00:49:06 +02:00
parent 61b1317fc5
commit 6f1dc74f66
20 changed files with 226 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,14 +38,14 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
private final WeakReference<ImageView> imageViewReference;
private final WeakReference<TextView> textViewReference;
private String cardId;
private final BarcodeFormat format;
private final CatimaBarcode format;
private final int imageHeight;
private final int imageWidth;
private final boolean showFallback;
private final Runnable callback;
BarcodeImageWriterTask(Context context, ImageView imageView, String cardIdString,
BarcodeFormat barcodeFormat, TextView textView,
CatimaBarcode barcodeFormat, TextView textView,
boolean showFallback, Runnable callback)
{
mContext = context;
@@ -78,9 +78,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
this.showFallback = showFallback;
}
private int getMaxWidth(BarcodeFormat format)
private int getMaxWidth(CatimaBarcode format)
{
switch(format)
switch(format.format())
{
// 2D barcodes
case AZTEC:
@@ -108,9 +108,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
}
}
private String getFallbackString(BarcodeFormat format)
private String getFallbackString(CatimaBarcode format)
{
switch(format)
switch(format.format())
{
// 2D barcodes
case AZTEC:
@@ -157,7 +157,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
{
try
{
bitMatrix = writer.encode(cardId, format, imageWidth, imageHeight, null);
bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
}
catch(Exception e)
{
@@ -247,7 +247,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
return;
}
String formatPrettyName = format.name().replace("_", " ");
String formatPrettyName = format.prettyName();
imageView.setTag(isSuccesful);