diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 1b57605ea..4101b4d8a 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -388,7 +388,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity barcodeTypeField.setTag(null); } else { try { - barcodeTypeField.setTag(BarcodeFormat.valueOf(s.toString())); + BarcodeFormat barcodeFormat = BarcodeFormat.valueOf(s.toString()); + + barcodeTypeField.setTag(barcodeFormat); + + if (!BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) { + Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show(); + } } catch (IllegalArgumentException e) {} } diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 9fe6d63d2..f84a1ecdc 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -387,7 +387,15 @@ public class LoyaltyCardViewActivity extends AppCompatActivity // Set shadow colour of store text so even same color on same color would be readable storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE); - if(format != null) + Boolean isBarcodeSupported = true; + + if (format != null && !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(format.name())) { + isBarcodeSupported = false; + + Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show(); + } + + if(format != null && isBarcodeSupported) { if (!barcodeIsFullscreen) { maximizeButton.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d35a9eb9..d6537c1d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -171,4 +171,5 @@ Barcode value Same as card ID Set barcode value + We cannot currently display this barcode type. We hope to add support in a newer version of the app.