Skip to content

Commit

Permalink
Merge pull request #72 from BlinkID/release/v5.17.0
Browse files Browse the repository at this point in the history
Release/v5.17.0
  • Loading branch information
mijo-gracanin authored Jul 13, 2022
2 parents 1f69135 + 4008d3e commit 1456c9e
Show file tree
Hide file tree
Showing 99 changed files with 3,790 additions and 2,763 deletions.
12 changes: 6 additions & 6 deletions Binding/Android/AndroidBinding.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
<Import Project="..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props" Condition="Exists('..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
<PropertyGroup>
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -16,18 +16,18 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidClassParser>class-parse</AndroidClassParser>
<PackageId>BlinkID.Android.Binding</PackageId>
<PackageVersion>5.15.0</PackageVersion>
<PackageVersion>5.17.0</PackageVersion>
<Authors>Microblink</Authors>
<Owners>Microblink</Owners>
<PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
<PackageReleaseNotes>Updated to BlinkID Android SDK v5.15.0
<PackageReleaseNotes>Updated to BlinkID Android SDK v5.17.0

https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseNotes>
https://github.com/BlinkID/blinkid-android/releases/tag/v5.17.0</PackageReleaseNotes>
<Summary>A small, but powerful ID scanning library - native Android SDK binding package.</Summary>
<Title>BlinkID</Title>
<Description>A small, but powerful ID scanning library - native Android SDK binding package.</Description>
<PackOnBuild>true</PackOnBuild>
<ReleaseVersion>4.0.0</ReleaseVersion>
<ReleaseVersion>5.17.0</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -149,7 +149,6 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseN
</LibraryProjectZip>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<Import Project="..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Migration.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Annotation.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Annotation.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
Expand All @@ -175,4 +174,5 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseN
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.ViewPager.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.ViewPager.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Fragment.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.Fragment.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.AppCompat.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\Xamarin.AndroidX.AppCompat.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
<Import Project="..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets" Condition="Exists('..\Forms\BlinkID.Forms\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets')" />
</Project>
4 changes: 2 additions & 2 deletions Binding/Android/Jars/LibBlinkID.aar
Git LFS file not shown
2 changes: 1 addition & 1 deletion Binding/Android/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.Build.Packaging" version="0.2.2" targetFramework="monoandroid81" developmentDependency="true" />
<package id="NuGet.Build.Packaging" version="0.2.2" targetFramework="monoandroid10.0" developmentDependency="true" />
<package id="Xamarin.AndroidX.Activity" version="1.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.AndroidX.Annotation" version="1.1.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.AndroidX.AppCompat" version="1.1.0.1" targetFramework="monoandroid90" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
<Import Project="..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -17,18 +17,18 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<PackageId>BlinkID.Forms.Android</PackageId>
<PackageVersion>5.15.0</PackageVersion>
<PackageVersion>5.17.0</PackageVersion>
<Authors>Microblink</Authors>
<Owners>Microblink</Owners>
<PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
<Summary>A small, but powerful ID scanning library - Android implementation for Xamarin Forms.</Summary>
<Title>BlinkID</Title>
<Description>A small, but powerful ID scanning library - Android implementation for Xamarin Forms.</Description>
<ReleaseVersion>4.0.0</ReleaseVersion>
<ReleaseVersion>5.17.0</ReleaseVersion>
<PackOnBuild>true</PackOnBuild>
<PackageReleaseNotes>Updated for BlinkID Android SDK v5.15.0
<PackageReleaseNotes>Updated for BlinkID Android SDK v5.17.0

https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseNotes>
https://github.com/BlinkID/blinkid-android/releases/tag/v5.17.0</PackageReleaseNotes>
<!-- Workaround for build error -->
<DesignTimeBuild>false</DesignTimeBuild>
</PropertyGroup>
Expand Down Expand Up @@ -202,7 +202,6 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseN
<Reference Include="Xamarin.AndroidX.Annotation.Experimental">
<HintPath>..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.3\lib\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="Xamarin.AndroidX.ConstraintLayout.Core">
Expand Down Expand Up @@ -285,7 +284,6 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseN
<AndroidResource Include="Resources\raw\beep.mp3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.Core.1.0.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.Core.1.0.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MultiDex.2.0.1.10\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.10\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
Expand Down Expand Up @@ -342,4 +340,5 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.15.0</PackageReleaseN
<Import Project="..\packages\Xamarin.AndroidX.Preference.1.1.1.11\build\monoandroid90\Xamarin.AndroidX.Preference.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Preference.1.1.1.11\build\monoandroid90\Xamarin.AndroidX.Preference.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Navigation.UI.2.3.5.3\build\monoandroid90\Xamarin.AndroidX.Navigation.UI.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Navigation.UI.2.3.5.3\build\monoandroid90\Xamarin.AndroidX.Navigation.UI.targets')" />
<Import Project="..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.5\build\monoandroid90\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.5\build\monoandroid90\Xamarin.Google.Guava.ListenableFuture.targets')" />
<Import Project="..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.2.2\build\NuGet.Build.Packaging.targets')" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ public IMicroblinkScanner CreateMicroblinkScanner(string licenseKey, string lice
return new MicroblinkScannerImplementation(licenseKey, licensee, showTimeLimitedLicenseWarning, AndroidHostActivity);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,16 @@ public bool ReturnSignatureImage
set => nativeRecognizer.SetReturnSignatureImage(value);
}

