Merge pull request #181 from BlinkID/release/v5.0.0

Release/v5.0.0
BlinkID · Oct 15, 2019 · c76754b · c76754b
2 parents 37a16ed + 8e2e31c
commit c76754b
Show file tree

Hide file tree

Showing 858 changed files with 6,840 additions and 255,778 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,10 +14,7 @@ script:
     - ./gradlew clean :BlinkID_AllRecognizersSample:assembleRelease
     - ./gradlew clean :BlinkID-CustomUISample:assembleRelease
     - ./gradlew clean :BlinkID-DirectApiSample:assembleRelease
-    - ./gradlew clean :BlinkID-CustomFieldByFieldScanSample:assembleRelease
-    - ./gradlew clean :BlinkID-DetectorSample:assembleRelease
     - ./gradlew clean :BlinkID-ImagesSample:assembleRelease
     - ./gradlew clean :BlinkID-CustomCombinedSample:assembleRelease
-    - ./gradlew clean :BlinkID-TemplatingSample:assembleRelease
     - ./gradlew clean :BlinkID-aMinimalSample:assembleRelease
     - ./gradlew clean :BlinkID-OverlaySample:assembleRelease
diff --git a/BlinkIDSample/BlinkID-CustomCombinedSample/build.gradle b/BlinkIDSample/BlinkID-CustomCombinedSample/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+    implementation "androidx.percentlayout:percentlayout:1.0.0"
     implementation project(':LibUtils')
-    implementation "com.android.support:percent:${rootProject.ext.appCompatVersion}"
 
 }
diff --git a/...omCombinedSample/src/main/java/com/microblink/blinkid/CustomVerificationFlowActivity.java b/...omCombinedSample/src/main/java/com/microblink/blinkid/CustomVerificationFlowActivity.java
@@ -15,13 +15,6 @@
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.view.InflateException;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -36,6 +29,7 @@
 import com.microblink.entities.recognizers.Recognizer;
 import com.microblink.entities.recognizers.RecognizerBundle;
 import com.microblink.entities.recognizers.blinkid.CombinedRecognizer;
+import com.microblink.entities.recognizers.blinkid.DataMatchResult;
 import com.microblink.geometry.Rectangle;
 import com.microblink.hardware.SuccessCallback;
 import com.microblink.hardware.camera.AutoFocusRequiredButNotSupportedException;
