Release 6.0 (#4)

Anyline · Mar 25, 2024 · 2e3f39e · 2e3f39e
1 parent 19306c8
commit 2e3f39e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 76 deletions.
diff --git a/MAUI/Anyline.Examples.MAUI.csproj b/MAUI/Anyline.Examples.MAUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-ios;net6.0-android</TargetFrameworks>
+		<TargetFrameworks>net7.0-ios;net7.0-android</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -18,24 +18,25 @@
 		<ApplicationIdGuid>9C37433F-9192-4C96-B49A-B9A7E047FBC2</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>5.0.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>6.0.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
 		<UserSecretsId>381bf50f-33f2-474a-b1b8-d1ec9021d557</UserSecretsId>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-android|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-android|AnyCPU'">
 		<MtouchLink>None</MtouchLink>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-android|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-android|AnyCPU'">
 		<MtouchLink>None</MtouchLink>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
-		<MtouchLink>None</MtouchLink>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
+		<MtouchLink>SdkOnly</MtouchLink>
+		<MtouchExtraArgs> --weak-framework=NewsstandKit</MtouchExtraArgs>
 		<BuildIpa>True</BuildIpa>
 		<IpaPackageName>Anyline MAUI Examples</IpaPackageName>
 		<IpaIncludeArtwork>True</IpaIncludeArtwork>
@@ -45,7 +46,7 @@
 		<CodesignEntitlements></CodesignEntitlements>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-ios|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
 		<CodesignKey>iPhone Distribution</CodesignKey>
 		<CodesignEntitlements>Platforms\iOS\Entitlements.plist</CodesignEntitlements>
 	</PropertyGroup>
@@ -78,8 +79,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Anyline.SDK.NET.Android" Version="5.0.0" />
-		<PackageReference Include="Anyline.SDK.NET.iOS" Version="5.0.0" />
+		<PackageReference Include="Anyline.SDK.NET.Android" Version="6.0.0" />
+		<PackageReference Include="Anyline.SDK.NET.iOS" Version="6.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 
@@ -103,7 +104,7 @@
 		  <Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
 		<!-- Required for the usage of the Face Detection feature on Universal ID / MRZ scan modes -->
 		<PackageReference Include="Xamarin.GooglePlayServices.MLKit.FaceDetection" Version="116.1.7" />
 		<PackageReference Include="Xamarin.Google.Dagger" Version="2.27.0" />

diff --git a/MAUI/Platforms/Android/CustomRenderers/AnylineScanningViewRenderer.cs b/MAUI/Platforms/Android/CustomRenderers/AnylineScanningViewRenderer.cs
@@ -6,7 +6,7 @@
 using Android.Util;
 using Android.Widget;
 using Anyline.Examples.MAUI.Views;
-using IO.Anyline.Camera;
+using IO.Anyline2.Camera;
 using IO.Anyline2;
 using IO.Anyline2.View;
 using Java.Util;

diff --git a/MAUI/Platforms/Android/Handlers/AnylineHandler.Android.cs b/MAUI/Platforms/Android/Handlers/AnylineHandler.Android.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Util;
 using Anyline.Examples.MAUI.Platforms.Android;
-using IO.Anyline.Camera;
+using IO.Anyline2.Camera;
 using IO.Anyline2.View;
 using Microsoft.Maui.Handlers;
 

diff --git a/MAUI/Platforms/Android/NFC/NFCScanningViewRenderer.cs b/MAUI/Platforms/Android/NFC/NFCScanningViewRenderer.cs
@@ -7,7 +7,7 @@
 using Android.Widget;
 using Anyline.Examples.MAUI.NFC;
 using Anyline.Examples.MAUI.Platforms.Android.NFC;
-using IO.Anyline.Camera;
+using IO.Anyline2.Camera;
 using IO.Anyline.Plugin.Result;
 using IO.Anyline2;
 using IO.Anyline2.View;

diff --git a/MAUI/Resources/Raw/Configs/workflows_config_serial_scanning.json b/MAUI/Resources/Raw/Configs/workflows_config_serial_scanning.json
@@ -13,81 +13,69 @@
       {
         "viewPluginConfig": {
           "pluginConfig": {
-            "id": "license-plate-eu",
+            "id": "Vehicle|License Plates (EU)",
             "licensePlateConfig": {
-              "scanMode": "auto"
             },
             "cancelOnResult": true
           },
           "cutoutConfig": {
-            "animation": "none",
             "maxWidthPercent": "80%",
             "maxHeightPercent": "80%",
             "alignment": "top_half",
             "ratioFromSize": {
-              "width": 4,
+              "width": 2,
               "height": 1
             },
-            "offset": {
-              "x": 0,
-              "y": 40
-            },
-            "cropPadding": {
-              "x": 0,
-              "y": 0
-            },
-            "cropOffset": {
-              "x": 0,
-              "y": 0
-            },
-            "cornerRadius": 4,
-            "strokeColor": "0099ff",
             "strokeWidth": 2,
-            "feedbackStrokeColor": "0099ff",
+            "cornerRadius": 10,
+            "strokeColor": "FFFFFF",
             "outerColor": "000000",
-            "outerAlpha": 0.3
+            "outerAlpha": 0.3,
+            "feedbackStrokeColor": "0099FF"
           },
           "scanFeedbackConfig": {
             "style": "rect",
             "strokeWidth": 2,
-            "animationDuration": 0,
-            "strokeColor": "0099ff",
+            "strokeColor": "0099FF",
+            "fillColor": "330099FF",
             "cornerRadius": 0,
-            "fillColor": "330099ff",
             "beepOnResult": true,
-            "vibrateOnResult": true
+            "vibrateOnResult": true,
+            "blinkAnimationOnResult": true
           }
         }
       },
       {
         "viewPluginConfig": {
           "pluginConfig": {
-            "id": "driver-license-eu",
+            "id": "ID|Universal IDs",
+            "cancelOnResult": true,
             "universalIdConfig": {
+              "faceDetectionEnabled": true,
               "allowedLayouts": {
-                "drivingLicense": []
-              },
-              "alphabet": "latin"
-            },
-            "cancelOnResult": true
+                "mrz": [],
+                "drivingLicense": [],
+                "idFront": [],
+                "insuranceCard": []
+              }
+            }
           },
           "cutoutConfig": {
-            "style": "animated_rect",
             "maxWidthPercent": "90%",
             "maxHeightPercent": "90%",
             "alignment": "center",
             "strokeWidth": 2,
-            "cornerRadius": 4,
-            "strokeColor": "0099FF",
+            "cornerRadius": 8,
+            "strokeColor": "FFFFFF",
             "outerColor": "000000",
             "outerAlpha": 0.3,
             "ratioFromSize": {
               "width": 50,
               "height": 31
             },
             "cropPadding": {
-              "x": 25,
-              "y": 25
+              "x": -50,
+              "y": -50
             },
             "cropOffset": {
               "x": 0,
@@ -96,7 +84,7 @@
             "feedbackStrokeColor": "0099FF"
           },
           "scanFeedbackConfig": {
-            "style": "CONTOUR_RECT",
+            "style": "contour_rect",
             "visualFeedbackRedrawTimeout": 100,
             "strokeColor": "0099FF",
             "fillColor": "220099FF",
@@ -109,47 +97,34 @@
       {
         "viewPluginConfig": {
           "pluginConfig": {
-            "id": "vin",
+            "id": "Vehicle|Vehicle Identification Numbers",
             "vinConfig": {},
             "cancelOnResult": true
           },
           "cutoutConfig": {
-            "animation": "none",
-            "maxWidthPercent": "90%",
-            "maxHeightPercent": "100%",
-            "width": 0,
             "alignment": "top_half",
+            "maxWidthPercent": "70%",
+            "maxHeightPercent": "70%",
             "ratioFromSize": {
-              "width": 11,
-              "height": 2
-            },
-            "offset": {
-              "x": 0,
-              "y": 0
-            },
-            "cropOffset": {
-              "x": 0,
-              "y": 0
-            },
-            "cropPadding": {
-              "x": 0,
-              "y": 0
+              "width": 7,
+              "height": 1
             },
+            "strokeWidth": 1,
+            "strokeColor": "FFFFFF",
             "cornerRadius": 2,
-            "strokeColor": "0099ff",
-            "strokeWidth": 2,
             "outerColor": "000000",
-            "feedbackStrokeColor": "0099FF",
-            "outerAlpha": 0.3
+            "outerAlpha": 0.3,
+            "feedbackStrokeColor": "0099FF"
           },
           "scanFeedbackConfig": {
+            "animation": "traverse_multi",
+            "animationDuration": 250,
             "style": "contour_rect",
             "strokeWidth": 2,
-            "cornerRadius": 2,
             "strokeColor": "0099FF",
-            "fillColor": "330099FF",
-            "beepOnResult": true,
-            "vibrateOnResult": true
+            "beepOnResult": false,
+            "vibrateOnResult": true,
+            "blinkAnimationOnResult": true
           }
         }
       }