mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-13 03:48:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from brarcher/barcode-rendering

Browse Source 
Barcode rendering improvements
This commit is contained in:
Branden Archer
2018-02-18 23:24:52 -05:00
committed by GitHub
parent 057c7923a8 3291185812
commit af3ce5a0ff
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@@ -36,7 +36,6 @@
android:name=".LoyaltyCardViewActivity"
android:theme="@style/AppTheme.NoActionBar"
android:label=""
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden"
android:exported="true"/>
<activity

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

@@ -21,7 +21,11 @@ import java.lang.ref.WeakReference;
class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
{
private static final String TAG = "LoyaltyCardLocker";
private static final int MAX_WIDTH = 500;
// When drawn in a smaller window 1D barcodes for some reason end up
// squished, whereas 2D barcodes look fine.
private static final int MAX_WIDTH_1D = 1500;
private static final int MAX_WIDTH_2D = 500;
private final WeakReference<ImageView> imageViewReference;
private final String cardId;
@@ -38,6 +42,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
cardId = cardIdString;
format = barcodeFormat;
final int MAX_WIDTH = getMaxWidth(format);
if(imageView.getWidth() < MAX_WIDTH)
{
imageHeight = imageView.getHeight();
@@ -52,6 +58,36 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
}
}
private int getMaxWidth(BarcodeFormat format)
{
switch(format)
{
// 2D barcodes
case AZTEC:
case DATA_MATRIX:
case MAXICODE:
case PDF_417:
case QR_CODE:
return MAX_WIDTH_2D;
// 1D barcodes:
case CODABAR:
case CODE_39:
case CODE_93:
case CODE_128:
case EAN_8:
case EAN_13:
case ITF:
case UPC_A:
case UPC_E:
case RSS_14:
case RSS_EXPANDED:
case UPC_EAN_EXTENSION:
default:
return MAX_WIDTH_1D;
}
}
public Bitmap doInBackground(Void... params)
{
MultiFormatWriter writer = new MultiFormatWriter();