Merge pull request #60 from BlinkID/release/5.11.0

Release/5.11.0
BlinkID · Apr 16, 2021 · c2c8c42 · c2c8c42
2 parents 08ded4d + c773c9c
commit c2c8c42
Show file tree

Hide file tree

Showing 271 changed files with 16,739 additions and 3,230 deletions.
diff --git a/Binding/Android/AndroidBinding.csproj b/Binding/Android/AndroidBinding.csproj
@@ -16,13 +16,13 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <PackageId>BlinkID.Android.Binding</PackageId>
-    <PackageVersion>5.10.0</PackageVersion>
+    <PackageVersion>5.11.0</PackageVersion>
     <Authors>Microblink</Authors>
     <Owners>Microblink</Owners>
     <PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
-    <PackageReleaseNotes>Updated to BlinkID Android SDK v5.10.0
+    <PackageReleaseNotes>Updated to BlinkID Android SDK v5.11.0
 
-https://github.com/BlinkID/blinkid-android/releases/tag/v5.10.0</PackageReleaseNotes>
+https://github.com/BlinkID/blinkid-android/releases/tag/v5.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>

diff --git a/Binding/Android/Jars/LibBlinkID.aar b/Binding/Android/Jars/LibBlinkID.aar
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
@@ -9,13 +9,15 @@
     <ProjectGuid>{EDDC7CF7-5D2A-40CF-A660-CE81A6580A34}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
-    <RootNamespace>Microblink.Forms.Droid</RootNamespace>
+    <RootNamespace>BlinkID.Forms.Droid</RootNamespace>
     <AssemblyName>BlinkID</AssemblyName>
     <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <PackageId>BlinkID.Forms.Android</PackageId>
-    <PackageVersion>5.10.0</PackageVersion>
+    <PackageVersion>5.11.0</PackageVersion>
     <Authors>Microblink</Authors>
     <Owners>Microblink</Owners>
     <PackageProjectUrl>https://github.com/blinkid/blinkid-xamarin</PackageProjectUrl>
@@ -24,9 +26,9 @@
     <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 v5.10.0
+    <PackageReleaseNotes>Updated for BlinkID Android SDK v5.11.0
 
-https://github.com/BlinkID/blinkid-android/releases/tag/v5.10.0</PackageReleaseNotes>
+https://github.com/BlinkID/blinkid-android/releases/tag/v5.11.0</PackageReleaseNotes>
     <!-- Workaround for build error  -->
     <DesignTimeBuild>false</DesignTimeBuild>
   </PropertyGroup>
@@ -206,6 +208,7 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.10.0</PackageReleaseN
     <Compile Include="Overlays/Implementations/BlinkIdOverlaySettings.cs" />
     <Compile Include="Overlays/Implementations/DocumentOverlaySettings.cs" />
     <Compile Include="Overlays/Implementations/DocumentVerificationOverlaySettings.cs" />
+    <Compile Include="Resources/Resource.designer.cs" />
     <Compile Include="Properties/AssemblyInfo.cs" />
     <Compile Include="Recognizers/Recognizer.cs" />
     <Compile Include="Recognizers/RecognizerCollection.cs" />
@@ -237,6 +240,9 @@ https://github.com/BlinkID/blinkid-android/releases/tag/v5.10.0</PackageReleaseN
       <Name>AndroidBinding</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <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.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />

diff --git a/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/MicroblinkScannerImplementation.cs b/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/MicroblinkScannerImplementation.cs
@@ -1,20 +1,20 @@
-using Microblink.Forms.Droid;
+using BlinkID.Forms.Droid;
 using Xamarin.Forms;
-using Microblink.Forms.Core;
-using Microblink.Forms.Core.Overlays;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Core;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
 using Com.Microblink;
 using Com.Microblink.Uisettings;
-using Microblink.Forms.Droid.Overlays;
+using BlinkID.Forms.Droid.Overlays;
 using Com.Microblink.Entities.Recognizers;
 using Android.App;
 using Android.Content;
-using Microblink.Forms.Droid.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
 using Com.Microblink.Intent;
 using System;
 
 [assembly: Xamarin.Forms.Dependency(typeof(MicroblinkScannerFactoryImplementation))]
