add support for pdf417

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.50.0]
+
+### Added
+- Added support for scanning and displaying PDF_417 codes
+
 ## [0.49.3]
 
 ### Fixed 

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.49.3'
+        sdkVersion='0.50.0'
         versionCode=1
 
         compileSdkVersion=31

core/src/main/java/io/snabble/sdk/BarcodeFormat.java

@@ -7,7 +7,8 @@ public enum BarcodeFormat {
     EAN_13,
     ITF_14,
     QR_CODE,
-    DATA_MATRIX;
+    DATA_MATRIX,
+    PDF_417;
 
     public static BarcodeFormat parse(String str) {
         switch (str) {
@@ -23,6 +24,8 @@ public static BarcodeFormat parse(String str) {
                 return ITF_14;
             case "datamatrix":
                 return DATA_MATRIX;
+            case "pdf417":
+                return PDF_417;
             case "qr":
             case "qrCode":
                 return QR_CODE;

firebase-detector/src/main/java/io/snabble/sdk/firebase/FirebaseBarcodeHelper.java

@@ -20,6 +20,8 @@ public static int toFirebaseFormat(BarcodeFormat barcodeFormat) {
                 return Barcode.FORMAT_ITF;
             case DATA_MATRIX:
                 return Barcode.FORMAT_DATA_MATRIX;
+            case PDF_417:
+                return Barcode.FORMAT_PDF417;
             case QR_CODE:
                 return Barcode.FORMAT_QR_CODE;
         }
@@ -42,6 +44,8 @@ public static BarcodeFormat fromFirebaseFormat(int firebaseVisionBarcode) {
                 return BarcodeFormat.ITF_14;
             case Barcode.FORMAT_DATA_MATRIX:
                 return BarcodeFormat.DATA_MATRIX;
+            case Barcode.FORMAT_PDF417:
+                return BarcodeFormat.PDF_417;
             case Barcode.FORMAT_QR_CODE:
                 return BarcodeFormat.QR_CODE;
         }

sample/src/main/res/layout/fragment_home.xml

@@ -7,6 +7,7 @@
         android:layout_height="wrap_content"
         android:padding="4dp"
         android:orientation="vertical">
+
         <Spinner
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

ui/src/main/java/io/snabble/sdk/ui/scanner/BarcodeView.java

@@ -171,10 +171,21 @@ private void generate() {
 
                         BitMatrix bm = writer.encode(text, ZXingHelper.toZXingFormat(format), tw, th);
                         int[] pixels = new int[w * h];
-
-                        // DATA-MATRIX codes are not scaled
+                        
+                        int[] rect = bm.getEnclosingRectangle();
+                        int left = rect[0];
+                        int top = rect[1];
+                        int right = left + rect[2];
+                        int bottom = top + rect[3];
+
+                        int startX = left - dp2px(8);
+                        int startY = top - dp2px(8);
+                        int endX = right + dp2px(8);
+                        int endY = bottom + dp2px(8);
+                        
+                        // DATA-MATRIX and PDF_417 codes are not scaled
                         // See https://github.com/zxing/zxing/issues/836
-                        if (format == BarcodeFormat.DATA_MATRIX) {
+                        if (format == BarcodeFormat.DATA_MATRIX || format == BarcodeFormat.PDF_417) {
                             float dw = (float)tw / (float)bm.getWidth();
                             float dh = (float)th / (float)bm.getHeight();
 
@@ -184,24 +195,18 @@ private void generate() {
 
                                 for (int x = 0; x < tw; x++) {
                                     int ax = (int)((float)x/dw);
-                                    pixels[x + stride] = bm.get(ax, ay) ? Color.BLACK : backgroundColor;
+                                    int bgColor = backgroundColor;
+
+                                    if (ax > startX && ay > startY && ax < endX && ay < endY) {
+                                        bgColor = Color.WHITE;
+                                    }
+
+                                    pixels[x + stride] = bm.get(ax, ay) ? Color.BLACK : bgColor;
                                 }
                             }
                         } else {
-                            int[] rect = bm.getEnclosingRectangle();
-                            int left = rect[0];
-                            int top = rect[1];
-                            int right = left + rect[2];
-                            int bottom = top + rect[3];
-
-                            int startX = left - dp2px(8);
-                            int startY = top - dp2px(8);
-                            int endX = right + dp2px(8);
-                            int endY = bottom + dp2px(8);
-
                             for (int y = 0; y < th; y++) {
                                 final int stride = y * tw;
-
                                 for (int x = 0; x < tw; x++) {
                                     int bgColor = backgroundColor;
 

ui/src/main/java/io/snabble/sdk/ui/scanner/ZXingHelper.java

@@ -17,6 +17,8 @@ public static com.google.zxing.BarcodeFormat toZXingFormat(BarcodeFormat barcode
                 return com.google.zxing.BarcodeFormat.ITF;
             case DATA_MATRIX:
                 return com.google.zxing.BarcodeFormat.DATA_MATRIX;
+            case PDF_417:
+                return com.google.zxing.BarcodeFormat.PDF_417;
             case QR_CODE:
                 return com.google.zxing.BarcodeFormat.QR_CODE;
         }
@@ -38,6 +40,8 @@ public static BarcodeFormat fromZXingFormat(com.google.zxing.BarcodeFormat barco
                 return BarcodeFormat.ITF_14;
             case DATA_MATRIX:
                 return BarcodeFormat.DATA_MATRIX;
+            case PDF_417:
+                return BarcodeFormat.PDF_417;
             case QR_CODE:
                 return BarcodeFormat.QR_CODE;
         }