mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-01 06:11:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into fix/white_on_white_icons

Browse Source
This commit is contained in:
Sylvia van Os
2019-12-15 21:36:56 +01:00
parent 280fe76609 8a3b623ea6
commit 1f348295a0
11 changed files with 216 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
public Bitmap doInBackground(Void... params)
{
if (cardId.isEmpty())
{
return null;
}
MultiFormatWriter writer = new MultiFormatWriter();
BitMatrix bitMatrix;
try

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

@@ -116,6 +116,10 @@ public class BarcodeSelectorActivity extends AppCompatActivity
ImageView image = findViewById(barcodeViewMap.get(key));
createBarcodeOption(image, key, s.toString());
}
View noBarcodeButtonView = findViewById(R.id.noBarcode);
setButtonListener(noBarcodeButtonView, s.toString());
noBarcodeButtonView.setEnabled(s.length() > 0);
}
@Override
@@ -134,6 +138,21 @@ public class BarcodeSelectorActivity extends AppCompatActivity
}
}
private void setButtonListener(final View button, final String cardId)
{
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.d(TAG, "Selected no barcode");
Intent result = new Intent();
result.putExtra(BARCODE_FORMAT, "");
result.putExtra(BARCODE_CONTENTS, cardId);
BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
finish();
}
});
}
private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
{
final BarcodeFormat format = BarcodeFormat.valueOf(formatType);

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

@@ -131,10 +131,6 @@ public class CsvDatabaseImporter implements DatabaseImporter
}
String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
if(barcodeType.isEmpty())
{
throw new FormatException("No barcode type listed, but is required");
}
Integer headerColor = null;
Integer headerTextColor = null;

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

@@ -370,7 +370,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
return;
}
if(cardId.isEmpty() || barcodeType.isEmpty())
if(cardId.isEmpty())
{
Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
return;
@@ -480,7 +480,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
}
if(contents != null && contents.isEmpty() == false &&
format != null && format.isEmpty() == false)
format != null)
{
Log.i(TAG, "Read barcode id: " + contents);
Log.i(TAG, "Read format: " + format);

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

@@ -142,7 +142,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
}
String formatString = loyaltyCard.barcodeType;
final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
final BarcodeFormat format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
final String cardIdString = loyaltyCard.cardId;
cardIdFieldView.setText(loyaltyCard.cardId);
@@ -197,37 +197,44 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
}
if(barcodeImage.getHeight() == 0)
if(format != null)
{
Log.d(TAG, "ImageView size is not known known at start, waiting for load");
// The size of the ImageView is not yet available as it has not
// yet been drawn. Wait for it to be drawn so the size is available.
barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
new ViewTreeObserver.OnGlobalLayoutListener()
{
@Override
public void onGlobalLayout()
findViewById(R.id.barcode).setVisibility(View.VISIBLE);
if(barcodeImage.getHeight() == 0)
{
Log.d(TAG, "ImageView size is not known known at start, waiting for load");
// The size of the ImageView is not yet available as it has not
// yet been drawn. Wait for it to be drawn so the size is available.
barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
new ViewTreeObserver.OnGlobalLayoutListener()
{
if (Build.VERSION.SDK_INT < 16)
@Override
public void onGlobalLayout()
{
barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
}
else
{
barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
if (Build.VERSION.SDK_INT < 16)
{
barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
}
else
{
barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
Log.d(TAG, "ImageView size now known");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
});
Log.d(TAG, "ImageView size now known");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
});
}
else
{
Log.d(TAG, "ImageView size known known, creating barcode");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
}
}
else
{
Log.d(TAG, "ImageView size known known, creating barcode");
new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
findViewById(R.id.barcode).setVisibility(View.GONE);
}
}
@Override
@@ -307,4 +314,4 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
}
}
}
}