-namespace Microblink.Forms.Droid
+namespace BlinkID.Forms.Droid
 {
     public interface IMicroblinkScannerAndroidHostActivity
     {

diff --git a/...ms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/Implementations/BlinkIdOverlaySettings.cs b/...ms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/Implementations/BlinkIdOverlaySettings.cs
@@ -2,14 +2,14 @@
 using Android.Content;
 using Com.Microblink.Uisettings;
 using Com.Microblink.Fragment.Overlay.Blinkid.Reticleui;
-using Microblink.Forms.Core.Overlays;
-using Microblink.Forms.Core.Recognizers;
-using Microblink.Forms.Droid.Overlays.Implementations;
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Droid.Overlays;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Overlays.Implementations;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Droid.Overlays;
 
 [assembly: Xamarin.Forms.Dependency(typeof(BlinkIdOverlaySettingsFactory))]
-namespace Microblink.Forms.Droid.Overlays
+namespace BlinkID.Forms.Droid.Overlays
 {
     public sealed class BlinkIdOverlaySettings : RecognizerCollectionOverlaySettings, IBlinkIdOverlaySettings
     {
@@ -113,4 +113,4 @@ public IBlinkIdOverlaySettings CreateBlinkIdOverlaySettings(IRecognizerCollectio
             return new BlinkIdOverlaySettings(recognizerCollection);
         }
     }
-}
+}
diff --git a/...s/BlinkID.Forms/BlinkID.Forms.Android/Overlays/Implementations/DocumentOverlaySettings.cs b/...s/BlinkID.Forms/BlinkID.Forms.Android/Overlays/Implementations/DocumentOverlaySettings.cs
@@ -1,11 +1,11 @@
-using Microblink.Forms.Droid.Overlays;
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Overlays;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Overlays;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
 using Com.Microblink.Uisettings;
 
 [assembly: Xamarin.Forms.Dependency(typeof(DocumentOverlaySettingsFactory))]
-namespace Microblink.Forms.Droid.Overlays
+namespace BlinkID.Forms.Droid.Overlays
 {
     public sealed class DocumentOverlaySettings : RecognizerCollectionOverlaySettings, IDocumentOverlaySettings
     {
@@ -21,4 +21,4 @@ public IDocumentOverlaySettings CreateDocumentOverlaySettings(IRecognizerCollect
             return new DocumentOverlaySettings(recognizerCollection);
         }
     }
-}
+}
diff --git a/...rms/BlinkID.Forms.Android/Overlays/Implementations/DocumentVerificationOverlaySettings.cs b/...rms/BlinkID.Forms.Android/Overlays/Implementations/DocumentVerificationOverlaySettings.cs
@@ -2,13 +2,13 @@
 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;
-using Microblink.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Overlays.Implementations;
+using BlinkID.Forms.Droid.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(DocumentVerificationOverlaySettingsFactory))]
-namespace Microblink.Forms.Droid.Overlays.Implementations
+namespace BlinkID.Forms.Droid.Overlays.Implementations
 {
     public sealed class DocumentVerificationOverlaySettings : RecognizerCollectionOverlaySettings, IDocumentVerificationOverlaySettings
     {
@@ -60,4 +60,4 @@ public IDocumentVerificationOverlaySettings CreateDocumentVerificationOverlaySet
             return new DocumentVerificationOverlaySettings(recognizerCollection);
         }
     }
-}
+}
diff --git a/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/OverlaySettings.cs b/Binding/Forms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/OverlaySettings.cs
@@ -1,17 +1,36 @@
 
-using Microblink.Forms.Droid.Overlays;
-using Microblink.Forms.Core.Overlays;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Overlays;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid;
 using Com.Microblink.Uisettings;
+using Com.Microblink.Uisettings.Options;
+using Com.Microblink.Hardware.Camera;
 
-namespace Microblink.Forms.Droid.Overlays
+namespace BlinkID.Forms.Droid.Overlays
 {
-    public abstract class OverlaySettings : IOverlaySettings
+    public abstract class OverlaySettings : IOverlaySettings, IScanSoundOverlaySettings
     {
         private readonly UISettings _nativeUISEttings;
 
         public virtual UISettings NativeUISettings { 
             get {
+                CameraSettings cameraSettings = null;
+                if (UseFrontCamera) {
+                     cameraSettings = new CameraSettings.Builder().SetType(CameraType.CameraFrontface).Build();
+                } else {
+                    cameraSettings = new CameraSettings.Builder().SetType(CameraType.CameraDefault).Build();
+                }
+                _nativeUISEttings.SetCameraSettings(cameraSettings);
+
+                IBeepSoundUIOptions beepSoundOptions = _nativeUISEttings as IBeepSoundUIOptions;
+                if (beepSoundOptions != null) {
+                    if (EnableBeep) {
+                        beepSoundOptions.SetBeepSoundResourceID(Resource.Raw.beep);
+                    } else {
+                        beepSoundOptions.SetBeepSoundResourceID(0);
+                    }
+                }
                 return _nativeUISEttings;
             }
         }
@@ -20,5 +39,9 @@ protected OverlaySettings(UISettings nativeUISettings)
         {
             _nativeUISEttings = nativeUISettings;
         }
+
+        public bool UseFrontCamera { get; set; } = false;
+
+        public bool EnableBeep { get; set; } = false;
     }
 }
diff --git a/...Forms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/RecognizerCollectionOverlaySettings.cs b/...Forms/BlinkID.Forms/BlinkID.Forms.Android/Overlays/RecognizerCollectionOverlaySettings.cs
@@ -1,10 +1,10 @@
 
-using Microblink.Forms.Droid.Overlays;
-using Microblink.Forms.Core.Overlays;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Overlays;
+using BlinkID.Forms.Core.Overlays;
+using BlinkID.Forms.Core.Recognizers;
 using Com.Microblink.Uisettings;
 
