Merge pull request #26 from BlinkID/release/4.6.0

Release/4.6.0
BlinkID · Jan 25, 2019 · 68e1dd0 · 68e1dd0
2 parents 6dee49d + 95b6372
commit 68e1dd0
Show file tree

Hide file tree

Showing 150 changed files with 6,195 additions and 3,754 deletions.
diff --git a/Binding/Android/AndroidBinding.csproj b/Binding/Android/AndroidBinding.csproj
diff --git a/Binding/Android/Jars/LibBlinkID.aar b/Binding/Android/Jars/LibBlinkID.aar
diff --git a/Binding/Android/packages.config b/Binding/Android/packages.config
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NuGet.Build.Packaging" version="0.2.2" targetFramework="monoandroid81" developmentDependency="true" />
-  <package id="Xamarin.Android.Arch.Core.Common" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Annotations" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Collections" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Compat" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Core.UI" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Core.Utils" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.CustomView" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.DocumentFile" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Fragment" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Interpolator" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Loader" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Media.Compat" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Print" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0" targetFramework="monoandroid90" />
-  <package id="Xamarin.Android.Support.ViewPager" version="28.0.0" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Collections" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.CustomView" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.DocumentFile" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Interpolator" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Loader" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Print" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Android.Support.ViewPager" version="28.0.0.1" targetFramework="monoandroid90" />
 </packages>
diff --git a/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/BlinkID.Forms.Android.csproj b/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/BlinkID.Forms.Android.csproj
@@ -14,7 +14,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <PackageId>BlinkID.Forms.Android</PackageId>
-    <PackageVersion>4.5.0</PackageVersion>
+    <PackageVersion>4.6.0</PackageVersion>
     <Authors>Microblink</Authors>
     <Owners>Microblink</Owners>
     <PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
@@ -23,8 +23,8 @@
     <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.5.0:
-https://github.com/BlinkID/blinkid-android/releases/tag/v4.5.0</PackageReleaseNotes>
+    <PackageReleaseNotes>- Updated for BlinkID Android SDK v4.6.0:
+https://github.com/BlinkID/blinkid-android/releases/tag/v4.6.0</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -201,6 +201,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.5.0</PackageReleaseNo
     <Compile Include="Recognizers/Implementations/ElitePaymentCardBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/SloveniaCombinedRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/AustriaDlFrontRecognizer.cs" />
+    <Compile Include="Recognizers/Implementations/BruneiResidencePermitBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/CyprusIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/JordanIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/GermanyPassportRecognizer.cs" />
@@ -215,12 +216,14 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.5.0</PackageReleaseNo
     <Compile Include="Recognizers/Implementations/MalaysiaDlFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/ColombiaDlFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/UnitedArabEmiratesIdBackRecognizer.cs" />
+    <Compile Include="Recognizers/Implementations/GermanyDlFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/ElitePaymentCardFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/PolandIdFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/RomaniaIdFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MrtdRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/CzechiaIdFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/Pdf417Recognizer.cs" />
+    <Compile Include="Recognizers/Implementations/GermanyIdOldRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/CyprusOldIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/SimNumberRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/PaymentCardCombinedRecognizer.cs" />
@@ -235,7 +238,6 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.5.0</PackageReleaseNo
     <Compile Include="Recognizers/Implementations/MexicoVoterIdFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/CroatiaCombinedRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/HongKongIdFrontRecognizer.cs" />
-    <Compile Include="Recognizers/Implementations/GermanyOldIdRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/PaymentCardBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/AustraliaDlBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MalaysiaMyKadFrontRecognizer.cs" />
@@ -246,13 +248,15 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v4.5.0</PackageReleaseNo
     <Compile Include="Recognizers/Implementations/CzechiaCombinedRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/PolandCombinedRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MoroccoIdFrontRecognizer.cs" />
+    <Compile Include="Recognizers/Implementations/BruneiIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MalaysiaIkadFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MalaysiaMyTenteraFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/PaymentCardFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/IrelandDlFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/SerbiaIdFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/MoroccoIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/CzechiaIdBackRecognizer.cs" />
+    <Compile Include="Recognizers/Implementations/BruneiResidencePermitFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/NewZealandDlFrontRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/SlovakiaIdBackRecognizer.cs" />
     <Compile Include="Recognizers/Implementations/UsdlCombinedRecognizer.cs" />

diff --git a/...nkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/AustraliaDlBackRecognizer.cs b/...nkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/AustraliaDlBackRecognizer.cs
@@ -21,16 +21,16 @@ public AustraliaDlBackRecognizer() : base(new Com.Microblink.Entities.Recognizer
         public IAustraliaDlBackRecognizerResult Result => result;
 
 
-        public bool ExtractAddress 
+        public bool DetectGlare 
         { 
-            get => nativeRecognizer.ShouldExtractAddress(); 
-            set => nativeRecognizer.SetExtractAddress(value);
+            get => nativeRecognizer.ShouldDetectGlare(); 
+            set => nativeRecognizer.SetDetectGlare(value);
         }
 
-        public bool ExtractDateOfExpiry 
+        public bool ExtractAddress 
         { 
-            get => nativeRecognizer.ShouldExtractDateOfExpiry(); 
-            set => nativeRecognizer.SetExtractDateOfExpiry(value);
+            get => nativeRecognizer.ShouldExtractAddress(); 
+            set => nativeRecognizer.SetExtractAddress(value);
         }
 
         public bool ExtractLastName 
@@ -39,12 +39,30 @@ public bool ExtractLastName
             set => nativeRecognizer.SetExtractLastName(value);
         }
 
