Merge pull request #39 from BlinkID/BlinkID/release/v3.8.0

Blink id/release/v3.8.0
BlinkID · May 17, 2017 · aa91608 · aa91608
2 parents 63a890e + 235aabd
commit aa91608
Show file tree

Hide file tree

Showing 53 changed files with 2,912 additions and 279 deletions.
diff --git a/BlinkIDDemo/BlinkIDCustomCombinedDemo/build.gradle b/BlinkIDDemo/BlinkIDCustomCombinedDemo/build.gradle
@@ -14,10 +14,16 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

diff --git a/BlinkIDDemo/BlinkIDDemo/build.gradle b/BlinkIDDemo/BlinkIDDemo/build.gradle
@@ -6,13 +6,16 @@ android {
 
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
         }
     }

diff --git a/BlinkIDDemo/BlinkIDDemo/proguard-project.txt b/BlinkIDDemo/BlinkIDDemo/proguard-project.txt
@@ -18,13 +18,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.microblink.** { *; }
-
--keepclassmembers class com.microblink.** {
-    *;
-}
-
--dontwarn android.hardware.**
-
--dontwarn android.support.v4.**
diff --git a/BlinkIDDemo/BlinkIDDemo/src/main/java/com/microblink/blinkid/MenuActivity.java b/BlinkIDDemo/BlinkIDDemo/src/main/java/com/microblink/blinkid/MenuActivity.java
@@ -43,6 +43,7 @@
 import com.microblink.recognizers.blinkid.eudl.EUDLCountry;
 import com.microblink.recognizers.blinkid.eudl.EUDLRecognizerSettings;
 import com.microblink.recognizers.blinkid.germany.back.GermanIDBackSideRecognizerSettings;
+import com.microblink.recognizers.blinkid.germany.combined.GermanIDCombinedRecognizerSettings;
 import com.microblink.recognizers.blinkid.germany.front.GermanIDFrontSideRecognizerSettings;
 import com.microblink.recognizers.blinkid.germany.old.front.GermanOldIDRecognizerSettings;
 import com.microblink.recognizers.blinkid.germany.passport.GermanPassportRecognizerSettings;
@@ -289,6 +290,7 @@ private void buildElements() {
         elements.add(buildChechIDCombinedElement());
         elements.add(buildGermanIDElement());
         elements.add(buildGermanPassportElement());
+        elements.add(buildGermanIDCombinedElement());
         elements.add(buildMyKadElement());
         elements.add(buildIKadElement());
         elements.add(bildRomanianElement());
@@ -507,6 +509,12 @@ private ListElement buildUsdlCombinedElement() {
         return new ListElement("US Driver's License combined", buildCombinedIntent(usdlCombined));
     }
 
+    private ListElement buildGermanIDCombinedElement() {
+        GermanIDCombinedRecognizerSettings deCombined = new GermanIDCombinedRecognizerSettings();
+
+        return new ListElement( "German ID combined", buildCombinedIntent( deCombined ) );
+    }
+
     private ListElement buildPDF417Element() {
         // prepare settings for PDF417 barcode recognizer
         Pdf417RecognizerSettings pdf417 = new Pdf417RecognizerSettings();

diff --git a/BlinkIDDemo/BlinkIDDemoCustomSegmentScan/build.gradle b/BlinkIDDemo/BlinkIDDemoCustomSegmentScan/build.gradle
@@ -5,17 +5,19 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId 'com.microblink.blinkid'
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
     lintOptions {
         checkReleaseBuilds false
     }
     buildTypes {
         release {
+            debuggable true
             minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-            signingConfig = debug.signingConfig
         }
     }
 }

diff --git a/BlinkIDDemo/BlinkIDDemoCustomSegmentScan/proguard-project.txt b/BlinkIDDemo/BlinkIDDemoCustomSegmentScan/proguard-project.txt
@@ -17,15 +17,4 @@
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
-
-
--keep class com.microblink.** { *; }
-
--keepclassmembers class com.microblink.** {
-    *;
-}
-
--dontwarn android.hardware.**
-
--dontwarn android.support.v4.**
+#}
diff --git a/BlinkIDDemo/BlinkIDDemoCustomUI/build.gradle b/BlinkIDDemo/BlinkIDDemoCustomUI/build.gradle
@@ -6,13 +6,16 @@ android {
 
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
         }
     }
