- Updated to the latest beta packages

scan-mayank · scan-mayank · commit 9e8f4d83c609 · 2024-04-11T09:04:59.000+02:00
- Xamarin.Native iOS: Added a null check for handling results.
diff --git a/Example.Forms/ScanbotBarcodeSDKFormsExample.Android/ScanbotBarcodeSDKFormsExample.Android.csproj b/Example.Forms/ScanbotBarcodeSDKFormsExample.Android/ScanbotBarcodeSDKFormsExample.Android.csproj
@@ -18,6 +18,7 @@
     <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -54,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms">
-      <Version>4.2.0-beta.3</Version>
+      <Version>4.2.0-beta.5</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Scanbot.Xamarin.Forms.ImagePicker">
diff --git a/Example.Forms/ScanbotBarcodeSDKFormsExample.iOS/ScanbotBarcodeSDKFormsExample.iOS.csproj b/Example.Forms/ScanbotBarcodeSDKFormsExample.iOS/ScanbotBarcodeSDKFormsExample.iOS.csproj
@@ -125,7 +125,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms" Version="4.2.0-beta.3" />
+    <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms" Version="4.2.0-beta.5" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
     <PackageReference Include="Scanbot.Xamarin.Forms.ImagePicker">
diff --git a/Example/Droid/BarcodeScannerExample.Droid.csproj b/Example/Droid/BarcodeScannerExample.Droid.csproj
@@ -18,6 +18,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -154,7 +155,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ScanbotBarcodeSDK.Xamarin">
-      <Version>4.2.0-beta.3</Version>
+      <Version>4.2.0-beta.5</Version>
     </PackageReference>
     <PackageReference Include="Scanbot.Xamarin.ImagePicker">
       <Version>0.0.2</Version>
diff --git a/Example/iOS/BarcodeScannerExample.iOS.csproj b/Example/iOS/BarcodeScannerExample.iOS.csproj
@@ -74,16 +74,16 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ScanbotBarcodeSDK.iOS, Version=1.0.8866.42956, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ScanbotBarcodeSDK.Xamarin.4.2.0-beta.5\lib\xamarin.iOS10\ScanbotBarcodeSDK.iOS.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
     <Reference Include="Scanbot.ImagePicker.iOS">
       <HintPath>..\packages\Scanbot.Xamarin.ImagePicker.0.0.2\lib\Xamarin.iOS10\Scanbot.ImagePicker.iOS.dll</HintPath>
     </Reference>
-    <Reference Include="ScanbotBarcodeSDK.iOS">
-      <HintPath>..\packages\ScanbotBarcodeSDK.Xamarin.4.2.0-beta.3\lib\xamarin.iOS10\ScanbotBarcodeSDK.iOS.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing.Common.dll" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Example/iOS/Services/BarcodeResultReceiver.cs b/Example/iOS/Services/BarcodeResultReceiver.cs
@@ -42,7 +42,10 @@ public override bool ShouldDetectBarcodes(SBSDKBarcodeScannerViewController cont
 
         public override void DidDetectBarcodes(SBSDKBarcodeScannerViewController controller, SBSDKBarcodeScannerResult[] codes)
         {
-            ResultReceived?.Invoke(this, new ScannerEventArgs(codes.ToList(), codes.First()?.BarcodeImage));
+            if (codes.Length > 0)
+            {
+                ResultReceived?.Invoke(this, new ScannerEventArgs(codes.ToList(), codes.First()?.BarcodeImage));
+            }
         }
     }
 
@@ -51,11 +54,14 @@ public class BarcodeResultReceiver : SBSDKUIBarcodeScannerViewControllerDelegate
         public bool WaitForImage { get; set; }
 
         public EventHandler<ScannerEventArgs> ResultsReceived;
+        public Action OnDidCancel;
 
-        public override void DidDetectResults(
-            SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScannerResult[] barcodeResults)
+        public override void DidDetectResults(SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScannerResult[] barcodeResults)
         {
-            Invoke(viewController, barcodeResults, barcodeResults.First()?.BarcodeImage);
+            if (barcodeResults.Length > 0)
+            {
+                Invoke(viewController, barcodeResults, barcodeResults.First()?.BarcodeImage);
+            }
         }
 
         ScannerEventArgs args;