+        public bool ExtractLicenceNumber 
+        { 
+            get => nativeRecognizer.ShouldExtractLicenceNumber(); 
+            set => nativeRecognizer.SetExtractLicenceNumber(value);
+        }
+
+        public bool ExtractLicenseExpiry 
+        { 
+            get => nativeRecognizer.ShouldExtractLicenseExpiry(); 
+            set => nativeRecognizer.SetExtractLicenseExpiry(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(); 
@@ -62,9 +80,9 @@ internal AustraliaDlBackRecognizerResult(Com.Microblink.Entities.Recognizers.Bli
             this.nativeResult = nativeResult;
         }
         public string Address => nativeResult.Address;
-        public IDate DateOfExpiry => nativeResult.DateOfExpiry != null ? new Date(nativeResult.DateOfExpiry) : null;
         public Xamarin.Forms.ImageSource FullDocumentImage => nativeResult.FullDocumentImage != null ? Utils.ConvertAndroidBitmap(nativeResult.FullDocumentImage.ConvertToBitmap()) : null;
         public string LastName => nativeResult.LastName;
+        public IDate LicenceExpiry => nativeResult.LicenceExpiry.Date != null ? new Date(nativeResult.LicenceExpiry.Date) : null;
         public string LicenceNumber => nativeResult.LicenceNumber;
     }
 }
diff --git a/...kID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/AustraliaDlFrontRecognizer.cs b/...kID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/AustraliaDlFrontRecognizer.cs
@@ -21,6 +21,12 @@ public AustraliaDlFrontRecognizer() : base(new Com.Microblink.Entities.Recognize
         public IAustraliaDlFrontRecognizerResult Result => result;
 
 
+        public bool DetectGlare 
+        { 
+            get => nativeRecognizer.ShouldDetectGlare(); 
+            set => nativeRecognizer.SetDetectGlare(value);
+        }
+
         public bool ExtractAddress 
         { 
             get => nativeRecognizer.ShouldExtractAddress(); 
@@ -33,10 +39,22 @@ public bool ExtractDateOfBirth
             set => nativeRecognizer.SetExtractDateOfBirth(value);
         }
 
-        public bool ExtractDateOfExpiry 
+        public bool ExtractFullName 
+        { 
+            get => nativeRecognizer.ShouldExtractFullName(); 
+            set => nativeRecognizer.SetExtractFullName(value);
+        }
+
+        public bool ExtractLicenseExpiry 
         { 
-            get => nativeRecognizer.ShouldExtractDateOfExpiry(); 
-            set => nativeRecognizer.SetExtractDateOfExpiry(value);
+            get => nativeRecognizer.ShouldExtractLicenseExpiry(); 
+            set => nativeRecognizer.SetExtractLicenseExpiry(value);
+        }
+
+        public uint FaceImageDpi 
+        { 
+            get => (uint)nativeRecognizer.FaceImageDpi; 
+            set => nativeRecognizer.FaceImageDpi = (int)value;
         }
 
         public uint FullDocumentImageDpi 
@@ -45,6 +63,12 @@ public uint 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(); 
@@ -63,6 +87,12 @@ public bool ReturnSignatureImage
             set => nativeRecognizer.SetReturnSignatureImage(value);
         }
 
+        public uint SignatureImageDpi 
+        { 
+            get => (uint)nativeRecognizer.SignatureImageDpi; 
+            set => nativeRecognizer.SignatureImageDpi = (int)value;
+        }
+
     }
 
     public sealed class AustraliaDlFrontRecognizerResult : RecognizerResult, IAustraliaDlFrontRecognizerResult
@@ -74,13 +104,13 @@ internal AustraliaDlFrontRecognizerResult(Com.Microblink.Entities.Recognizers.Bl
             this.nativeResult = nativeResult;
         }
         public string Address => nativeResult.Address;
-        public IDate DateOfBirth => nativeResult.DateOfBirth != null ? new Date(nativeResult.DateOfBirth) : null;
-        public IDate DateOfExpiry => nativeResult.DateOfExpiry != null ? new Date(nativeResult.DateOfExpiry) : null;
+        public IDate DateOfBirth => nativeResult.DateOfBirth.Date != null ? new Date(nativeResult.DateOfBirth.Date) : null;
         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 string FullName => nativeResult.FullName;
+        public IDate LicenceExpiry => nativeResult.LicenceExpiry.Date != null ? new Date(nativeResult.LicenceExpiry.Date) : null;
         public string LicenceNumber => nativeResult.LicenceNumber;
         public string LicenceType => nativeResult.LicenceType;
-        public string Name => nativeResult.Name;
         public Xamarin.Forms.ImageSource SignatureImage => nativeResult.SignatureImage != null ? Utils.ConvertAndroidBitmap(nativeResult.SignatureImage.ConvertToBitmap()) : null;
     }
 }