Skip to content

Commit

Permalink
Merge pull request #35 from BlinkID/release/v4.11.0
Browse files Browse the repository at this point in the history
Release/v4.11.0
  • Loading branch information
i1E authored Aug 21, 2019
2 parents 82ad9be + 97204c7 commit 904d5e8
Show file tree
Hide file tree
Showing 66 changed files with 2,272 additions and 191 deletions.
6 changes: 3 additions & 3 deletions Binding/Android/AndroidBinding.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidClassParser>class-parse</AndroidClassParser>
<PackageId>BlinkID.Android.Binding</PackageId>
<PackageVersion>4.10.0</PackageVersion>
<PackageVersion>4.11.0</PackageVersion>
<Authors>Microblink</Authors>
<Owners>Microblink</Owners>
<PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
<PackageReleaseNotes>Updated to BlinkID Android SDK v4.10.0:
<PackageReleaseNotes>Updated to BlinkID Android SDK v4.11.0:

https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseNotes>
https://github.com/BlinkID/blinkid-android/releases/tag/v4.11.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>
Expand Down
4 changes: 2 additions & 2 deletions Binding/Android/Jars/LibBlinkID.aar
Git LFS file not shown
2 changes: 0 additions & 2 deletions Binding/Android/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

<remove-node path="/api/package[@name='com.microblink.entities.parsers']/class[@name='Parser']/method[@name='consumeResult']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.fragment')]" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/class/method[@name='consumeResultFrom']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/class/method[@name='clone']" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<PackageId>BlinkID.Forms.Android</PackageId>
<PackageVersion>4.10.0</PackageVersion>
<PackageVersion>4.11.0</PackageVersion>
<Authors>Microblink</Authors>
<Owners>Microblink</Owners>
<PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
Expand All @@ -23,8 +23,10 @@
<Description>A small, but powerful ID scanning library - Android implementation for Xamarin Forms.</Description>
<ReleaseVersion>4.0.0</ReleaseVersion>
<PackOnBuild>true</PackOnBuild>
<PackageReleaseNotes>- Updated for BlinkID Android SDK v4.10.0:
https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseNotes>
<PackageReleaseNotes>- Updated for BlinkID Android SDK v4.11.0:
https://github.com/BlinkID/blinkid-android/releases/tag/v4.11.0</PackageReleaseNotes>
<!-- Workaround for build error -->
<DesignTimeBuild>false</DesignTimeBuild>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -200,6 +202,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseN
<Compile Include="Recognizers/Utils.cs" />
<Compile Include="Recognizers/Types/BlinkIDTypes.cs" />
<Compile Include="Recognizers/Types/CommonTypes.cs" />
<Compile Include="Recognizers/Implementations/VisaRecognizer.cs" />
<Compile Include="Recognizers/Implementations/MrtdCombinedRecognizer.cs" />
<Compile Include="Recognizers/Implementations/IndonesiaIdFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/EudlRecognizer.cs" />
Expand Down Expand Up @@ -235,6 +238,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseN
<Compile Include="Recognizers/Implementations/SlovakiaIdFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/PassportRecognizer.cs" />
<Compile Include="Recognizers/Implementations/SlovakiaCombinedRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BelgiumCombinedRecognizer.cs" />
<Compile Include="Recognizers/Implementations/MalaysiaMyPrFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/VinRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BlinkIdCombinedRecognizer.cs" />
Expand All @@ -250,6 +254,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseN
<Compile Include="Recognizers/Implementations/MalaysiaMyKasFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/CzechiaCombinedRecognizer.cs" />
<Compile Include="Recognizers/Implementations/PolandCombinedRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BelgiumIdFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/MoroccoIdFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BruneiIdBackRecognizer.cs" />
<Compile Include="Recognizers/Implementations/MalaysiaIkadFrontRecognizer.cs" />
Expand Down Expand Up @@ -294,6 +299,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.10.0</PackageReleaseN
<Compile Include="Recognizers/Implementations/SwitzerlandIdBackRecognizer.cs" />
<Compile Include="Recognizers/Implementations/SloveniaIdBackRecognizer.cs" />
<Compile Include="Recognizers/Implementations/JordanIdFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BelgiumIdBackRecognizer.cs" />
<Compile Include="Recognizers/Implementations/BlinkCardRecognizer.cs" />
<Compile Include="Recognizers/Implementations/SpainDlFrontRecognizer.cs" />
<Compile Include="Recognizers/Implementations/SuccessFrameGrabberRecognizer.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using Android.Content;
using Com.Microblink.Uisettings;
using Com.Microblink.Fragment.Overlay.Blinkcard.Scanlineui;
using Microblink.Forms.Core.Overlays;
using Microblink.Forms.Core.Recognizers;
using Microblink.Forms.Droid.Overlays.Implementations;
Expand All @@ -13,12 +15,14 @@ public sealed class BlinkCardOverlaySettings : OverlaySettings, IBlinkCardOverla
public override UISettings NativeUISettings {
get {
var concreteUISettings = (BlinkCardUISettings)base.NativeUISettings;
var overlayStringsBuilder = new ScanLineOverlayStrings.Builder(Android.App.Application.Context);
if (FirstSideInstructions != null) {
concreteUISettings.FirstSideInstructions = FirstSideInstructions;
overlayStringsBuilder.SetFrontSideInstructions(FirstSideInstructions);
}
if (SecondSideInstructions != null) {
concreteUISettings.SecondSideInstructions = SecondSideInstructions;
overlayStringsBuilder.SetBackSideInstructions(SecondSideInstructions);
}
concreteUISettings.SetStrings(overlayStringsBuilder.Build());
return concreteUISettings;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using Android.Content;
using Com.Microblink.Uisettings;
using Com.Microblink.Fragment.Overlay.Blinkid.Documentverification;
using Microblink.Forms.Core.Overlays;
using Microblink.Forms.Core.Recognizers;
using Microblink.Forms.Droid.Overlays.Implementations;
Expand All @@ -13,21 +15,23 @@ public sealed class DocumentVerificationOverlaySettings : OverlaySettings, IDocu
public override UISettings NativeUISettings {
get {
var concreteUISettings = (DocumentVerificationUISettings)base.NativeUISettings;
var overlayStringsBuilder = new DocumentVerificationOverlayStrings.Builder(Android.App.Application.Context);
if (FirstSideSplashMessage != null) {
concreteUISettings.FirstSideSplashMessage = FirstSideSplashMessage;
overlayStringsBuilder.SetFrontSideSplashText(FirstSideSplashMessage);
}
if (SecondSideSplashMessage != null) {
concreteUISettings.SecondSideSplashMessage = SecondSideSplashMessage;
overlayStringsBuilder.SetBackSideSplashText(SecondSideSplashMessage);
}
if (FirstSideInstructions != null) {
concreteUISettings.FirstSideInstructions = FirstSideInstructions;
overlayStringsBuilder.SetFrontSideInstructions(FirstSideInstructions);
}
if (SecondSideInstructions != null) {
concreteUISettings.SecondSideInstructions = SecondSideInstructions;
overlayStringsBuilder.SetBackSideInstructions(SecondSideInstructions);
}
if (GlareMessage != null) {
concreteUISettings.GlareMessage = GlareMessage;
overlayStringsBuilder.SetGlareMessage(GlareMessage);
}
concreteUISettings.SetStrings(overlayStringsBuilder.Build());
return concreteUISettings;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
using Microblink.Forms.Droid.Recognizers;
using Microblink.Forms.Core.Recognizers;

[assembly: Xamarin.Forms.Dependency(typeof(BelgiumCombinedRecognizer))]
namespace Microblink.Forms.Droid.Recognizers
{
public sealed class BelgiumCombinedRecognizer : Recognizer, IBelgiumCombinedRecognizer
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer nativeRecognizer;

BelgiumCombinedRecognizerResult result;

public BelgiumCombinedRecognizer() : base(new Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer())
{
nativeRecognizer = NativeRecognizer as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer;
result = new BelgiumCombinedRecognizerResult(nativeRecognizer.GetResult() as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer.Result);
}

public override IRecognizerResult BaseResult => result;

public IBelgiumCombinedRecognizerResult Result => result;


public bool DetectGlare
{
get => nativeRecognizer.ShouldDetectGlare();
set => nativeRecognizer.SetDetectGlare(value);
}

public uint FaceImageDpi
{
get => (uint)nativeRecognizer.FaceImageDpi;
set => nativeRecognizer.FaceImageDpi = (int)value;
}

public uint FullDocumentImageDpi
{
get => (uint)nativeRecognizer.FullDocumentImageDpi;
set => nativeRecognizer.FullDocumentImageDpi = (int)value;
}

public IImageExtensionFactors FullDocumentImageExtensionFactors
{
get => new ImageExtensionFactors(nativeRecognizer.FullDocumentImageExtensionFactors);
set => nativeRecognizer.FullDocumentImageExtensionFactors = (value as ImageExtensionFactors).NativeImageExtensionFactors;
}

public bool ReturnFaceImage
{
get => nativeRecognizer.ShouldReturnFaceImage();
set => nativeRecognizer.SetReturnFaceImage(value);
}

public bool ReturnFullDocumentImage
{
get => nativeRecognizer.ShouldReturnFullDocumentImage();
set => nativeRecognizer.SetReturnFullDocumentImage(value);
}

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

}

public sealed class BelgiumCombinedRecognizerResult : RecognizerResult, IBelgiumCombinedRecognizerResult
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer.Result nativeResult;

internal BelgiumCombinedRecognizerResult(Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumCombinedRecognizer.Result nativeResult) : base(nativeResult)
{
this.nativeResult = nativeResult;
}
public string CardNumber => nativeResult.CardNumber;
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 byte[] DigitalSignature => nativeResult.GetDigitalSignature();
public uint DigitalSignatureVersion => (uint)nativeResult.DigitalSignatureVersion;
public bool DocumentDataMatch => nativeResult.IsDocumentDataMatch;
public Xamarin.Forms.ImageSource FaceImage => nativeResult.FaceImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FaceImage.ConvertToBitmap()) : null;
public string FirstName => nativeResult.FirstName;
public Xamarin.Forms.ImageSource FullDocumentBackImage => nativeResult.FullDocumentBackImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentBackImage.ConvertToBitmap()) : null;
public Xamarin.Forms.ImageSource FullDocumentFrontImage => nativeResult.FullDocumentFrontImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentFrontImage.ConvertToBitmap()) : null;
public string IssuedBy => nativeResult.IssuedBy;
public string LastName => nativeResult.LastName;
public bool MrzVerified => nativeResult.IsMrzVerified;
public string Nationality => nativeResult.Nationality;
public bool ScanningFirstSideDone => nativeResult.IsScanningFirstSideDone;
public string Sex => nativeResult.Sex;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
using Microblink.Forms.Droid.Recognizers;
using Microblink.Forms.Core.Recognizers;

[assembly: Xamarin.Forms.Dependency(typeof(BelgiumIdBackRecognizer))]
namespace Microblink.Forms.Droid.Recognizers
{
public sealed class BelgiumIdBackRecognizer : Recognizer, IBelgiumIdBackRecognizer
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer nativeRecognizer;

BelgiumIdBackRecognizerResult result;

public BelgiumIdBackRecognizer() : base(new Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer())
{
nativeRecognizer = NativeRecognizer as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer;
result = new BelgiumIdBackRecognizerResult(nativeRecognizer.GetResult() as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer.Result);
}

public override IRecognizerResult BaseResult => result;

public IBelgiumIdBackRecognizerResult Result => result;


public bool DetectGlare
{
get => nativeRecognizer.ShouldDetectGlare();
set => nativeRecognizer.SetDetectGlare(value);
}

public uint FullDocumentImageDpi
{
get => (uint)nativeRecognizer.FullDocumentImageDpi;
set => nativeRecognizer.FullDocumentImageDpi = (int)value;
}

public IImageExtensionFactors FullDocumentImageExtensionFactors
{
get => new ImageExtensionFactors(nativeRecognizer.FullDocumentImageExtensionFactors);
set => nativeRecognizer.FullDocumentImageExtensionFactors = (value as ImageExtensionFactors).NativeImageExtensionFactors;
}

public bool ReturnFullDocumentImage
{
get => nativeRecognizer.ShouldReturnFullDocumentImage();
set => nativeRecognizer.SetReturnFullDocumentImage(value);
}

}

public sealed class BelgiumIdBackRecognizerResult : RecognizerResult, IBelgiumIdBackRecognizerResult
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer.Result nativeResult;

internal BelgiumIdBackRecognizerResult(Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdBackRecognizer.Result nativeResult) : base(nativeResult)
{
this.nativeResult = nativeResult;
}
public Xamarin.Forms.ImageSource FullDocumentImage => nativeResult.FullDocumentImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentImage.ConvertToBitmap()) : null;
public IMrzResult MrzResult => new MrzResult(nativeResult.MrzResult);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using Microblink.Forms.Droid.Recognizers;
using Microblink.Forms.Core.Recognizers;

