Merge pull request #35 from PDF417/feature/v7.0.0

Feature/v7.0.0

.travis.yml

@@ -5,8 +5,8 @@ sudo: false
 android:
     components:
         - tools
-        - build-tools-25.0.2
-        - android-25
+        - build-tools-26.0.2
+        - android-26
         - extra-android-m2repository
 script:
     - cd Pdf417MobiDemo

Pdf417MobiDemo/build.gradle

@@ -2,15 +2,19 @@
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        mavenCentral()
+        google()
         maven { url 'http://maven.microblink.com' }
 //        mavenLocal()
     }
@@ -19,8 +23,8 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    pdf417MobiVersion = '6.4.0'
-    compileSdkVersion = 25
-    targetSdkVersion = 25
-    buildToolsVersion = '25.0.2'
+    pdf417MobiVersion = '7.0.0'
+    compileSdkVersion = 26
+    targetSdkVersion = 26
+    buildToolsVersion = '26.0.2'
 }

Pdf417MobiDemo/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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

Pdf417MobiDemo/pdf417MobiDemo/build.gradle

@@ -8,12 +8,15 @@ android {
         applicationId "com.microblink.barcode"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 20
     }
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-project.txt'
+            signingConfig = debug.signingConfig
         }
     }
 
@@ -42,7 +45,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:pdf417.mobi:${rootProject.ext.pdf417MobiVersion}@aar") {
+    implementation ("com.microblink:pdf417.mobi:${rootProject.ext.pdf417MobiVersion}@aar") {
         transitive = true
     }
 }

Pdf417MobiDemo/pdf417MobiDemo/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="mobi.pdf417.demo"
-    android:versionCode="16"
-    android:versionName="3.1.1" >
+    android:versionName="4.0.0" >
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
@@ -13,6 +12,7 @@
     <uses-feature android:name="android.hardware.camera.flash" android:required="false" />
 
     <application
+        android:name=".Pdf417MobiDemoApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.microblink.activity.Pdf417ScanActivity"
+            android:name="com.microblink.activity.BarcodeScanActivity"
             tools:replace="android:theme"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
             android:screenOrientation="portrait" >

Pdf417MobiDemo/pdf417MobiDemo/src/main/java/mobi/pdf417/demo/Pdf417MobiDemoApp.java

@@ -0,0 +1,21 @@
+package mobi.pdf417.demo;
+
+import android.app.Application;
+
+import com.microblink.MicroblinkSDK;
+import com.microblink.intent.IntentDataTransferMode;
+
+public final class Pdf417MobiDemoApp extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        // obtain your licence at http://microblink.com/login or
+        // contact us at http://help.microblink.com
+        MicroblinkSDK.setLicenseFile("com.microblink.barcode.mblic", this);
+
+        // use optimised way for transferring RecognizerBundle between activities, while ensuring
+        // data does not get lost when Android restarts the scanning activity
+        MicroblinkSDK.setIntentDataTransferMode(IntentDataTransferMode.PERSISTED_OPTIMISED);
+    }
+}

Pdf417MobiDemo/pdf417MobiDemoCustomUI/build.gradle

@@ -12,8 +12,10 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-project.txt'
+            signingConfig = debug.signingConfig
         }
     }
 
@@ -42,7 +44,7 @@ android {
 }
 
 dependencies {
-    compile ("com.microblink:pdf417.mobi:${rootProject.ext.pdf417MobiVersion}@aar") {
+    implementation ("com.microblink:pdf417.mobi:${rootProject.ext.pdf417MobiVersion}@aar") {
         transitive = true
     }
 }

Pdf417MobiDemo/pdf417MobiDemoCustomUI/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
     </uses-feature>
 
     <application
+        android:name="mobi.pdf417.demo.CustomUIDemo"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
@@ -35,7 +36,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.microblink.activity.Pdf417ScanActivity"
+            android:name="com.microblink.activity.BarcodeScanActivity"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
             android:screenOrientation="portrait">
         </activity>

Pdf417MobiDemo/pdf417MobiDemoCustomUI/src/main/java/mobi/pdf417/demo/CustomUIDemo.java

@@ -0,0 +1,21 @@
+package mobi.pdf417.demo;
+
+import android.app.Application;
+
+import com.microblink.MicroblinkSDK;
+import com.microblink.intent.IntentDataTransferMode;
+
+public final class CustomUIDemo extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        // obtain your licence at http://microblink.com/login or
+        // contact us at http://help.microblink.com
+        MicroblinkSDK.setLicenseFile("com.microblink.barcode.mblic", this);
+
+        // use optimised way for transferring RecognizerBundle between activities, while ensuring
+        // data does not get lost when Android restarts the scanning activity
+        MicroblinkSDK.setIntentDataTransferMode(IntentDataTransferMode.PERSISTED_OPTIMISED);
+    }
+}