Merge pull request #330 from BlinkID/release/v6.11.0

Release/v6.11.0

BlinkIDSample/BlinkID-ComposeFragmentSample/build.gradle

@@ -42,13 +42,13 @@ dependencies {
     implementation("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.compose.material3:material3'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation platform('androidx.compose:compose-bom:2024.01.00')
-    implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
-    implementation 'androidx.compose.ui:ui-viewbinding:1.5.4'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation platform('androidx.compose:compose-bom:2024.09.02')
+    implementation 'androidx.activity:activity-compose:1.9.2'
+    implementation 'androidx.fragment:fragment-ktx:1.8.3'
+    implementation 'androidx.compose.ui:ui-viewbinding:1.7.2'
     implementation 'androidx.compose.ui:ui'
 
     implementation project(':LibUtils')

BlinkIDSample/BlinkID-ComposeMinimalSample/build.gradle

@@ -41,11 +41,11 @@ dependencies {
     implementation("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
         transitive = true
     }
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.compose.material3:material3'
-    implementation platform('androidx.compose:compose-bom:2024.01.00')
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation platform('androidx.compose:compose-bom:2024.09.02')
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.activity:activity-compose:1.9.2'
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
 

BlinkIDSample/BlinkID-MinimalSampleAdvanced/build.gradle

@@ -51,7 +51,7 @@ dependencies {
         transitive = true
     }
 
-    implementation 'androidx.activity:activity-ktx:1.7.0-alpha02'
+    implementation 'androidx.activity:activity-ktx:1.9.2'
 
     implementation project(':LibUtils')
 

BlinkIDSample/BlinkID-aMinimalSample/build.gradle

@@ -49,7 +49,7 @@ dependencies {
         transitive = true
     }
 
-    implementation 'androidx.activity:activity-ktx:1.8.2'
+    implementation 'androidx.activity:activity-ktx:1.9.2'
 
     // uncomment this to use custom LibBlinkID build
 //    implementation project(':LibBlinkID')

BlinkIDSample/LibUtils/build.gradle

@@ -31,6 +31,6 @@ dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
 
     implementation "androidx.appcompat:appcompat:${rootProject.ext.appCompatVersion}"
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.preference:preference:1.2.1'
 }

BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/result/extract/blinkid/BlinkIdExtractor.java

@@ -168,6 +168,14 @@ protected void addLocation(int key, StringResult value) {
                 root.put("cyrilic", cyrilic);
             }
 
+            if (!value.value(AlphabetType.Greek).isEmpty()) {
+                JSONObject greek = new JSONObject();
+                greek.put("value", value.value(AlphabetType.Greek));
+                greek.put("side", value.side(AlphabetType.Greek) != null ? value.side(AlphabetType.Greek) : "null");
+                greek.put("location", value.location(AlphabetType.Greek) != null ? value.location(AlphabetType.Greek).toString() : "null");
+                root.put("cyrilic", greek);
+            }
+
             add(key, root.toString(2).replaceAll("\\\\", ""));
 
         } catch (JSONException e) {
@@ -319,6 +327,10 @@ protected void drawLocationsOnBitmap(Canvas canvas, Paint paint, List<StringResu
                 paint.setColor(Color.BLUE);
                 canvas.drawRect(stringResult.location(AlphabetType.Cyrillic).toRectF(), paint);
             }
+            if (!stringResult.value(AlphabetType.Greek).isEmpty() && stringResult.location(AlphabetType.Greek) != null && stringResult.side(AlphabetType.Greek) == side) {
+                paint.setColor(Color.YELLOW);
+                canvas.drawRect(stringResult.location(AlphabetType.Greek).toRectF(), paint);
+            }
         }
     }
 }

BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/result/extract/blinkid/generic/BlinkIdMultiSideRecognizerResultExtractor.java