public bool ScanCroppedDocumentImage
public bool SaveCameraFrames
{
get => nativeRecognizer.ShouldScanCroppedDocumentImage();
set => nativeRecognizer.SetScanCroppedDocumentImage(value);
get => nativeRecognizer.ShouldSaveCameraFrames();
set => nativeRecognizer.SetSaveCameraFrames(value);
}

public bool SignResult
public bool ScanCroppedDocumentImage
{
get => nativeRecognizer.ShouldSignResult();
set => nativeRecognizer.SetSignResult(value);
get => nativeRecognizer.ShouldScanCroppedDocumentImage();
set => nativeRecognizer.SetScanCroppedDocumentImage(value);
}

public int SignatureImageDpi
Expand Down Expand Up @@ -147,19 +147,21 @@ internal BlinkIdCombinedRecognizerResult(Com.Microblink.Entities.Recognizers.Bli
}
public string AdditionalAddressInformation => nativeResult.AdditionalAddressInformation;
public string AdditionalNameInformation => nativeResult.AdditionalNameInformation;
public string AdditionalOptionalAddressInformation => nativeResult.AdditionalOptionalAddressInformation;
public string Address => nativeResult.Address;
public int Age => (int)nativeResult.Age;
public Xamarin.Forms.ImageSource BackCameraFrame => nativeResult.BackCameraFrame != null ? Utils.ConvertAndroidBitmap(nativeResult.BackCameraFrame.ConvertToBitmap()) : null;
public IImageAnalysisResult BackImageAnalysisResult => new ImageAnalysisResult(nativeResult.BackImageAnalysisResult);
public ProcessingStatus BackProcessingStatus => (ProcessingStatus)nativeResult.BackProcessingStatus.Ordinal();
public IVizResult BackVizResult => new VizResult(nativeResult.BackVizResult);
public Xamarin.Forms.ImageSource BarcodeCameraFrame => nativeResult.BarcodeCameraFrame != null ? Utils.ConvertAndroidBitmap(nativeResult.BarcodeCameraFrame.ConvertToBitmap()) : null;
public IBarcodeResult BarcodeResult => new BarcodeResult(nativeResult.BarcodeResult);
public IClassInfo ClassInfo => nativeResult.ClassInfo != null ? new ClassInfo(nativeResult.ClassInfo) : null;
public IDataMatchDetailedInfo DataMatchDetailedInfo => new DataMatchDetailedInfo(nativeResult.DataMatchDetailedInfo);
public IDate DateOfBirth => nativeResult.DateOfBirth.Date != null ? new Date(nativeResult.DateOfBirth.Date) : null;
public IDate DateOfExpiry => nativeResult.DateOfExpiry.Date != null ? new Date(nativeResult.DateOfExpiry.Date) : null;
public bool DateOfExpiryPermanent => nativeResult.IsDateOfExpiryPermanent;
public IDate DateOfIssue => nativeResult.DateOfIssue.Date != null ? new Date(nativeResult.DateOfIssue.Date) : null;
public byte[] DigitalSignature => nativeResult.GetDigitalSignature();
public int DigitalSignatureVersion => (int)nativeResult.DigitalSignatureVersion;
public string DocumentAdditionalNumber => nativeResult.DocumentAdditionalNumber;
public DataMatchResult DocumentDataMatch => (DataMatchResult)nativeResult.DocumentDataMatch.Ordinal();
public string DocumentNumber => nativeResult.DocumentNumber;
Expand All @@ -170,6 +172,7 @@ internal BlinkIdCombinedRecognizerResult(Com.Microblink.Entities.Recognizers.Bli
public Xamarin.Forms.ImageSource FaceImage => nativeResult.FaceImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FaceImage.ConvertToBitmap()) : null;
public string FathersName => nativeResult.FathersName;
public string FirstName => nativeResult.FirstName;
public Xamarin.Forms.ImageSource FrontCameraFrame => nativeResult.FrontCameraFrame != null ? Utils.ConvertAndroidBitmap(nativeResult.FrontCameraFrame.ConvertToBitmap()) : null;
public IImageAnalysisResult FrontImageAnalysisResult => new ImageAnalysisResult(nativeResult.FrontImageAnalysisResult);
public ProcessingStatus FrontProcessingStatus => (ProcessingStatus)nativeResult.FrontProcessingStatus.Ordinal();
public IVizResult FrontVizResult => new VizResult(nativeResult.FrontVizResult);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public bool ReturnSignatureImage
set => nativeRecognizer.SetReturnSignatureImage(value);
}

