Merge pull request #253 from TheLastProject/feature/upce

Add UPC-E support

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 Changes:
 
+- Add UPC-E support
 - Support adding a front and back photo to each card
 - Fix useless whitespace in notes from Fidme import
 

app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java

@@ -133,6 +133,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                 return "1003";
             case UPC_A:
                 return "123456789012";
+            case UPC_E:
+                return "0123456";
             default:
                 throw new IllegalArgumentException("No fallback known for this barcode type");
         }

app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java

@@ -58,7 +58,8 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.ITF.name(),
                 BarcodeFormat.PDF_417.name(),
                 BarcodeFormat.QR_CODE.name(),
-                BarcodeFormat.UPC_A.name()
+                BarcodeFormat.UPC_A.name(),
+                BarcodeFormat.UPC_E.name()
         ));
 
     private Map<String, Pair<Integer, Integer>> barcodeViewMap;
@@ -90,6 +91,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
                 .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
                 .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
+                .put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText))
                 .build();
 
         EditText cardId = findViewById(R.id.cardId);

app/src/main/res/layout/barcode_selector_activity.xml

@@ -304,6 +304,27 @@
                     android:textStyle="bold"
                     android:layout_weight="1.0" />
             </LinearLayout>
+            <LinearLayout android:orientation="vertical"
+                android:padding="10.0dp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/barcode_disp_height"
+                    android:layout_gravity="center_horizontal"
+                    android:id="@+id/upceBarcode"
+                    android:contentDescription="@string/barcodeImageDescription"
+                    android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/upceBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>