-namespace Microblink.Forms.Droid.Overlays
+namespace BlinkID.Forms.Droid.Overlays
 {
     public abstract class RecognizerCollectionOverlaySettings : OverlaySettings
     {

diff --git a/...nkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/BlinkIdCombinedRecognizer.cs b/...nkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/BlinkIdCombinedRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(BlinkIdCombinedRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class BlinkIdCombinedRecognizer : Recognizer, IBlinkIdCombinedRecognizer
     {

diff --git a/...orms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/BlinkIdRecognizer.cs b/...orms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/BlinkIdRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(BlinkIdRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class BlinkIdRecognizer : Recognizer, IBlinkIdRecognizer
     {

diff --git a/...BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/DocumentFaceRecognizer.cs b/...BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/DocumentFaceRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(DocumentFaceRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class DocumentFaceRecognizer : Recognizer, IDocumentFaceRecognizer
     {

diff --git a/...ms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/IdBarcodeRecognizer.cs b/...ms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/IdBarcodeRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(IdBarcodeRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class IdBarcodeRecognizer : Recognizer, IIdBarcodeRecognizer
     {

diff --git a/...BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/MrtdCombinedRecognizer.cs b/...BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/MrtdCombinedRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(MrtdCombinedRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class MrtdCombinedRecognizer : Recognizer, IMrtdCombinedRecognizer
     {

diff --git a/...g/Forms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/MrtdRecognizer.cs b/...g/Forms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/MrtdRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(MrtdRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class MrtdRecognizer : Recognizer, IMrtdRecognizer
     {

diff --git a/...rms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/PassportRecognizer.cs b/...rms/BlinkID.Forms/BlinkID.Forms.Android/Recognizers/Implementations/PassportRecognizer.cs
@@ -1,8 +1,8 @@
-using Microblink.Forms.Droid.Recognizers;
-using Microblink.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
 
 [assembly: Xamarin.Forms.Dependency(typeof(PassportRecognizer))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class PassportRecognizer : Recognizer, IPassportRecognizer
     {

diff --git a/....Forms/BlinkID.Forms.Android/Recognizers/Implementations/SuccessFrameGrabberRecognizer.cs b/....Forms/BlinkID.Forms.Android/Recognizers/Implementations/SuccessFrameGrabberRecognizer.cs
@@ -1,21 +1,21 @@
-using Microblink.Forms.Core.Recognizers;
-using Microblink.Forms.Droid.Recognizers;
+using BlinkID.Forms.Core.Recognizers;
+using BlinkID.Forms.Droid.Recognizers;
 using Xamarin.Forms;
-
+
 [assembly: Dependency(typeof(SuccessFrameGrabberRecognizerFactory))]
-namespace Microblink.Forms.Droid.Recognizers
+namespace BlinkID.Forms.Droid.Recognizers
 {
     public sealed class SuccessFrameGrabberRecognizer : Recognizer, ISuccessFrameGrabberRecognizer
-    {
-        Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer nativeRecognizer;
-        Recognizer slaveRecognizer;
-        SuccessFrameGrabberRecognizerResult result;
+    {
+        Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer nativeRecognizer;
+        Recognizer slaveRecognizer;
+        SuccessFrameGrabberRecognizerResult result;
 
-        public SuccessFrameGrabberRecognizer(Recognizer slaveRecognizer)
+        public SuccessFrameGrabberRecognizer(Recognizer slaveRecognizer)
             : base(new Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer(slaveRecognizer.NativeRecognizer))
-        {
-            nativeRecognizer = NativeRecognizer as Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer;
-            this.slaveRecognizer = slaveRecognizer;
+        {
+            nativeRecognizer = NativeRecognizer as Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer;
+            this.slaveRecognizer = slaveRecognizer;
             result = new SuccessFrameGrabberRecognizerResult(nativeRecognizer.GetResult() as Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer.Result);
         }
 
@@ -27,23 +27,23 @@ public SuccessFrameGrabberRecognizer(Recognizer slaveRecognizer)
     }
 
     public sealed class SuccessFrameGrabberRecognizerResult : RecognizerResult, ISuccessFrameGrabberRecognizerResult
-    {
-        Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer.Result nativeResult;
+    {
+        Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer.Result nativeResult;
 
         internal SuccessFrameGrabberRecognizerResult(Com.Microblink.Entities.Recognizers.Successframe.SuccessFrameGrabberRecognizer.Result nativeResult) : base(nativeResult)
-        {
+        {
             this.nativeResult = nativeResult;
         }
 
         public ImageSource SuccessFrame => Utils.ConvertAndroidBitmap(nativeResult.SuccessFrame.ConvertToBitmap());
-    }
-
-    public sealed class SuccessFrameGrabberRecognizerFactory : ISuccessFrameGrabberRecognizerFactory
+    }
+
+    public sealed class SuccessFrameGrabberRecognizerFactory : ISuccessFrameGrabberRecognizerFactory
     {
         public ISuccessFrameGrabberRecognizer CreateSuccessFrameGrabberRecognizer(IRecognizer slaveRecognizer)
         {
             return new SuccessFrameGrabberRecognizer(slaveRecognizer as Recognizer);
         }
-    }
+    }
 
-}
+}