@@ -65,6 +59,14 @@
 import com.microblink.view.viewfinder.ViewfinderShapeView;
 import com.microblink.view.viewfinder.points.PointSetView;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
 /**
  * Scan activity designed for scanning documents by using combined recognizers
  * ({@link CombinedRecognizer}). Scanning is performed
@@ -672,7 +674,7 @@ private void onScanDoneWithSuccess() {
         Recognizer recognizer = mRecognizerBundle.getRecognizers()[0];
         if (recognizer instanceof CombinedRecognizer) {
             CombinedRecognizer combinedRecognizer = (CombinedRecognizer) recognizer;
-            if (combinedRecognizer.getCombinedResult().isDocumentDataMatch()) {
+            if (combinedRecognizer.getCombinedResult().getDocumentDataMatch() != DataMatchResult.Failed) {
                 finishWithResults();
             } else {
                 // handle case when scanned sides were from different documents

diff --git a/...ample/BlinkID-CustomCombinedSample/src/main/java/com/microblink/blinkid/MainActivity.java b/...ample/BlinkID-CustomCombinedSample/src/main/java/com/microblink/blinkid/MainActivity.java
@@ -10,16 +10,8 @@
 import com.microblink.MenuListItem;
 import com.microblink.entities.recognizers.Recognizer;
 import com.microblink.entities.recognizers.RecognizerBundle;
-import com.microblink.entities.recognizers.blinkid.austria.AustriaCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.croatia.CroatiaCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.czechia.CzechiaCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.germany.GermanyCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.jordan.JordanCombinedRecognizer;
+import com.microblink.entities.recognizers.blinkid.generic.BlinkIdCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.mrtd.MrtdCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.poland.PolandCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.singapore.SingaporeCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.slovakia.SlovakiaCombinedRecognizer;
-import com.microblink.entities.recognizers.blinkid.slovenia.SloveniaCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.usdl.UsdlCombinedRecognizer;
 import com.microblink.hardware.camera.CameraType;
 import com.microblink.result.ResultActivity;
@@ -50,16 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {
     protected List<MenuListItem> createMenuListItems() {
         List<MenuListItem> items = new ArrayList<>();
 
+        items.add(createMenuListItem("BlinkID combined", ImageSettings.enableAllImages(new BlinkIdCombinedRecognizer())));
         items.add(createMenuListItem("MRTD combined", ImageSettings.enableAllImages(new MrtdCombinedRecognizer())));
-        items.add(createMenuListItem("Austrian combined", ImageSettings.enableAllImages(new AustriaCombinedRecognizer())));
-        items.add(createMenuListItem("Croatian ID combined", ImageSettings.enableAllImages(new CroatiaCombinedRecognizer())));
-        items.add(createMenuListItem("Czech ID combined", ImageSettings.enableAllImages(new CzechiaCombinedRecognizer())));
-        items.add(createMenuListItem("German combined", ImageSettings.enableAllImages(new GermanyCombinedRecognizer())));
-        items.add(createMenuListItem("Jordan ID combined", ImageSettings.enableAllImages(new JordanCombinedRecognizer())));
-        items.add(createMenuListItem("Polish ID combined", ImageSettings.enableAllImages(new PolandCombinedRecognizer())));
-        items.add(createMenuListItem("Singapore ID combined", ImageSettings.enableAllImages(new SingaporeCombinedRecognizer())));
-        items.add(createMenuListItem("Slovak ID combined", ImageSettings.enableAllImages(new SlovakiaCombinedRecognizer())));
-        items.add(createMenuListItem("Slovenian ID combined", ImageSettings.enableAllImages(new SloveniaCombinedRecognizer())));
         items.add(createMenuListItem("US / Canada DL combined", ImageSettings.enableAllImages(new UsdlCombinedRecognizer())));
 
         return items;

diff --git a/...mbinedSample/src/main/java/com/microblink/blinkid/managers/DocumentViewfinderManager.java b/...mbinedSample/src/main/java/com/microblink/blinkid/managers/DocumentViewfinderManager.java
@@ -3,16 +3,17 @@
 import android.animation.Animator;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.microblink.view.viewfinder.ViewfinderShapeView;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
 /**
  * Document viewfinder manager that should be used for showing the splash screens over the viewfinder.
  */

diff --git a/...CombinedSample/src/main/java/com/microblink/blinkid/managers/ViewfinderAnimationUtil.java b/...CombinedSample/src/main/java/com/microblink/blinkid/managers/ViewfinderAnimationUtil.java
@@ -4,14 +4,15 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.microblink.view.viewfinder.ViewfinderShapeView;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class ViewfinderAnimationUtil {
 
     public static final float MAX_VIEWFINDER_ALPHA = 0.67f;

diff --git a/BlinkIDSample/BlinkID-CustomCombinedSample/src/main/res/layout/id_card_camera_overlay.xml b/BlinkIDSample/BlinkID-CustomCombinedSample/src/main/res/layout/id_card_camera_overlay.xml
@@ -36,7 +36,7 @@
         tools:visibility="gone"
         tools:ignore="RtlHardcoded"/>
 
-    <android.support.percent.PercentRelativeLayout
+    <androidx.percentlayout.widget.PercentRelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -46,7 +46,7 @@
             android:layout_height="0dp"
             app:layout_heightPercent="50%">
 
-            <android.support.percent.PercentRelativeLayout
+            <androidx.percentlayout.widget.PercentRelativeLayout
                 android:id="@+id/viewfinderContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -127,7 +127,7 @@
                     android:layout_height="match_parent"
                     android:background="@color/mb_overlay_camera_translucent"
                     tools:ignore="RtlHardcoded"/>
-            </android.support.percent.PercentRelativeLayout>
+            </androidx.percentlayout.widget.PercentRelativeLayout>
 
         </RelativeLayout>
 
@@ -191,7 +191,7 @@
                 tools:ignore="ContentDescription"/>
         </RelativeLayout>
 
-    </android.support.percent.PercentRelativeLayout>
+    </androidx.percentlayout.widget.PercentRelativeLayout>
 
 </LinearLayout>
 
diff --git a/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/build.gradle b/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/build.gradle
diff --git a/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/proguard-project.txt b/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/proguard-project.txt
diff --git a/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/src/main/AndroidManifest.xml b/BlinkIDSample/BlinkID-CustomFieldByFieldScanSample/src/main/AndroidManifest.xml