[assembly: Xamarin.Forms.Dependency(typeof(BelgiumIdFrontRecognizer))]
namespace Microblink.Forms.Droid.Recognizers
{
public sealed class BelgiumIdFrontRecognizer : Recognizer, IBelgiumIdFrontRecognizer
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer nativeRecognizer;

BelgiumIdFrontRecognizerResult result;

public BelgiumIdFrontRecognizer() : base(new Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer())
{
nativeRecognizer = NativeRecognizer as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer;
result = new BelgiumIdFrontRecognizerResult(nativeRecognizer.GetResult() as Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer.Result);
}

public override IRecognizerResult BaseResult => result;

public IBelgiumIdFrontRecognizerResult Result => result;


public bool DetectGlare
{
get => nativeRecognizer.ShouldDetectGlare();
set => nativeRecognizer.SetDetectGlare(value);
}

public uint FaceImageDpi
{
get => (uint)nativeRecognizer.FaceImageDpi;
set => nativeRecognizer.FaceImageDpi = (int)value;
}

public uint FullDocumentImageDpi
{
get => (uint)nativeRecognizer.FullDocumentImageDpi;
set => nativeRecognizer.FullDocumentImageDpi = (int)value;
}

public IImageExtensionFactors FullDocumentImageExtensionFactors
{
get => new ImageExtensionFactors(nativeRecognizer.FullDocumentImageExtensionFactors);
set => nativeRecognizer.FullDocumentImageExtensionFactors = (value as ImageExtensionFactors).NativeImageExtensionFactors;
}

public bool ReturnFaceImage
{
get => nativeRecognizer.ShouldReturnFaceImage();
set => nativeRecognizer.SetReturnFaceImage(value);
}

public bool ReturnFullDocumentImage
{
get => nativeRecognizer.ShouldReturnFullDocumentImage();
set => nativeRecognizer.SetReturnFullDocumentImage(value);
}

}

public sealed class BelgiumIdFrontRecognizerResult : RecognizerResult, IBelgiumIdFrontRecognizerResult
{
Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer.Result nativeResult;

internal BelgiumIdFrontRecognizerResult(Com.Microblink.Entities.Recognizers.Blinkid.Belgium.BelgiumIdFrontRecognizer.Result nativeResult) : base(nativeResult)
{
this.nativeResult = nativeResult;
}
public string CardNumber => nativeResult.CardNumber;
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;
}
}
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 TryBothOrientations
{
get => nativeRecognizer.TryBothOrientations;
set => nativeRecognizer.TryBothOrientations = value;
}

}

public sealed class DocumentFaceRecognizerResult : RecognizerResult, IDocumentFaceRecognizerResult
Expand Down
Loading

0 comments on commit 904d5e8

Please sign in to comment.