@@ -26,5 +29,10 @@ dependencies {
     compile("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+
+    // uncomment this to use custom LibBlinkID build
+//    compile project(':LibBlinkID-release')
+//    compile "com.android.support:appcompat-v7:${rootProject.ext.appCompatVersion}"
+
     compile project(':LibResult')
 }
diff --git a/BlinkIDDemo/BlinkIDDemoCustomUI/proguard-project.txt b/BlinkIDDemo/BlinkIDDemoCustomUI/proguard-project.txt
@@ -18,13 +18,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.microblink.** { *; }
-
--keepclassmembers class com.microblink.** {
-    *;
-}
-
--dontwarn android.hardware.**
-
--dontwarn android.support.v4.**
diff --git a/BlinkIDDemo/BlinkIDDetectorDemo/build.gradle b/BlinkIDDemo/BlinkIDDetectorDemo/build.gradle
@@ -6,17 +6,23 @@ android {
 
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

diff --git a/BlinkIDDemo/BlinkIDDetectorDemo/proguard-rules.pro b/BlinkIDDemo/BlinkIDDetectorDemo/proguard-rules.pro
@@ -15,13 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.microblink.** { *; }
-
--keepclassmembers class com.microblink.** {
-    *;
-}
-
--dontwarn android.hardware.**
-
--dontwarn android.support.v4.**
diff --git a/BlinkIDDemo/BlinkIDDirectApiDemo/build.gradle b/BlinkIDDemo/BlinkIDDirectApiDemo/build.gradle
@@ -6,22 +6,33 @@ android {
 
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {
     compile("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+
+    // uncomment this to use custom LibBlinkID build
+//    compile project(':LibBlinkID-release')
+//    compile "com.android.support:appcompat-v7:${rootProject.ext.appCompatVersion}"
+
     compile project(':LibResult')
 }
diff --git a/BlinkIDDemo/BlinkIDImageListenerDemo/build.gradle b/BlinkIDDemo/BlinkIDImageListenerDemo/build.gradle
@@ -5,14 +5,17 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -25,5 +28,10 @@ dependencies {
     compile("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+
+    // uncomment this to use custom LibBlinkID build
+//    compile project(':LibBlinkID-release')
+//    compile "com.android.support:appcompat-v7:${rootProject.ext.appCompatVersion}"
+
     compile project(':LibResult')
 }
diff --git a/BlinkIDDemo/BlinkIDImageListenerDemo/proguard-rules.pro b/BlinkIDDemo/BlinkIDImageListenerDemo/proguard-rules.pro
@@ -15,13 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.microblink.** { *; }
-
--keepclassmembers class com.microblink.** {
-    *;
-}
-
--dontwarn android.hardware.**
-
--dontwarn android.support.v4.**
diff --git a/BlinkIDDemo/BlinkIDRandomScanDemo/build.gradle b/BlinkIDDemo/BlinkIDRandomScanDemo/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.microblink.blinkid"
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
 
@@ -16,9 +16,11 @@ android {
 
     buildTypes {
         release {
+            debuggable true
             minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig = debug.signingConfig
         }
     }
 }

diff --git a/BlinkIDDemo/LibBlinkID-release/build.gradle b/BlinkIDDemo/LibBlinkID-release/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('LibBlinkID-release.aar'))
diff --git a/BlinkIDDemo/LibResult/build.gradle b/BlinkIDDemo/LibResult/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 10
+        minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
@@ -22,4 +22,8 @@ dependencies {
     compile("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+
+    // uncomment this to use custom LibBlinkID build
+//    compile project(':LibBlinkID-release')
+//    compile "com.android.support:appcompat-v7:${rootProject.ext.appCompatVersion}"
 }
diff --git a/BlinkIDDemo/LibResult/src/main/java/com/microblink/libresult/ResultFragment.java b/BlinkIDDemo/LibResult/src/main/java/com/microblink/libresult/ResultFragment.java
@@ -32,6 +32,7 @@
 import com.microblink.libresult.extract.czechia.CzechIDFrontSideRecognitionResultExtractor;
 import com.microblink.libresult.extract.eudl.EUDLRecognitionResultExtractor;
 import com.microblink.libresult.extract.germany.GermanIDBackSideRecognitionResultExtractor;
+import com.microblink.libresult.extract.germany.GermanIDCombinedRecognitionResultExtractor;
 import com.microblink.libresult.extract.germany.GermanIDFrontSideRecognitionResultExtractor;
 import com.microblink.libresult.extract.germany.GermanOldIDRecognitionResultExtractor;
 import com.microblink.libresult.extract.germany.GermanPassportRecognitionResultExtractor;
@@ -70,6 +71,7 @@
 import com.microblink.recognizers.blinkid.czechia.front.CzechIDFrontSideRecognitionResult;
 import com.microblink.recognizers.blinkid.eudl.EUDLRecognitionResult;
 import com.microblink.recognizers.blinkid.germany.back.GermanIDBackSideRecognitionResult;
+import com.microblink.recognizers.blinkid.germany.combined.GermanIDCombinedRecognitionResult;
 import com.microblink.recognizers.blinkid.germany.front.GermanIDFrontSideRecognitionResult;
 import com.microblink.recognizers.blinkid.germany.old.front.GermanOldIDRecognitionResult;
 import com.microblink.recognizers.blinkid.germany.passport.GermanPassportRecognitionResult;
@@ -168,6 +170,8 @@ public void onCreate(Bundle savedInstanceState) {
             mResultExtractor = new GermanOldIDRecognitionResultExtractor(getActivity());
         } else if (mData instanceof GermanPassportRecognitionResult) {
             mResultExtractor = new GermanPassportRecognitionResultExtractor(getActivity());
+        } else if (mData instanceof GermanIDCombinedRecognitionResult) {
+            mResultExtractor = new GermanIDCombinedRecognitionResultExtractor(getActivity());
         } else if (mData instanceof RomanianIDFrontSideRecognitionResult) {
             mResultExtractor = new RomanianIDFrontSideRecognitionResultExtractor(getActivity());
         } else if (mData instanceof SlovakIDBackSideRecognitionResult) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		configurations.maybeCreate("default")
		artifacts.add("default", file('LibBlinkID-release.aar'))