Skip to content

Commit

Permalink
win progres
Browse files Browse the repository at this point in the history
  • Loading branch information
@afriscic
afriscic committed Jun 5, 2024
1 parent a4f53c9 commit 3580114
Show file tree
Hide file tree
Showing 8 changed files with 255 additions and 71 deletions.
4 changes: 2 additions & 2 deletions BarcodeScanning.Native.Maui/BarcodeScanning.Native.Maui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>1.5.3</Version>
<Version>1.6.0</Version>
<Authors>Alen Friščić</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down Expand Up @@ -57,7 +57,7 @@
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-windows'))">
<PackageReference Include="ZXingCpp" Version="0.2.1-alpha" />
</ItemGroup>

Expand Down
13 changes: 4 additions & 9 deletions BarcodeScanning.Native.Maui/Platform/Android/CameraManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,11 @@ internal void UpdateZoomFactor()
if (factor < 0)
return;

var minValue = _cameraView?.MinZoomFactor ?? -1;
var maxValue = _cameraView?.MaxZoomFactor ?? -1;
factor = Math.Max(factor, _cameraView?.MinZoomFactor ?? -1);
factor = Math.Min(factor, _cameraView?.MaxZoomFactor ?? -1);

if (factor < minValue)
factor = minValue;
if (factor > maxValue)
factor = maxValue;

if (factor > 0 && _cameraController is not null)
_cameraController.SetZoomRatio(factor);
if (factor > 0)
_cameraController?.SetZoomRatio(factor);
}