@@ -8,6 +8,7 @@
 import android.graphics.Paint;
 
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.BlinkIdMultiSideRecognizer;
+import com.microblink.blinkid.entities.recognizers.blinkid.generic.DependentInfo;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.DriverLicenseDetailedInfo;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.Side;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.StringResult;
@@ -28,6 +29,7 @@
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class BlinkIdMultiSideRecognizerResultExtractor extends BlinkIdExtractor<BlinkIdMultiSideRecognizer.Result, BlinkIdMultiSideRecognizer> {
@@ -187,6 +189,10 @@ private void extractMixedResults(BlinkIdMultiSideRecognizer.Result result) {
         add(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         add(R.string.PPRemarks, result.getRemarks());
         add(R.string.PPResidencePermitType, result.getResidencePermitType());
+        add(R.string.PPManufacturingYear, result.getManufacturingYear());
+        add(R.string.PPVehicleType, result.getVehicleType());
+        add(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        add(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         add(R.string.PPVisaType, result.getVisaType());
 
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
@@ -237,6 +243,8 @@ private void extractMixedResults(BlinkIdMultiSideRecognizer.Result result) {
 
         add(R.string.PPDataMatch, result.getDataMatch().toString());
 
+        add(R.string.PPDependentsInfo, Arrays.toString(result.getDependentsInfo()));
+
         add(R.string.MBBarcodeStepUsed, result.isBarcodeStepUsed());
         add(R.string.MBFrontCameraFrame, result.getFrontCameraFrame());
         add(R.string.MBBackCameraFrame, result.getBackCameraFrame());
@@ -294,6 +302,10 @@ private void extractMixedNonEmptyResults(BlinkIdMultiSideRecognizer.Result resul
         addIfNotEmpty(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         addIfNotEmpty(R.string.PPRemarks, result.getRemarks());
         addIfNotEmpty(R.string.PPResidencePermitType, result.getResidencePermitType());
+        addIfNotEmpty(R.string.PPManufacturingYear, result.getManufacturingYear());
+        addIfNotEmpty(R.string.PPVehicleType, result.getVehicleType());
+        addIfNotEmpty(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        addIfNotEmpty(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         addIfNotEmpty(R.string.PPVisaType, result.getVisaType());
 
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
@@ -344,6 +356,11 @@ private void extractMixedNonEmptyResults(BlinkIdMultiSideRecognizer.Result resul
 
         addIfNotEmpty(R.string.PPDataMatch, result.getDataMatch().toString());
 
+        DependentInfo[] dependentsInfo = result.getDependentsInfo();
+        if (dependentsInfo.length > 0) {
+            add(R.string.PPDependentsInfo, Arrays.toString(result.getDependentsInfo()));
+        }
+
         add(R.string.MBBarcodeStepUsed, result.isBarcodeStepUsed());
         add(R.string.MBFrontCameraFrame, result.getFrontCameraFrame());
         add(R.string.MBBackCameraFrame, result.getBackCameraFrame());
@@ -393,8 +410,17 @@ private void extractVisualResults(VizResult result) {
         addIfNotEmpty(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         addIfNotEmpty(R.string.PPRemarks, result.getRemarks());
         addIfNotEmpty(R.string.PPResidencePermitType, result.getResidencePermitType());
+        addIfNotEmpty(R.string.PPManufacturingYear, result.getManufacturingYear());
+        addIfNotEmpty(R.string.PPVehicleType, result.getVehicleType());
+        addIfNotEmpty(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        addIfNotEmpty(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         addIfNotEmpty(R.string.PPVisaType, result.getVisaType());
 
+        DependentInfo[] dependentsInfo = result.getDependentsInfo();
+        if (dependentsInfo.length > 0) {
+            add(R.string.PPDependentsInfo, Arrays.toString(dependentsInfo));
+        }
+
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
         if (!driverLicenseInfo.isEmpty()) {
             addIfNotEmpty(R.string.PPDriverLicenseDetailedInfo, driverLicenseInfo.toString());

BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/result/extract/blinkid/generic/BlinkIdSingleSideRecognizerResultExtractor.java

@@ -8,6 +8,7 @@
 import android.graphics.Paint;
 
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.BlinkIdSingleSideRecognizer;
+import com.microblink.blinkid.entities.recognizers.blinkid.generic.DependentInfo;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.DriverLicenseDetailedInfo;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.Side;
 import com.microblink.blinkid.entities.recognizers.blinkid.generic.StringResult;
@@ -28,6 +29,7 @@
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class BlinkIdSingleSideRecognizerResultExtractor extends BlinkIdExtractor<BlinkIdSingleSideRecognizer.Result, BlinkIdSingleSideRecognizer> {
@@ -169,6 +171,10 @@ private void extractMixedResults(BlinkIdSingleSideRecognizer.Result result) {
         add(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         add(R.string.PPRemarks, result.getRemarks());
         add(R.string.PPResidencePermitType, result.getResidencePermitType());
+        add(R.string.PPManufacturingYear, result.getManufacturingYear());
+        add(R.string.PPVehicleType, result.getVehicleType());
+        add(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        add(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         add(R.string.PPVisaType, result.getVisaType());
 
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
@@ -202,6 +208,8 @@ private void extractMixedResults(BlinkIdSingleSideRecognizer.Result result) {
 
         add(R.string.MBAdditionalProcessingInfo, result.getAdditionalProcessingInfo().toString());
 
+        add(R.string.PPDependentsInfo, Arrays.toString(result.getDependentsInfo()));
+
         add(R.string.MBBarcodeStepUsed, result.isBarcodeStepUsed());
         add(R.string.MBCameraFrame, result.getCameraFrame());
         add(R.string.MBBarcodeCameraFrame, result.getBarcodeCameraFrame());
@@ -258,6 +266,10 @@ private void extractMixedNonEmptyResults(BlinkIdSingleSideRecognizer.Result resu
         addIfNotEmpty(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         addIfNotEmpty(R.string.PPRemarks, result.getRemarks());
         addIfNotEmpty(R.string.PPResidencePermitType, result.getResidencePermitType());
+        addIfNotEmpty(R.string.PPManufacturingYear, result.getManufacturingYear());
+        addIfNotEmpty(R.string.PPVehicleType, result.getVehicleType());
+        addIfNotEmpty(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        addIfNotEmpty(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         addIfNotEmpty(R.string.PPVisaType, result.getVisaType());
 
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
@@ -292,6 +304,11 @@ private void extractMixedNonEmptyResults(BlinkIdSingleSideRecognizer.Result resu
 
         addIfNotEmpty(R.string.MBAdditionalProcessingInfo, result.getAdditionalProcessingInfo().toString());
 
+        DependentInfo[] dependentsInfo = result.getDependentsInfo();
+        if (dependentsInfo.length > 0) {
+            add(R.string.PPDependentsInfo, Arrays.toString(result.getDependentsInfo()));
+        }
+
         add(R.string.MBBarcodeStepUsed, result.isBarcodeStepUsed());
         add(R.string.MBCameraFrame, result.getCameraFrame());
         add(R.string.MBBarcodeCameraFrame, result.getBarcodeCameraFrame());
@@ -340,8 +357,17 @@ private void extractVisualResults(VizResult result) {
         addIfNotEmpty(R.string.PPIssuingAuthority, result.getIssuingAuthority());
         addIfNotEmpty(R.string.PPRemarks, result.getRemarks());
         addIfNotEmpty(R.string.PPResidencePermitType, result.getResidencePermitType());
+        addIfNotEmpty(R.string.PPManufacturingYear, result.getManufacturingYear());
+        addIfNotEmpty(R.string.PPVehicleType, result.getVehicleType());
+        addIfNotEmpty(R.string.PPEligibilityCategory, result.getEligibilityCategory());
+        addIfNotEmpty(R.string.PPSpecificDocumentValidity, result.getSpecificDocumentValidity());
         addIfNotEmpty(R.string.PPVisaType, result.getVisaType());
 
+        DependentInfo[] dependentsInfo = result.getDependentsInfo();
+        if (dependentsInfo.length > 0) {
+            add(R.string.PPDependentsInfo, Arrays.toString(dependentsInfo));
+        }
+
         DriverLicenseDetailedInfo driverLicenseInfo = result.getDriverLicenseDetailedInfo();
         if (!driverLicenseInfo.isEmpty()) {
             addIfNotEmpty(R.string.PPDriverLicenseDetailedInfo, driverLicenseInfo.toString());

BlinkIDSample/LibUtils/src/main/res/values/resultActivityStrings.xml

@@ -99,6 +99,7 @@
     <string name="PPDocumentType">Document Type</string>
     <string name="PPMRZParsed">MRZ parsed</string>
     <string name="PPMRZVerified">MRZ verified</string>
+    <string name="PPDependentsInfo">Dependents info</string>
     <string name="PPDocumentBothSidesMatch">Document Both Sides Match</string>
     <string name="PPDataMatch">Data match</string>
     <string name="PPDocumentNumberMatch">Document number data match</string>
@@ -299,6 +300,10 @@
     <string name="PPDocumentSubtype">Document subtype</string>
     <string name="PPRemarks">Remarks</string>
     <string name="PPResidencePermitType">Residence permit type</string>
+    <string name="PPManufacturingYear">Manufacturing year</string>
+    <string name="PPVehicleType">Vehicle type</string>
+    <string name="PPEligibilityCategory">Eligibility category</string>
+    <string name="PPSpecificDocumentValidity">Specific document validity</string>
     <string name="PPVisaType">Visa type</string>
 
     <string name="MBRecognitionStatus">Recognition status</string>

BlinkIDSample/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,8 +25,8 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    blinkIdVersion = '6.10.0'
-    compileSdkVersion = 34
-    targetSdkVersion = 34
-    appCompatVersion = '1.6.1'
+    blinkIdVersion = '6.11.0'
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    appCompatVersion = '1.7.0'
 }

BlinkIDSample/gradle.properties

@@ -3,4 +3,5 @@ android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-kotlin.jvm.target.validation.mode = IGNORE
+kotlin.jvm.target.validation.mode = IGNORE
+org.gradle.jvmargs=-Xmx4608m

BlinkIDSample/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Dec 08 21:56:25 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

README.md

@@ -115,7 +115,7 @@ Add _BlinkID_ as a dependency and make sure `transitive` is set to true
 
 ```
 dependencies {
-    implementation('com.microblink:blinkid:6.10.0@aar') {
+    implementation('com.microblink:blinkid:6.11.0@aar') {
         transitive = true
     }
 }
@@ -127,7 +127,7 @@ Android studio should automatically import javadoc from maven dependency. If tha
 
 1. In Android Studio project sidebar, ensure [project view is enabled](https://developer.android.com/studio/projects#ProjectView)
 2. Expand `External Libraries` entry (usually this is the last entry in project view)
-3. Locate `blinkid-6.10.0` entry, right click on it and select `Library Properties...`
+3. Locate `blinkid-6.11.0` entry, right click on it and select `Library Properties...`
 4. A `Library Properties` pop-up window will appear
 5. Click the second `+` button in bottom left corner of the window (the one that contains `+` with little globe)
 6. Window for defining documentation URL will appear
@@ -1356,7 +1356,7 @@ Execution failed for task ':app:mergeDebugNativeLibs'.
 > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
    > 2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs:
       - <path>/.gradle/caches/transforms-3/3d428f9141586beb8805ce57f97bedda/transformed/jetified-opencv-4.5.3.0/jni/arm64-v8a/libc++_shared.so
-      - <path>/.gradle/caches/transforms-3/609476a082a81bd7af00fd16a991ee43/transformed/jetified-blinkid-6.10.0/jni/arm64-v8a/libc++_shared.so
+      - <path>/.gradle/caches/transforms-3/609476a082a81bd7af00fd16a991ee43/transformed/jetified-blinkid-6.11.0/jni/arm64-v8a/libc++_shared.so
      If you are using jniLibs and CMake IMPORTED targets, see
      https://developer.android.com/r/tools/jniLibs-vs-imported-targets
 ```