Merge pull request #131 from BlinkID/release/v4.3.0

Release/v4.3.0
BlinkID · Oct 15, 2018 · fa2557d · fa2557d
2 parents fef3c4b + a828f79
commit fa2557d
Show file tree

Hide file tree

Showing 429 changed files with 29,633 additions and 9,909 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ android:
     components:
         - platform-tools
         - tools
-        - build-tools-27.0.3
-        - android-27
+        - build-tools-28.0.3
+        - android-28
         - extra-android-m2repository
 script:
     - cd BlinkIDSample

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
@@ -13,6 +13,7 @@
 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.elitepaymentcard.ElitePaymentCardCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.germany.GermanyCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.jordan.JordanCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.mrtd.MrtdCombinedRecognizer;
@@ -59,6 +60,7 @@ protected List<MenuListItem> createMenuListItems() {
         items.add(createMenuListItem("German combined", ImageSettings.enableAllImages(new GermanyCombinedRecognizer())));
         items.add(createMenuListItem("Jordan ID combined", ImageSettings.enableAllImages(new JordanCombinedRecognizer())));
         items.add(createMenuListItem("Payment Card combined", ImageSettings.enableAllImages(new PaymentCardCombinedRecognizer())));
+        items.add(createMenuListItem("Elite Payment Card combined", ImageSettings.enableAllImages(new ElitePaymentCardCombinedRecognizer())));
         items.add(createMenuListItem("Polish ID combined", ImageSettings.enableAllImages(new PolandCombinedRecognizer())));
         items.add(createMenuListItem("Serbian ID combined", ImageSettings.enableAllImages(new SerbiaCombinedRecognizer())));
         items.add(createMenuListItem("Singapore ID combined", ImageSettings.enableAllImages(new SingaporeCombinedRecognizer())));

diff --git a/...kIDSample/BlinkID-CustomUISample/src/main/java/com/microblink/blinkid/MyScanActivity.java b/...kIDSample/BlinkID-CustomUISample/src/main/java/com/microblink/blinkid/MyScanActivity.java
@@ -159,7 +159,7 @@ public boolean isOrientationAllowed(Orientation orientation) {
         mQvManager = QuadViewManagerFactory.createQuadViewFromPreset(mRecognizerView, QuadViewPreset.DEFAULT_FROM_DOCUMENT_SCAN_ACTIVITY);
 
         // initialize buttons and status view
-        View view = getLayoutInflater().inflate(R.layout.default_photopay_viewfinder, null);
+        View view = getLayoutInflater().inflate(R.layout.default_blinkid_viewfinder, null);
 
         mBackButton = view.findViewById(R.id.defaultBackButton);
         mBackButton.setText(getString(R.string.mb_home));
@@ -392,7 +392,7 @@ private void handleError() {
         alertDialog.setTitle(getString(R.string.error));
         alertDialog.setMessage(getString(R.string.errorDesc));
 
-        alertDialog.setButton(getString(R.string.photopayOK), new DialogInterface.OnClickListener() {
+        alertDialog.setButton(getString(R.string.blinkidOK), new DialogInterface.OnClickListener() {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {

diff --git a/BlinkIDSample/BlinkID-CustomUISample/src/main/res/layout/activity_my_scan.xml b/BlinkIDSample/BlinkID-CustomUISample/src/main/res/layout/activity_my_scan.xml
@@ -4,7 +4,7 @@
                 xmlns:custom="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:context="com.microblink.blinkid.demo.com.microblink.blinkid.MyScanActivity">
+                tools:context="com.microblink.blinkid.MyScanActivity">
 
     <com.microblink.view.recognition.RecognizerRunnerView
         android:id="@+id/recognizerView"

diff --git a/...es/layout/default_photopay_viewfinder.xml → ...res/layout/default_blinkid_viewfinder.xml b/...es/layout/default_photopay_viewfinder.xml → ...res/layout/default_blinkid_viewfinder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/default_photopay_viewfinder"
+    android:id="@+id/default_blinkid_viewfinder"
     android:animateLayoutChanges="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -39,7 +39,7 @@
          android:paddingTop="4dp"
          android:alpha="0.9"
          android:text="@string/mb_light_off"
-         android:textColor="@color/mb_button_foreground"
+         android:textColor="@color/mb_button_text_color"
          android:textSize="14sp" />
 
     <Button
@@ -57,7 +57,7 @@
         android:paddingTop="4dp"
         android:alpha="0.9"
         android:text="@string/mb_home"
-        android:textColor="@color/mb_button_foreground"
+        android:textColor="@color/mb_button_text_color"
         android:textSize="14sp" />
 
 </FrameLayout>
diff --git a/BlinkIDSample/BlinkID-CustomUISample/src/main/res/values/strings.xml b/BlinkIDSample/BlinkID-CustomUISample/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="blinkid">BlinkID</string>
-    <string name="photopayOK">OK</string>
+    <string name="blinkidOK">OK</string>
     <string name="scanOcr">Scan slip</string>
     <string name="scanId">Scan ID</string>
     <string name="scanBarcode">Scan barcode</string>

diff --git a/BlinkIDSample/BlinkID-aMinimalSample/build.gradle b/BlinkIDSample/BlinkID-aMinimalSample/build.gradle
@@ -29,4 +29,8 @@ dependencies {
     implementation("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
+
+    // uncomment this to use custom LibBlinkID build
+//    implementation project(':LibBlinkID-release')
+//    implementation "com.android.support:appcompat-v7:${rootProject.ext.appCompatVersion}"
 }
diff --git a/BlinkIDSample/BlinkID-aMinimalSample/src/main/assets/com.microblink.blinkid.mblic b/BlinkIDSample/BlinkID-aMinimalSample/src/main/assets/com.microblink.blinkid.mblic
diff --git a/...ample/BlinkID_AllRecognizersSample/src/main/java/com/microblink/blinkid/MenuActivity.java b/...ample/BlinkID_AllRecognizersSample/src/main/java/com/microblink/blinkid/MenuActivity.java
@@ -28,9 +28,11 @@
 import com.microblink.entities.recognizers.blinkid.australia.AustraliaDlBackRecognizer;
 import com.microblink.entities.recognizers.blinkid.australia.AustraliaDlFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.austria.AustriaCombinedRecognizer;
+import com.microblink.entities.recognizers.blinkid.austria.AustriaDlFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.austria.AustriaIdBackRecognizer;
 import com.microblink.entities.recognizers.blinkid.austria.AustriaIdFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.austria.AustriaPassportRecognizer;
+import com.microblink.entities.recognizers.blinkid.colombia.ColombiaDlFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.colombia.ColombiaIdBackRecognizer;
 import com.microblink.entities.recognizers.blinkid.colombia.ColombiaIdFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.croatia.CroatiaCombinedRecognizer;
@@ -42,6 +44,9 @@
 import com.microblink.entities.recognizers.blinkid.czechia.CzechiaIdBackRecognizer;
 import com.microblink.entities.recognizers.blinkid.czechia.CzechiaIdFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.egypt.EgyptIdFrontRecognizer;
+import com.microblink.entities.recognizers.blinkid.elitepaymentcard.ElitePaymentCardBackRecognizer;
+import com.microblink.entities.recognizers.blinkid.elitepaymentcard.ElitePaymentCardCombinedRecognizer;
+import com.microblink.entities.recognizers.blinkid.elitepaymentcard.ElitePaymentCardFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.eudl.EudlCountry;
 import com.microblink.entities.recognizers.blinkid.eudl.EudlRecognizer;
 import com.microblink.entities.recognizers.blinkid.germany.GermanyCombinedRecognizer;
@@ -51,6 +56,8 @@
 import com.microblink.entities.recognizers.blinkid.germany.GermanyPassportRecognizer;
 import com.microblink.entities.recognizers.blinkid.hongkong.HongKongIdFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.indonesia.IndonesiaIdFrontRecognizer;
+import com.microblink.entities.recognizers.blinkid.ireland.IrelandDlFrontRecognizer;
+import com.microblink.entities.recognizers.blinkid.italy.ItalyDlFrontRecognizer;
 import com.microblink.entities.recognizers.blinkid.jordan.JordanCombinedRecognizer;
 import com.microblink.entities.recognizers.blinkid.jordan.JordanIdBackRecognizer;
 import com.microblink.entities.recognizers.blinkid.jordan.JordanIdFrontRecognizer;
@@ -215,8 +222,11 @@ protected List<MenuListItem> createMenuListItems() {
         items.add(buildUnitedArabEmiratesIdElement());
 
         // DL list entries
-        items.add(buildAustrianDLElement());
+        items.add(buildAustriaDLFrontElement());
         items.add(buildAustralianDLElement());
+        items.add(buildColombiaDLElement());
+        items.add(buildIrelandDLElement());
+        items.add(buildItalyDlElement());
         items.add(buildMalaysianDLElement());
         items.add(buildNewZealandDLElement());
         items.add(buildGermanDLElement());
@@ -232,6 +242,8 @@ protected List<MenuListItem> createMenuListItems() {
         // entries for documents which are not country-specific
         items.add(buildPaymentCardElement());
         items.add(buildPaymentCardCombinedElement());
+        items.add(buildElitePaymentCardElement());
+        items.add(buildElitePaymentCardCombinedElement());
 
         // barcode list entries
         items.add(buildPDF417Element());
@@ -719,6 +731,21 @@ public void run() {
         });
     }
 
+    private MenuListItem buildElitePaymentCardElement() {
+        return new MenuListItem("Elite Payment Card", new Runnable() {
+            @Override
+            public void run() {
+                ElitePaymentCardFrontRecognizer frontRec = new ElitePaymentCardFrontRecognizer();
+                ImageSettings.enableAllImages(frontRec);
+
+                ElitePaymentCardBackRecognizer backRec = new ElitePaymentCardBackRecognizer();
+                ImageSettings.enableAllImages(backRec);
+
+                scanAction(new DocumentUISettings(prepareRecognizerBundle(frontRec, backRec)));
+            }
+        });
+    }
+
     private MenuListItem buildEUDLElement(String title, final EudlCountry country) {
         return new MenuListItem(title, new Runnable() {
             @Override
@@ -739,8 +766,15 @@ private MenuListItem buildGermanDLElement() {
         return buildEUDLElement("German Driver's License", EudlCountry.EUDL_COUNTRY_GERMANY);
     }
 
-    private MenuListItem buildAustrianDLElement() {
-        return buildEUDLElement("Austrian Driver's License", EudlCountry.EUDL_COUNTRY_AUSTRIA);
+    private MenuListItem buildAustriaDLFrontElement() {
+        return new MenuListItem("Austria Driver's License", new Runnable() {
+            @Override
+            public void run() {
+                AustriaDlFrontRecognizer austriaDlFrontRecognizer = new AustriaDlFrontRecognizer();
+                ImageSettings.enableAllImages(austriaDlFrontRecognizer);
+                scanAction(new DocumentUISettings(prepareRecognizerBundle(austriaDlFrontRecognizer)));
+            }
+        });
     }
 
     private MenuListItem buildAustralianDLElement() {
@@ -758,6 +792,42 @@ public void run() {
         });
     }
 
+    private MenuListItem buildIrelandDLElement() {
+        return new MenuListItem("Ireland Driver's License", new Runnable() {
+            @Override
+            public void run() {
+                IrelandDlFrontRecognizer irelandDlFront = new IrelandDlFrontRecognizer();
+                ImageSettings.enableAllImages(irelandDlFront);
+
+                scanAction(new DocumentUISettings(prepareRecognizerBundle(irelandDlFront)));
+            }
+        });
+    }
+
+    private MenuListItem buildItalyDlElement(){
+        return new MenuListItem("Italy Driver's License", new Runnable() {
+            @Override
+            public void run() {
+                ItalyDlFrontRecognizer italyDlFrontRecognizer = new ItalyDlFrontRecognizer();
+                ImageSettings.enableAllImages(italyDlFrontRecognizer);
+
+                scanAction(new DocumentUISettings(prepareRecognizerBundle(italyDlFrontRecognizer)));
+            }
+        });
+    }
+
+    private MenuListItem buildColombiaDLElement() {
+        return new MenuListItem("Colombia Driver's License", new Runnable() {
+            @Override
+            public void run() {
+                ColombiaDlFrontRecognizer colombiaDlFront = new ColombiaDlFrontRecognizer();
+                ImageSettings.enableAllImages(colombiaDlFront);
+
+                scanAction(new DocumentUISettings(prepareRecognizerBundle(colombiaDlFront)));
+            }
+        });
+    }
+
     private MenuListItem buildMalaysianDLElement() {
         return new MenuListItem("Malaysian Driver's License", new Runnable() {
             @Override
@@ -924,6 +994,18 @@ public void run() {
         });
     }
 
+    private MenuListItem buildElitePaymentCardCombinedElement() {
+        return new MenuListItem("Elite Payment Card Combined", new Runnable() {
+            @Override
+            public void run() {
+                ElitePaymentCardCombinedRecognizer paymentCardCombined = new ElitePaymentCardCombinedRecognizer();
+                ImageSettings.enableAllImages(paymentCardCombined);
+
+                combinedRecognitionAction(paymentCardCombined);
+            }
+        });
+    }
+
     private MenuListItem buildPolishIdCombinedElement() {
         return new MenuListItem("Polish Combined", new Runnable() {
             @Override
@@ -1099,7 +1181,6 @@ private Intent createHelpIntent() {
         return new Intent(this, HelpActivity.class);
     }
 
-
     private RecognizerBundle prepareRecognizerBundle(@NonNull Recognizer<?,?>... recognizers ) {
         return new RecognizerBundle(recognizers);
     }

diff --git a/BlinkIDSample/LibUtils/src/main/assets/com.microblink.blinkid.mblic b/BlinkIDSample/LibUtils/src/main/assets/com.microblink.blinkid.mblic
diff --git a/...IDSample/LibUtils/src/main/java/com/microblink/result/extract/RecognitionResultEntry.java b/...IDSample/LibUtils/src/main/java/com/microblink/result/extract/RecognitionResultEntry.java
@@ -12,6 +12,7 @@
 import com.microblink.image.Image;
 import com.microblink.libresult.R;
 import com.microblink.results.date.Date;
+import com.microblink.results.date.DateResult;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -81,6 +82,14 @@ public RecognitionResultEntry build(@StringRes int key, String value) {
             }
         }
 
+        public RecognitionResultEntry build(@StringRes int key, DateResult value) {
+            if (value == null) {
+                return new RecognitionResultEntry(createKey(key), "");
+            } else {
+                return build(key, value.getDate());
+            }
+        }
+
         public RecognitionResultEntry build(@StringRes int key, Date value) {
             String strVal = "";
             if (value != null) {
@@ -115,6 +124,10 @@ public RecognitionResultEntry build(@StringRes int key, int value) {
             return new RecognitionResultEntry(createKey(key), String.valueOf(value));
         }
 
+        public RecognitionResultEntry build(@StringRes int key, long value) {
+            return new RecognitionResultEntry(createKey(key), String.valueOf(value));
+        }
+
         public RecognitionResultEntry build(@StringRes int key, byte[] bytes) {
             String value = null;
             if (bytes != null) {