public bool SaveCameraFrames
{
get => nativeRecognizer.ShouldSaveCameraFrames();
set => nativeRecognizer.SetSaveCameraFrames(value);
}

public bool ScanCroppedDocumentImage
{
get => nativeRecognizer.ShouldScanCroppedDocumentImage();
Expand Down Expand Up @@ -123,9 +129,12 @@ internal BlinkIdRecognizerResult(Com.Microblink.Entities.Recognizers.Blinkid.Gen
}
public string AdditionalAddressInformation => nativeResult.AdditionalAddressInformation;
public string AdditionalNameInformation => nativeResult.AdditionalNameInformation;
public string AdditionalOptionalAddressInformation => nativeResult.AdditionalOptionalAddressInformation;
public string Address => nativeResult.Address;
public int Age => (int)nativeResult.Age;
public Xamarin.Forms.ImageSource BarcodeCameraFrame => nativeResult.BarcodeCameraFrame != null ? Utils.ConvertAndroidBitmap(nativeResult.BarcodeCameraFrame.ConvertToBitmap()) : null;
public IBarcodeResult BarcodeResult => new BarcodeResult(nativeResult.BarcodeResult);
public Xamarin.Forms.ImageSource CameraFrame => nativeResult.CameraFrame != null ? Utils.ConvertAndroidBitmap(nativeResult.CameraFrame.ConvertToBitmap()) : null;
public IClassInfo ClassInfo => nativeResult.ClassInfo != null ? new ClassInfo(nativeResult.ClassInfo) : null;
public IDate DateOfBirth => nativeResult.DateOfBirth.Date != null ? new Date(nativeResult.DateOfBirth.Date) : null;
public IDate DateOfExpiry => nativeResult.DateOfExpiry.Date != null ? new Date(nativeResult.DateOfExpiry.Date) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ public bool ReturnFullDocumentImage
set => nativeRecognizer.SetReturnFullDocumentImage(value);
}

public bool SignResult
{
get => nativeRecognizer.ShouldSignResult();
set => nativeRecognizer.SetSignResult(value);
}

}

public sealed class MrtdCombinedRecognizerResult : RecognizerResult, IMrtdCombinedRecognizerResult
Expand All @@ -97,8 +91,6 @@ internal MrtdCombinedRecognizerResult(Com.Microblink.Entities.Recognizers.Blinki
{
this.nativeResult = nativeResult;
}
public byte[] DigitalSignature => nativeResult.GetDigitalSignature();
public int DigitalSignatureVersion => (int)nativeResult.DigitalSignatureVersion;
public DataMatchResult DocumentDataMatch => (DataMatchResult)nativeResult.DocumentDataMatch.Ordinal();
public Xamarin.Forms.ImageSource FaceImage => nativeResult.FaceImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FaceImage.ConvertToBitmap()) : null;
public Xamarin.Forms.ImageSource FullDocumentBackImage => nativeResult.FullDocumentBackImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentBackImage.ConvertToBitmap()) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@ public bool ReturnFullDocumentImage
set => nativeRecognizer.SetReturnFullDocumentImage(value);
}

public bool SignResult
{
get => nativeRecognizer.ShouldSignResult();
set => nativeRecognizer.SetSignResult(value);
}

}

public sealed class PassportRecognizerResult : RecognizerResult, IPassportRecognizerResult
Expand All @@ -79,8 +73,6 @@ internal PassportRecognizerResult(Com.Microblink.Entities.Recognizers.Blinkid.Pa
{
this.nativeResult = nativeResult;
}
public byte[] DigitalSignature => nativeResult.GetDigitalSignature();
public int DigitalSignatureVersion => (int)nativeResult.DigitalSignatureVersion;
public Xamarin.Forms.ImageSource FaceImage => nativeResult.FaceImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FaceImage.ConvertToBitmap()) : null;
public Xamarin.Forms.ImageSource FullDocumentImage => nativeResult.FullDocumentImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentImage.ConvertToBitmap()) : null;
public IMrzResult MrzResult => new MrzResult(nativeResult.MrzResult);
Expand Down
Loading

0 comments on commit 1456c9e

Please sign in to comment.