Merge pull request #44 from PDF417/release/7.1.0

Release/7.1.0

Pdf417MobiSample/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
     }
 }
 
@@ -23,8 +23,8 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    pdf417MobiVersion = '7.0.0'
+    pdf417MobiVersion = '7.1.0'
     compileSdkVersion = 26
     targetSdkVersion = 26
-    buildToolsVersion = '26.0.2'
+    buildToolsVersion = '27.0.3'
 }

Pdf417MobiSample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

Pdf417MobiSample/pdf417MobiCustomUISample/src/main/java/mobi/pdf417/demo/CustomUIScanActivity.java

@@ -6,6 +6,7 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -32,10 +33,11 @@
 import com.microblink.util.CameraPermissionManager;
 import com.microblink.view.CameraAspectMode;
 import com.microblink.view.CameraEventsListener;
+import com.microblink.view.NonLandscapeOrientationNotSupportedException;
 import com.microblink.view.OrientationAllowedListener;
 import com.microblink.view.recognition.RecognizerRunnerView;
 import com.microblink.view.recognition.ScanResultListener;
-import com.microblink.view.viewfinder.PointSetView;
+import com.microblink.view.viewfinder.points.PointSetView;
 import com.microblink.view.viewfinder.quadview.QuadViewManager;
 import com.microblink.view.viewfinder.quadview.QuadViewManagerFactory;
 import com.microblink.view.viewfinder.quadview.QuadViewPreset;
@@ -69,7 +71,13 @@ public class CustomUIScanActivity extends Activity implements View.OnClickListen
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_custom_ui_scan);
+        try {
+            setContentView(R.layout.activity_custom_ui_scan);
+        } catch (NonLandscapeOrientationNotSupportedException exception) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            recreate();
+            return;
+        }
 
         mRecognizerRunnerView = findViewById(R.id.recognizer_runner_view);
 

Pdf417MobiSample/pdf417MobiCustomUISample/src/main/java/mobi/pdf417/demo/MainActivity.java

@@ -53,8 +53,8 @@ private BarcodeOverlayController createRecognizerAndOverlay() {
         // You have to enable recognizers and barcode types you want to support
         // Don't enable what you don't need, it will significantly decrease scanning performance
         mBarcodeRecognizer = new BarcodeRecognizer();
-        mBarcodeRecognizer.setScanPDF417(true);
-        mBarcodeRecognizer.setScanQRCode(true);
+        mBarcodeRecognizer.setScanPdf417(true);
+        mBarcodeRecognizer.setScanQrCode(true);
 
         mRecognizerBundle = new RecognizerBundle(mBarcodeRecognizer);
 
@@ -186,7 +186,7 @@ private void openScanResultInBrowser(BarcodeRecognizer.Result result) {
     }
 
     private void shareScanResult(BarcodeRecognizer.Result result) {
-        StringBuilder sb = new StringBuilder(result.getBarcodeFormat().name());
+        StringBuilder sb = new StringBuilder(result.getBarcodeType().name());
         sb.append("\n\n");
 
         if (result.isUncertain()) {

Pdf417MobiSample/pdf417MobiDirectAPISample/src/main/java/com/microblink/barcode/MenuActivity.java

@@ -68,8 +68,8 @@ private void initRecognizer() {
         // You have to enable recognizers and barcode types you want to support
         // Don't enable what you don't need, it will significantly decrease scanning performance
         mBarcodeRecognizer = new BarcodeRecognizer();
-        mBarcodeRecognizer.setScanPDF417(true);
-        mBarcodeRecognizer.setScanQRCode(true);
+        mBarcodeRecognizer.setScanPdf417(true);
+        mBarcodeRecognizer.setScanQrCode(true);
 
         mRecognizerBundle = new RecognizerBundle(mBarcodeRecognizer);
     }
@@ -100,7 +100,7 @@ private void startCameraActivity(Class targetActivity) {
     }
 
     public void showResults(BarcodeRecognizer.Result result) {
-        StringBuilder sb = new StringBuilder(result.getBarcodeFormat().name());
+        StringBuilder sb = new StringBuilder(result.getBarcodeType().name());
         sb.append("\n\n");
         if (result.isUncertain()) {
             sb.append("\nThis scan data is uncertain!\n\nString data:\n");

Pdf417MobiSample/pdf417MobiSample/src/main/java/mobi/pdf417/demo/Pdf417MobiDemoActivity.java

@@ -41,8 +41,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // You have to enable recognizers and barcode types you want to support
         // Don't enable what you don't need, it will significantly decrease scanning performance
         mBarcodeRecognizer = new BarcodeRecognizer();
-        mBarcodeRecognizer.setScanPDF417(true);
-        mBarcodeRecognizer.setScanQRCode(true);
+        mBarcodeRecognizer.setScanPdf417(true);
+        mBarcodeRecognizer.setScanQrCode(true);
 
         mRecognizerBundle = new RecognizerBundle(mBarcodeRecognizer);
     }
@@ -82,7 +82,7 @@ private void openScanResultInBrowser(BarcodeRecognizer.Result result) {
     }
 
     private void shareScanResult(BarcodeRecognizer.Result result) {
-        StringBuilder sb = new StringBuilder(result.getBarcodeFormat().name());
+        StringBuilder sb = new StringBuilder(result.getBarcodeType().name());
         sb.append("\n\n");
 
         if (result.isUncertain()) {