@@ -77,5 +83,10 @@ void Invoke(SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScan
 
             ResultsReceived?.Invoke(this, args);
         }
+
+        public override void DidCancel(SBSDKUIBarcodeScannerViewController viewController)
+        {
+            OnDidCancel?.Invoke();
+        }
     }
 }
diff --git a/Example/iOS/packages.config b/Example/iOS/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Scanbot.Xamarin.ImagePicker" version="0.0.2" targetFramework="xamarinios10" />
-  <package id="ScanbotBarcodeSDK.Xamarin" version="4.2.0-beta.3" targetFramework="xamarinios10" />
+  <package id="ScanbotBarcodeSDK.Xamarin" version="4.2.0-beta.5" targetFramework="xamarinios10" />
 </packages>
diff --git a/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.Android/NativeBarcodeSDKRenderer.Android.csproj b/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.Android/NativeBarcodeSDKRenderer.Android.csproj
@@ -58,7 +58,7 @@
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
     <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms">
-      <Version>4.2.0-beta.3</Version>
+      <Version>4.2.0-beta.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.iOS/NativeBarcodeSDKRenderer.iOS.csproj b/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.iOS/NativeBarcodeSDKRenderer.iOS.csproj
@@ -131,7 +131,7 @@
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
     <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms">
-      <Version>4.2.0-beta.3</Version>
+      <Version>4.2.0-beta.5</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.csproj b/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer/NativeBarcodeSDKRenderer.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
-    <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms" Version="4.2.0-beta.3" />
+    <PackageReference Include="ScanbotBarcodeSDK.Xamarin.Forms" Version="4.2.0-beta.5" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Common\" />

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ public override bool ShouldDetectBarcodes(SBSDKBarcodeScannerViewController cont`
`42`	`42`
`43`	`43`	`public override void DidDetectBarcodes(SBSDKBarcodeScannerViewController controller, SBSDKBarcodeScannerResult[] codes)`
`44`	`44`	`{`
`45`		`- ResultReceived?.Invoke(this, new ScannerEventArgs(codes.ToList(), codes.First()?.BarcodeImage));`
	`45`	`+ if (codes.Length > 0)`
	`46`	`+ {`
	`47`	`+ ResultReceived?.Invoke(this, new ScannerEventArgs(codes.ToList(), codes.First()?.BarcodeImage));`
	`48`	`+ }`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`
`@@ -51,11 +54,14 @@ public class BarcodeResultReceiver : SBSDKUIBarcodeScannerViewControllerDelegate`
`51`	`54`	`public bool WaitForImage { get; set; }`
`52`	`55`
`53`	`56`	`public EventHandler<ScannerEventArgs> ResultsReceived;`
	`57`	`+ public Action OnDidCancel;`
`54`	`58`
`55`		`- public override void DidDetectResults(`
`56`		`- SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScannerResult[] barcodeResults)`
	`59`	`+ public override void DidDetectResults(SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScannerResult[] barcodeResults)`
`57`	`60`	`{`
`58`		`- Invoke(viewController, barcodeResults, barcodeResults.First()?.BarcodeImage);`
	`61`	`+ if (barcodeResults.Length > 0)`
	`62`	`+ {`
	`63`	`+ Invoke(viewController, barcodeResults, barcodeResults.First()?.BarcodeImage);`
	`64`	`+ }`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`ScannerEventArgs args;`
`@@ -77,5 +83,10 @@ void Invoke(SBSDKUIBarcodeScannerViewController viewController, SBSDKBarcodeScan`
`77`	`83`
`78`	`84`	`ResultsReceived?.Invoke(this, args);`
`79`	`85`	`}`
	`86`	`+`
	`87`	`+ public override void DidCancel(SBSDKUIBarcodeScannerViewController viewController)`
	`88`	`+ {`
	`89`	`+ OnDidCancel?.Invoke();`
	`90`	`+ }`
`80`	`91`	`}`
`81`	`92`	`}`