internal void HandleCameraEnabled()
Expand Down
10 changes: 4 additions & 6 deletions BarcodeScanning.Native.Maui/Platform/Android/Methods.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,12 @@ internal static int ConvertBarcodeFormats(BarcodeFormats barcodeFormats)
{
var formats = Barcode.FormatAllFormats;

if (barcodeFormats.HasFlag(BarcodeFormats.CodaBar))
formats |= Barcode.FormatCodabar;
if (barcodeFormats.HasFlag(BarcodeFormats.Code128))
formats |= Barcode.FormatCode128;
if (barcodeFormats.HasFlag(BarcodeFormats.Code93))
formats |= Barcode.FormatCode93;
if (barcodeFormats.HasFlag(BarcodeFormats.Code39))
formats |= Barcode.FormatCode39;
if (barcodeFormats.HasFlag(BarcodeFormats.Code93))
formats |= Barcode.FormatCode93;
if (barcodeFormats.HasFlag(BarcodeFormats.CodaBar))
formats |= Barcode.FormatCodabar;
if (barcodeFormats.HasFlag(BarcodeFormats.DataMatrix))
Expand All @@ -162,14 +160,14 @@ internal static int ConvertBarcodeFormats(BarcodeFormats barcodeFormats)
formats |= Barcode.FormatEan8;
if (barcodeFormats.HasFlag(BarcodeFormats.Itf))
formats |= Barcode.FormatItf;
if (barcodeFormats.HasFlag(BarcodeFormats.Pdf417))
formats |= Barcode.FormatPdf417;
if (barcodeFormats.HasFlag(BarcodeFormats.QRCode))
formats |= Barcode.FormatQrCode;
if (barcodeFormats.HasFlag(BarcodeFormats.Upca))
formats |= Barcode.FormatUpcA;
if (barcodeFormats.HasFlag(BarcodeFormats.Upce))
formats |= Barcode.FormatUpcE;
if (barcodeFormats.HasFlag(BarcodeFormats.Pdf417))
formats |= Barcode.FormatPdf417;
if (barcodeFormats.HasFlag(BarcodeFormats.Aztec))
formats |= Barcode.FormatAztec;
if (barcodeFormats.HasFlag(BarcodeFormats.All))
Expand Down
9 changes: 2 additions & 7 deletions BarcodeScanning.Native.Maui/Platform/MaciOS/CameraManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,9 @@ internal void UpdateZoomFactor()
if (factor < 0)
return;

var minValue = _cameraView?.MinZoomFactor ?? -1;
var maxValue = _cameraView?.MaxZoomFactor ?? -1;
factor = Math.Max(factor, _cameraView?.MinZoomFactor ?? -1);
factor = Math.Min(factor, _cameraView?.MaxZoomFactor ?? -1);

if (factor < minValue)
factor = minValue;
if (factor > maxValue)
factor = maxValue;

if (factor > 0 && _captureDevice is not null)
CaptureDeviceLock(() => _captureDevice.VideoZoomFactor = factor);

Expand Down
62 changes: 31 additions & 31 deletions BarcodeScanning.Native.Maui/Platform/MaciOS/Methods.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ internal static VNBarcodeSymbology[] SelectedSymbologies(BarcodeFormats barcodeF

var symbologiesList = new List<VNBarcodeSymbology>();

if (barcodeFormats.HasFlag(BarcodeFormats.Aztec))
symbologiesList.Add(VNBarcodeSymbology.Aztec);
if (barcodeFormats.HasFlag(BarcodeFormats.CodaBar))
symbologiesList.Add(VNBarcodeSymbology.Codabar);
if (barcodeFormats.HasFlag(BarcodeFormats.Code128))
symbologiesList.Add(VNBarcodeSymbology.Code128);
if (barcodeFormats.HasFlag(BarcodeFormats.Code39))
{
symbologiesList.Add(VNBarcodeSymbology.Code39);
Expand All @@ -82,39 +80,41 @@ internal static VNBarcodeSymbology[] SelectedSymbologies(BarcodeFormats barcodeF
symbologiesList.Add(VNBarcodeSymbology.Code93);
symbologiesList.Add(VNBarcodeSymbology.Code93i);
}
if (barcodeFormats.HasFlag(BarcodeFormats.Code128))
symbologiesList.Add(VNBarcodeSymbology.Code128);
if (barcodeFormats.HasFlag(BarcodeFormats.CodaBar))
symbologiesList.Add(VNBarcodeSymbology.Codabar);
if (barcodeFormats.HasFlag(BarcodeFormats.DataMatrix))
symbologiesList.Add(VNBarcodeSymbology.DataMatrix);
if (barcodeFormats.HasFlag(BarcodeFormats.Ean8))
symbologiesList.Add(VNBarcodeSymbology.Ean8);
if (barcodeFormats.HasFlag(BarcodeFormats.Ean13))
symbologiesList.Add(VNBarcodeSymbology.Ean13);
if (barcodeFormats.HasFlag(BarcodeFormats.GS1DataBar))
{
symbologiesList.Add(VNBarcodeSymbology.GS1DataBar);
symbologiesList.Add(VNBarcodeSymbology.GS1DataBarLimited);
symbologiesList.Add(VNBarcodeSymbology.GS1DataBarExpanded);
}
if (barcodeFormats.HasFlag(BarcodeFormats.I2OF5))
{
symbologiesList.Add(VNBarcodeSymbology.I2OF5);
symbologiesList.Add(VNBarcodeSymbology.I2OF5Checksum);
}
if (barcodeFormats.HasFlag(BarcodeFormats.Ean8))
symbologiesList.Add(VNBarcodeSymbology.Ean8);
if (barcodeFormats.HasFlag(BarcodeFormats.Itf))
symbologiesList.Add(VNBarcodeSymbology.Itf14);
if (barcodeFormats.HasFlag(BarcodeFormats.MicroQR))
symbologiesList.Add(VNBarcodeSymbology.MicroQR);
if (barcodeFormats.HasFlag(BarcodeFormats.MicroPdf417))
symbologiesList.Add(VNBarcodeSymbology.MicroPdf417);
if (barcodeFormats.HasFlag(BarcodeFormats.Pdf417))
symbologiesList.Add(VNBarcodeSymbology.Pdf417);
if (barcodeFormats.HasFlag(BarcodeFormats.QRCode))
symbologiesList.Add(VNBarcodeSymbology.QR);
if (barcodeFormats.HasFlag(BarcodeFormats.Upca))
symbologiesList.Add(VNBarcodeSymbology.Ean13);
if (barcodeFormats.HasFlag(BarcodeFormats.Upce))
symbologiesList.Add(VNBarcodeSymbology.Upce);
if (barcodeFormats.HasFlag(BarcodeFormats.Pdf417))
symbologiesList.Add(VNBarcodeSymbology.Pdf417);
if (barcodeFormats.HasFlag(BarcodeFormats.Aztec))
symbologiesList.Add(VNBarcodeSymbology.Aztec);
if (barcodeFormats.HasFlag(BarcodeFormats.MicroQR))
symbologiesList.Add(VNBarcodeSymbology.MicroQR);
if (barcodeFormats.HasFlag(BarcodeFormats.MicroPdf417))
symbologiesList.Add(VNBarcodeSymbology.MicroPdf417);
if (barcodeFormats.HasFlag(BarcodeFormats.I2OF5))
{
symbologiesList.Add(VNBarcodeSymbology.I2OF5);
symbologiesList.Add(VNBarcodeSymbology.I2OF5Checksum);
}
if (barcodeFormats.HasFlag(BarcodeFormats.GS1DataBar))
{
symbologiesList.Add(VNBarcodeSymbology.GS1DataBar);
symbologiesList.Add(VNBarcodeSymbology.GS1DataBarLimited);
symbologiesList.Add(VNBarcodeSymbology.GS1DataBarExpanded);
}

return [.. symbologiesList];
}
Expand All @@ -124,7 +124,6 @@ private static BarcodeFormats ConvertFromIOSFormats(VNBarcodeSymbology symbology
return symbology switch
{
VNBarcodeSymbology.Aztec => BarcodeFormats.Aztec,
VNBarcodeSymbology.Codabar => BarcodeFormats.CodaBar,
VNBarcodeSymbology.Code39 => BarcodeFormats.Code39,
VNBarcodeSymbology.Code39Checksum => BarcodeFormats.Code39,
VNBarcodeSymbology.Code39FullAscii => BarcodeFormats.Code39,
Expand All @@ -135,17 +134,18 @@ private static BarcodeFormats ConvertFromIOSFormats(VNBarcodeSymbology symbology
VNBarcodeSymbology.DataMatrix => BarcodeFormats.DataMatrix,
VNBarcodeSymbology.Ean8 => BarcodeFormats.Ean8,
VNBarcodeSymbology.Ean13 => BarcodeFormats.Ean13,
VNBarcodeSymbology.GS1DataBar => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.GS1DataBarExpanded => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.GS1DataBarLimited => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.I2OF5 => BarcodeFormats.I2OF5,
VNBarcodeSymbology.I2OF5Checksum => BarcodeFormats.I2OF5,
VNBarcodeSymbology.Itf14 => BarcodeFormats.Itf,
VNBarcodeSymbology.MicroPdf417 => BarcodeFormats.MicroPdf417,
VNBarcodeSymbology.MicroQR => BarcodeFormats.MicroQR,
VNBarcodeSymbology.Pdf417 => BarcodeFormats.Pdf417,
VNBarcodeSymbology.QR => BarcodeFormats.QRCode,
VNBarcodeSymbology.Upce => BarcodeFormats.Upce,
VNBarcodeSymbology.Codabar => BarcodeFormats.CodaBar,
VNBarcodeSymbology.GS1DataBar => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.GS1DataBarExpanded => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.GS1DataBarLimited => BarcodeFormats.GS1DataBar,
VNBarcodeSymbology.MicroPdf417 => BarcodeFormats.MicroPdf417,
VNBarcodeSymbology.MicroQR => BarcodeFormats.MicroQR,
_ => BarcodeFormats.None
};
}
Expand Down
Loading

0 comments on commit 3580114

Please sign in to comment.