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

#308 Add new constructor for BarcodeImageWriterTask without associated TextView. Make barcode format selectable

Browse Source
This commit is contained in:
Sergio
2020-01-26 01:20:46 +01:00
parent 24061dae97
commit 72c1a57953
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
}
}
BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
{
this(imageView, cardIdString, barcodeFormat, null);
}
private int getMaxWidth(BarcodeFormat format)
{
switch(format)
@@ -194,8 +199,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
{
Log.i(TAG, "Barcode generation failed, removing image from display");
imageView.setVisibility(View.GONE);
if (textView != null)
if (textView != null) {
textView.setVisibility(View.GONE);
}
}
}
}

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

@@ -262,14 +262,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
}
Log.d(TAG, "ImageView size now known");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
});
}
else
{
Log.d(TAG, "ImageView size known known, creating barcode");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
showBarcode();

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

@@ -260,14 +260,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
Log.d(TAG, "ImageView size now known");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
});
}
else
{
Log.d(TAG, "ImageView size known known, creating barcode");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
}
else

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

@@ -377,6 +377,7 @@
android:layout_width="match_parent"
android:padding="@dimen/inputPadding"
android:textSize="@dimen/inputSize"
android:textIsSelectable="true"
android:layout_toEndOf="@id/barcodeTypeField"
android:layout_toRightOf="@id/barcodeTypeField"
/>