Skip to content

Additional camera options on iOS and some bug-fixes #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Additional camera options on iOS and some bug-fixes #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cda1afb
Fixed compilation problem caused by chaning "lincese.md" to "LICENSE.…
Jun 15, 2024
4daad1a
Added x:DataType tag to assist binding and allow for compiled binding…
Jun 15, 2024
138cfec
Added a couple of more camera options for iOS/Apple
Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Camera.MAUI/Apple/MauiCameraView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void InitDevices()
{
try
{
var deviceDescoverySession = AVCaptureDeviceDiscoverySession.Create(new AVCaptureDeviceType[] { AVCaptureDeviceType.BuiltInWideAngleCamera }, AVMediaTypes.Video, AVCaptureDevicePosition.Unspecified);
var deviceDescoverySession = AVCaptureDeviceDiscoverySession.Create(new AVCaptureDeviceType[] { AVCaptureDeviceType.BuiltInWideAngleCamera, AVCaptureDeviceType.BuiltInUltraWideCamera, AVCaptureDeviceType.BuiltInDualWideCamera, AVCaptureDeviceType.BuiltInTripleCamera, AVCaptureDeviceType.BuiltInTelephotoCamera }, AVMediaTypes.Video, AVCaptureDevicePosition.Unspecified);
camDevices = deviceDescoverySession.Devices;
cameraView.Cameras.Clear();
foreach (var device in camDevices)
Expand Down Expand Up @@ -573,7 +573,6 @@ void DidFinishProcessingPhoto(AVCapturePhotoOutput captureOutput, CMSampleBuffer
}

NSData imageData = AVCapturePhotoOutput.GetJpegPhotoDataRepresentation(photoSampleBuffer, previewPhotoSampleBuffer);

photo = new UIImage(imageData);
photoTaken = true;
}
Expand Down
4 changes: 3 additions & 1 deletion Camera.MAUI/BarcodeImage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Camera.MAUI.BarcodeImage" x:Name="barcodeImage">
xmlns:local="clr-namespace:Camera.MAUI"
x:Class="Camera.MAUI.BarcodeImage" x:Name="barcodeImage"
x:DataType="local:BarcodeImage">
<Grid>
<Image x:Name="image" BindingContext="{x:Reference barcodeImage}" HorizontalOptions="Fill" VerticalOptions="Fill" Aspect="{Binding Aspect}"/>
</Grid>
Expand Down
13 changes: 4 additions & 9 deletions Camera.MAUI/Camera.MAUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,16 @@
<Authors>hjam40</Authors>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<Version>1.5</Version>
<PackageReleaseNotes>Split barcode encoder/decoder in a different package. Fix some bugs
</PackageReleaseNotes>
<PackageLicenseFile>license.md</PackageLicenseFile>
<PackageReleaseNotes>Split barcode encoder/decoder in a different package. Fix some bugs</PackageReleaseNotes>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
<ProvisioningType>manual</ProvisioningType>
</PropertyGroup>

<ItemGroup>
<None Remove="license.md" />
</ItemGroup>


<ItemGroup>
<EmbeddedResource Include="license.md">
<EmbeddedResource Include="../LICENSE.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</EmbeddedResource>
Expand Down