Skip to content

Commit

Permalink
Merge pull request #284 from BlinkID/release/v6.0.0
Browse files Browse the repository at this point in the history
Release/v6.0.0
  • Loading branch information
krizaa authored Dec 9, 2022
2 parents 2598867 + ee3be13 commit 71a80fb
Show file tree
Hide file tree
Showing 663 changed files with 46,487 additions and 34,194 deletions.
2 changes: 1 addition & 1 deletion BlinkIDSample/BlinkID-CustomCombinedSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {

defaultConfig {
applicationId "com.microblink.blinkid"
minSdkVersion 16
minSdkVersion 21
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,40 +26,40 @@
import android.widget.TextView;
import android.widget.Toast;

import com.microblink.blinkid.entities.recognizers.blinkid.DataMatchState;
import com.microblink.blinkid.managers.DocumentViewfinderManager;
import com.microblink.entities.recognizers.Recognizer;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.entities.recognizers.blinkid.CombinedDataMatchResult;
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;
import com.microblink.hardware.camera.CameraResolutionTooSmallException;
import com.microblink.hardware.camera.CameraType;
import com.microblink.hardware.orientation.Orientation;
import com.microblink.metadata.MetadataCallbacks;
import com.microblink.metadata.detection.FailedDetectionCallback;
import com.microblink.metadata.detection.points.DisplayablePointsDetection;
import com.microblink.metadata.detection.points.PointsDetectionCallback;
import com.microblink.metadata.glare.GlareCallback;
import com.microblink.metadata.recognition.FirstSideRecognitionCallback;
import com.microblink.recognition.FeatureNotSupportedException;
import com.microblink.recognition.RecognitionSuccessType;
import com.microblink.recognition.RecognizerError;
import com.microblink.util.CameraPermissionManager;
import com.microblink.util.Log;
import com.microblink.view.CameraAspectMode;
import com.microblink.view.CameraEventsListener;
import com.microblink.view.NotSupportedReason;
import com.microblink.view.OnActivityFlipListener;
import com.microblink.view.OrientationAllowedListener;
import com.microblink.view.exception.NonLandscapeOrientationNotSupportedException;
import com.microblink.view.ocrResult.OcrResultDotsView;
import com.microblink.view.recognition.RecognizerRunnerView;
import com.microblink.view.recognition.ScanResultListener;
import com.microblink.view.viewfinder.ViewfinderShapeView;
import com.microblink.view.viewfinder.points.PointSetView;
import com.microblink.blinkid.entities.recognizers.Recognizer;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.entities.recognizers.blinkid.CombinedDataMatchResult;
import com.microblink.blinkid.entities.recognizers.blinkid.CombinedRecognizer;
import com.microblink.blinkid.geometry.Rectangle;
import com.microblink.blinkid.hardware.SuccessCallback;
import com.microblink.blinkid.hardware.camera.AutoFocusRequiredButNotSupportedException;
import com.microblink.blinkid.hardware.camera.CameraResolutionTooSmallException;
import com.microblink.blinkid.hardware.camera.CameraType;
import com.microblink.blinkid.hardware.orientation.Orientation;
import com.microblink.blinkid.metadata.MetadataCallbacks;
import com.microblink.blinkid.metadata.detection.FailedDetectionCallback;
import com.microblink.blinkid.metadata.detection.points.DisplayablePointsDetection;
import com.microblink.blinkid.metadata.detection.points.PointsDetectionCallback;
import com.microblink.blinkid.metadata.glare.GlareCallback;
import com.microblink.blinkid.metadata.recognition.FirstSideRecognitionCallback;
import com.microblink.blinkid.recognition.FeatureNotSupportedException;
import com.microblink.blinkid.recognition.RecognitionSuccessType;
import com.microblink.blinkid.recognition.RecognizerError;
import com.microblink.blinkid.util.CameraPermissionManager;
import com.microblink.blinkid.util.Log;
import com.microblink.blinkid.view.CameraAspectMode;
import com.microblink.blinkid.view.CameraEventsListener;
import com.microblink.blinkid.view.NotSupportedReason;
import com.microblink.blinkid.view.OnActivityFlipListener;
import com.microblink.blinkid.view.OrientationAllowedListener;
import com.microblink.blinkid.view.exception.NonLandscapeOrientationNotSupportedException;
import com.microblink.blinkid.view.ocrResult.OcrResultDotsView;
import com.microblink.blinkid.view.recognition.RecognizerRunnerView;
import com.microblink.blinkid.view.recognition.ScanResultListener;
import com.microblink.blinkid.view.viewfinder.ViewfinderShapeView;
import com.microblink.blinkid.view.viewfinder.points.PointSetView;

import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
Expand Down Expand Up @@ -682,7 +682,7 @@ private void onScanDoneWithSuccess() {
Recognizer.Result recognizerResult = mRecognizerBundle.getRecognizers()[0].getResult();
if (recognizerResult instanceof CombinedDataMatchResult) {
CombinedDataMatchResult combinedDataMatchResult = (CombinedDataMatchResult) recognizerResult;
if (combinedDataMatchResult.getDocumentDataMatch() != DataMatchResult.Failed) {
if (combinedDataMatchResult.getDocumentDataMatch() != DataMatchState.Failed) {
finishWithResults();
} else {
// handle case when scanned sides were from different documents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
import android.os.Parcelable;
import android.widget.Toast;

import com.microblink.entities.recognizers.Recognizer;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.entities.recognizers.blinkid.generic.BlinkIdCombinedRecognizer;
import com.microblink.entities.recognizers.blinkid.mrtd.MrtdCombinedRecognizer;
import com.microblink.entities.recognizers.blinkid.usdl.UsdlCombinedRecognizer;
import com.microblink.hardware.camera.CameraType;
import com.microblink.menu.MenuListItem;
import com.microblink.menu.ResultHandlerMenuActivity;
import com.microblink.result.activity.RecognizerBundleResultActivity;
import com.microblink.blinkid.entities.recognizers.Recognizer;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.entities.recognizers.blinkid.generic.BlinkIdMultiSideRecognizer;
import com.microblink.blinkid.entities.recognizers.blinkid.mrtd.MrtdCombinedRecognizer;
import com.microblink.blinkid.entities.recognizers.blinkid.usdl.UsdlCombinedRecognizer;
import com.microblink.blinkid.hardware.camera.CameraType;
import com.microblink.blinkid.menu.MenuListItem;
import com.microblink.blinkid.menu.ResultHandlerMenuActivity;
import com.microblink.blinkid.result.activity.RecognizerBundleResultActivity;
import com.microblink.util.ImageSettings;
import com.microblink.util.RecognizerCompatibility;
import com.microblink.util.RecognizerCompatibilityStatus;
import com.microblink.blinkid.util.RecognizerCompatibility;
import com.microblink.blinkid.util.RecognizerCompatibilityStatus;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -56,7 +56,7 @@ 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("BlinkID Multi Side", ImageSettings.enableAllImages(new BlinkIdMultiSideRecognizer())));
items.add(createMenuListItem("MRTD combined", ImageSettings.enableAllImages(new MrtdCombinedRecognizer())));
items.add(createMenuListItem("US / Canada DL combined", ImageSettings.enableAllImages(new UsdlCombinedRecognizer())));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.microblink.view.viewfinder.ViewfinderShapeView;
import com.microblink.blinkid.view.viewfinder.ViewfinderShapeView;

import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.animation.ObjectAnimator;
import android.view.View;

import com.microblink.view.viewfinder.ViewfinderShapeView;
import com.microblink.blinkid.view.viewfinder.ViewfinderShapeView;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.microblink.view.recognition.RecognizerRunnerView
<com.microblink.blinkid.view.recognition.RecognizerRunnerView
android:id="@+id/recognizerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
app:layout_aspectRatio="158.577251%"
app:layout_widthPercent="90%">

<com.microblink.view.viewfinder.ViewfinderShapeView
<com.microblink.blinkid.view.viewfinder.ViewfinderShapeView
android:id="@+id/viewfinderRectangle"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion BlinkIDSample/BlinkID-CustomUISample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {

defaultConfig {
applicationId "com.microblink.blinkid"
minSdkVersion 16
minSdkVersion 21
targetSdkVersion rootProject.ext.targetSdkVersion
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import android.widget.Toast;

import com.microblink.blinkid.demo.R;
import com.microblink.menu.MenuListItem;
import com.microblink.menu.ResultHandlerMenuActivity;
import com.microblink.result.activity.RecognizerBundleResultActivity;
import com.microblink.util.RecognizerCompatibility;
import com.microblink.util.RecognizerCompatibilityStatus;
import com.microblink.blinkid.menu.MenuListItem;
import com.microblink.blinkid.menu.ResultHandlerMenuActivity;
import com.microblink.blinkid.result.activity.RecognizerBundleResultActivity;
import com.microblink.blinkid.util.RecognizerCompatibility;
import com.microblink.blinkid.util.RecognizerCompatibilityStatus;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,35 @@
import android.widget.Toast;

import com.microblink.blinkid.demo.R;
import com.microblink.entities.recognizers.Recognizer;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.entities.recognizers.blinkbarcode.usdl.UsdlRecognizer;
import com.microblink.entities.recognizers.blinkid.mrtd.MrtdRecognizer;
import com.microblink.hardware.SuccessCallback;
import com.microblink.hardware.orientation.Orientation;
import com.microblink.metadata.MetadataCallbacks;
import com.microblink.metadata.detection.FailedDetectionCallback;
import com.microblink.metadata.detection.points.DisplayablePointsDetection;
import com.microblink.metadata.detection.points.PointsDetectionCallback;
import com.microblink.metadata.detection.points.PointsType;
import com.microblink.metadata.detection.quad.DisplayableQuadDetection;
import com.microblink.metadata.detection.quad.QuadDetectionCallback;
import com.microblink.recognition.RecognitionSuccessType;
import com.microblink.util.CameraPermissionManager;
import com.microblink.util.Log;
import com.microblink.view.CameraAspectMode;
import com.microblink.view.CameraEventsListener;
import com.microblink.view.OnActivityFlipListener;
import com.microblink.view.OnSizeChangedListener;
import com.microblink.view.OrientationAllowedListener;
import com.microblink.view.ocrResult.OcrResultDotsView;
import com.microblink.view.recognition.DetectionStatus;
import com.microblink.view.recognition.RecognizerRunnerView;
import com.microblink.view.recognition.ScanResultListener;
import com.microblink.view.viewfinder.points.PointSetView;
import com.microblink.view.viewfinder.quadview.QuadViewManager;
import com.microblink.view.viewfinder.quadview.QuadViewManagerFactory;
import com.microblink.view.viewfinder.quadview.QuadViewPreset;
import com.microblink.blinkid.entities.recognizers.Recognizer;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.entities.recognizers.blinkbarcode.usdl.UsdlRecognizer;
import com.microblink.blinkid.entities.recognizers.blinkid.mrtd.MrtdRecognizer;
import com.microblink.blinkid.hardware.SuccessCallback;
import com.microblink.blinkid.hardware.orientation.Orientation;
import com.microblink.blinkid.metadata.MetadataCallbacks;
import com.microblink.blinkid.metadata.detection.FailedDetectionCallback;
import com.microblink.blinkid.metadata.detection.points.DisplayablePointsDetection;
import com.microblink.blinkid.metadata.detection.points.PointsDetectionCallback;
import com.microblink.blinkid.metadata.detection.points.PointsType;
import com.microblink.blinkid.metadata.detection.quad.DisplayableQuadDetection;
import com.microblink.blinkid.metadata.detection.quad.QuadDetectionCallback;
import com.microblink.blinkid.recognition.RecognitionSuccessType;
import com.microblink.blinkid.util.CameraPermissionManager;
import com.microblink.blinkid.util.Log;
import com.microblink.blinkid.view.CameraAspectMode;
import com.microblink.blinkid.view.CameraEventsListener;
import com.microblink.blinkid.view.OnActivityFlipListener;
import com.microblink.blinkid.view.OnSizeChangedListener;
import com.microblink.blinkid.view.OrientationAllowedListener;
import com.microblink.blinkid.view.ocrResult.OcrResultDotsView;
import com.microblink.blinkid.view.recognition.DetectionStatus;
import com.microblink.blinkid.view.recognition.RecognizerRunnerView;
import com.microblink.blinkid.view.recognition.ScanResultListener;
import com.microblink.blinkid.view.viewfinder.points.PointSetView;
import com.microblink.blinkid.view.viewfinder.quadview.QuadViewManager;
import com.microblink.blinkid.view.viewfinder.quadview.QuadViewManagerFactory;
import com.microblink.blinkid.view.viewfinder.quadview.QuadViewPreset;

import androidx.annotation.NonNull;

Expand Down Expand Up @@ -385,7 +385,7 @@ public void onError(Throwable ex) {
// This method will be called when opening of camera resulted in exception or
// recognition process encountered an error.
// The error details will be given in ex parameter.
com.microblink.util.Log.e(this, ex, "Error");
com.microblink.blinkid.util.Log.e(this, ex, "Error");
handleError();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
android:layout_height="match_parent"
tools:context="com.microblink.blinkid.MyScanActivity">

<com.microblink.view.recognition.RecognizerRunnerView
<com.microblink.blinkid.view.recognition.RecognizerRunnerView
android:id="@+id/recognizerView"
android:layout_width="match_parent"
android:layout_height="match_parent">

</com.microblink.view.recognition.RecognizerRunnerView>
</com.microblink.blinkid.view.recognition.RecognizerRunnerView>

</FrameLayout>
2 changes: 1 addition & 1 deletion BlinkIDSample/BlinkID-DirectApiSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {

defaultConfig {
applicationId "com.microblink.blinkid"
minSdkVersion 16
minSdkVersion 21
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import com.microblink.blinkid.demo.R;
import com.microblink.blinkid.imagescan.CombinedScanImageActivity;
import com.microblink.blinkid.imagescan.ScanImageActivity;
import com.microblink.entities.Entity;
import com.microblink.entities.recognizers.Recognizer;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.entities.recognizers.blinkid.mrtd.MrtdRecognizer;
import com.microblink.entities.recognizers.blinkid.mrtd.MrzResult;
import com.microblink.menu.BaseMenuActivity;
import com.microblink.menu.MenuListItem;
import com.microblink.blinkid.entities.Entity;
import com.microblink.blinkid.entities.recognizers.Recognizer;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.entities.recognizers.blinkid.mrtd.MrtdRecognizer;
import com.microblink.blinkid.entities.recognizers.blinkid.mrtd.MrzResult;
import com.microblink.blinkid.menu.BaseMenuActivity;
import com.microblink.blinkid.menu.MenuListItem;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
import androidx.annotation.NonNull;

import com.microblink.blinkid.demo.R;
import com.microblink.directApi.DirectApiErrorListener;
import com.microblink.directApi.RecognizerRunner;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.hardware.orientation.Orientation;
import com.microblink.image.Image;
import com.microblink.image.ImageBuilder;
import com.microblink.recognition.RecognitionSuccessType;
import com.microblink.util.Log;
import com.microblink.view.recognition.ScanResultListener;
import com.microblink.blinkid.directApi.DirectApiErrorListener;
import com.microblink.blinkid.directApi.RecognizerRunner;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.hardware.orientation.Orientation;
import com.microblink.blinkid.image.Image;
import com.microblink.blinkid.image.ImageBuilder;
import com.microblink.blinkid.recognition.RecognitionSuccessType;
import com.microblink.blinkid.util.Log;
import com.microblink.blinkid.view.recognition.ScanResultListener;

import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
* limitations under the License.
*/

import android.annotation.TargetApi;
import android.content.Context;
import android.util.AttributeSet;
import android.view.TextureView;

/**
* A {@link TextureView} that can be adjusted to a specified aspect ratio.
*/
@TargetApi(21)
public class AutoFitTextureView extends TextureView {

private int mRatioWidth = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.microblink.blinkid.customcamera.camera2;

import android.annotation.TargetApi;
import android.app.Activity;
import android.os.Bundle;

import com.microblink.blinkid.demo.R;

@TargetApi(21)
public class Camera2Activity extends Activity {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
import androidx.core.content.ContextCompat;

import com.microblink.blinkid.demo.R;
import com.microblink.directApi.DirectApiErrorListener;
import com.microblink.directApi.RecognizerRunner;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.hardware.orientation.Orientation;
import com.microblink.image.ImageBuilder;
import com.microblink.recognition.RecognitionSuccessType;
import com.microblink.view.recognition.ScanResultListener;
import com.microblink.blinkid.directApi.DirectApiErrorListener;
import com.microblink.blinkid.directApi.RecognizerRunner;
import com.microblink.blinkid.entities.recognizers.RecognizerBundle;
import com.microblink.blinkid.hardware.orientation.Orientation;
import com.microblink.blinkid.image.ImageBuilder;
import com.microblink.blinkid.recognition.RecognitionSuccessType;
import com.microblink.blinkid.view.recognition.ScanResultListener;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -102,7 +102,7 @@ public void onImageAvailable(ImageReader reader) {
if (img != null) {
if (mRecognizer.getCurrentState() == RecognizerRunner.State.READY) {
mImageBeingRecognized = img;
com.microblink.image.Image image = ImageBuilder.buildImageFromCamera2Image(mImageBeingRecognized, Orientation.ORIENTATION_LANDSCAPE_RIGHT, null);
com.microblink.blinkid.image.Image image = ImageBuilder.buildImageFromCamera2Image(mImageBeingRecognized, Orientation.ORIENTATION_LANDSCAPE_RIGHT, null);
Log.i(TAG, "Starting recognition");
mTimestamp = System.currentTimeMillis();
mRecognizer.recognizeVideoImage(image, Camera2Fragment.this);
Expand Down
Loading

0 comments on commit 71a80fb

Please sign in to comment.