Refactor CameraView.CaptureImage, CameraView.StartCameraPreview and CameraView.StopCameraPreview

samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
-using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 

src/CommunityToolkit.Maui.Camera/CameraInfo.shared.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using CommunityToolkit.Maui.Core.Primitives;
 
 #if IOS || MACCATALYST
 using AVFoundation;

src/CommunityToolkit.Maui.Camera/CameraManager.android.cs

@@ -7,7 +7,6 @@
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Core.Content;
 using AndroidX.Lifecycle;
-using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Extensions;
 using Java.Lang;
 using Java.Util.Concurrent;

src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using AVFoundation;
-using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Extensions;
 using CoreMedia;
 using Foundation;
@@ -204,7 +203,7 @@
 			var photoOutputConnection = photoOutput.ConnectionFromMediaType(avMediaTypeVideo);
 			if (photoOutputConnection is not null)
 			{
 				photoOutputConnection.VideoOrientation = videoOrientation;
 			}
 		}
 
@@ -271,7 +270,7 @@
 		IEnumerable<UIScene> scenes = UIApplication.SharedApplication.ConnectedScenes;
 		var interfaceOrientation = scenes.FirstOrDefault() is UIWindowScene windowScene
 			? windowScene.InterfaceOrientation
 			: UIApplication.SharedApplication.StatusBarOrientation;
 
 		return interfaceOrientation switch
 		{
@@ -347,7 +346,7 @@
 		{
 			if (PreviewLayer.Connection is not null)
 			{
 				PreviewLayer.Connection.VideoOrientation = videoOrientation;
 			}
 		}
 	}

src/CommunityToolkit.Maui.Camera/CameraManager.net.cs

@@ -1,5 +1,3 @@
-using CommunityToolkit.Maui.Core.Primitives;
-
 namespace CommunityToolkit.Maui.Core;
 
 partial class CameraManager

src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs

@@ -1,6 +1,4 @@
-using CommunityToolkit.Maui.Core.Primitives;
-
-namespace CommunityToolkit.Maui.Core;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// A class that manages the camera functionality.
@@ -15,9 +13,9 @@
 /// <exception cref="NullReferenceException">Thrown when no <see cref="CameraProvider"/> can be resolved.</exception>
 /// <exception cref="InvalidOperationException">Thrown when there are no cameras available.</exception>
 partial class CameraManager(
 	IMauiContext mauiContext,
 	ICameraView cameraView,
 	ICameraProvider cameraProvider,
 	Action onLoaded) : IDisposable
 {
 	internal Action OnLoaded { get; } = onLoaded;

src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs

@@ -1,5 +1,3 @@
-using CommunityToolkit.Maui.Core.Primitives;
-
 namespace CommunityToolkit.Maui.Core;
 
 partial class CameraManager

src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs

@@ -1,7 +1,5 @@
 using System.Runtime.Versioning;
-using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Extensions;
-using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Media.Capture;
 using Windows.Media.Capture.Frames;

src/CommunityToolkit.Maui.Camera/Extensions/CameraViewExtensions.android.cs

@@ -2,7 +2,6 @@
 using Android.Content.PM;
 using AndroidX.Camera.Core;
 using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Core.Primitives;
 
 namespace CommunityToolkit.Maui.Extensions;
 

src/CommunityToolkit.Maui.Camera/Extensions/CameraViewExtensions.macios.cs

@@ -1,6 +1,5 @@
 using AVFoundation;
 using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Core.Primitives;
 
 namespace CommunityToolkit.Maui.Extensions;
 

src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs

@@ -29,12 +29,7 @@ public partial class CameraViewHandler : ViewHandler<ICameraView, NativePlatform
 	/// The currently defined mappings between commands on the <see cref="ICameraView"/> and
 	/// commands on the <see cref="NativePlatformCameraPreviewView"/>. 
 	/// </summary>
-	public static CommandMapper<ICameraView, CameraViewHandler> CommandMapper = new(ViewCommandMapper)
-	{
-		[nameof(ICameraView.CaptureImage)] = MapCaptureImage,
-		[nameof(ICameraView.StartCameraPreview)] = MapStartCameraPreview,
-		[nameof(ICameraView.StopCameraPreview)] = MapStopCameraPreview
-	};
+	public static CommandMapper<ICameraView, CameraViewHandler> CommandMapper = new(ViewCommandMapper);
 
 	readonly ICameraProvider cameraProvider = IPlatformApplication.Current?.Services.GetRequiredService<ICameraProvider>() ?? throw new CameraException($"{nameof(CameraProvider)} not found");
 
@@ -66,6 +61,9 @@ public void Dispose()
 		GC.SuppressFinalize(this);
 	}
 
+	internal CameraManager CameraManager => cameraManager
+		?? throw new InvalidOperationException($"{nameof(CameraManager)} cannot be used until the native view has been created");
+
 	/// <summary>
 	/// Creates a platform-specific view that will be rendered on that platform.
 	/// </summary>
@@ -74,7 +72,7 @@ protected override NativePlatformCameraPreviewView CreatePlatformView()
 		ArgumentNullException.ThrowIfNull(MauiContext);
 		cameraManager = new(MauiContext, VirtualView, cameraProvider, () => Init(VirtualView));
 
-		return (NativePlatformCameraPreviewView)cameraManager.CreatePlatformView();
+		return (NativePlatformCameraPreviewView)CameraManager.CreatePlatformView();
 
 		// When camera is loaded(switched), map the current flash mode to the platform view,
 		// reset the zoom factor to 1
@@ -90,8 +88,8 @@ protected override async void ConnectHandler(NativePlatformCameraPreviewView pla
 	{
 		base.ConnectHandler(platformView);
 
-		await (cameraManager?.ArePermissionsGranted() ?? Task.CompletedTask);
-		await (cameraManager?.ConnectCamera(CancellationToken.None) ?? Task.CompletedTask);
+		await CameraManager.ArePermissionsGranted();
+		await CameraManager.ConnectCamera(CancellationToken.None);
 		await cameraProvider.RefreshAvailableCameras(CancellationToken.None);
 	}
 
@@ -121,55 +119,38 @@ static async void MapIsAvailable(CameraViewHandler handler, ICameraView view)
 	static void MapIsAvailable(CameraViewHandler handler, ICameraView view)
 #endif
 	{
-		var cameraAvailability = (ICameraView)handler.VirtualView;
+		var cameraView = (ICameraView)handler.VirtualView;
 
 #if ANDROID
-		cameraAvailability.UpdateAvailability(handler.Context);
+		cameraView.UpdateAvailability(handler.Context);
 #elif WINDOWS
-		await cameraAvailability.UpdateAvailability(CancellationToken.None);
+		await cameraView.UpdateAvailability(CancellationToken.None);
 #elif IOS || MACCATALYST
-		cameraAvailability.UpdateAvailability();
+		cameraView.UpdateAvailability();
 #elif TIZEN
 		throw new NotSupportedException("Tizen is not yet supported");
 #elif NET
 		throw new NotSupportedException("A specific platform is required, eg net-ios, net-android, net-maccatalyst, net-windows");
 #endif
 	}
 
-	static async void MapCaptureImage(CameraViewHandler handler, ICameraView view, object? arg3)
-	{
-		await (handler.cameraManager?.TakePicture(CancellationToken.None) ?? ValueTask.CompletedTask);
-		view.HandlerCompleteTCS.SetResult();
-	}
-
-	static async void MapStartCameraPreview(CameraViewHandler handler, ICameraView view, object? arg3)
-	{
-		await (handler.cameraManager?.StartCameraPreview(CancellationToken.None) ?? Task.CompletedTask);
-		view.HandlerCompleteTCS.SetResult();
-	}
-
 	static async void MapImageCaptureResolution(CameraViewHandler handler, ICameraView view)
 	{
-		await (handler.cameraManager?.UpdateCaptureResolution(view.ImageCaptureResolution, CancellationToken.None) ?? ValueTask.CompletedTask);
+		await handler.CameraManager.UpdateCaptureResolution(view.ImageCaptureResolution, CancellationToken.None);
 	}
 
 	static async void MapSelectedCamera(CameraViewHandler handler, ICameraView view)
 	{
-		await (handler.cameraManager?.UpdateCurrentCamera(view.SelectedCamera, CancellationToken.None) ?? ValueTask.CompletedTask);
-	}
-
-	static void MapStopCameraPreview(CameraViewHandler handler, ICameraView view, object? arg3)
-	{
-		handler.cameraManager?.StopCameraPreview();
+		await handler.CameraManager.UpdateCurrentCamera(view.SelectedCamera, CancellationToken.None);
 	}
 
 	static void MapCameraFlashMode(CameraViewHandler handler, ICameraView view)
 	{
-		handler.cameraManager?.UpdateFlashMode(view.CameraFlashMode);
+		handler.CameraManager.UpdateFlashMode(view.CameraFlashMode);
 	}
 
 	static void MapZoomFactor(CameraViewHandler handler, ICameraView view)
 	{
-		handler.cameraManager?.UpdateZoom(view.ZoomFactor);
+		handler.CameraManager.UpdateZoom(view.ZoomFactor);
 	}
 }

src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs

@@ -1,12 +1,9 @@
-using CommunityToolkit.Maui.Camera;
-using CommunityToolkit.Maui.Core.Primitives;
-
-namespace CommunityToolkit.Maui.Core;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Represents a visual element that provides the ability to show a camera preview and capture images.
 /// </summary>
-public interface ICameraView : IView, IAsynchronousHandler
+public interface ICameraView : IView
 {
 	/// <summary>
 	/// Gets the <see cref="CameraFlashMode"/>.
@@ -51,18 +48,6 @@ public interface ICameraView : IView, IAsynchronousHandler
 	/// </summary>
 	bool IsBusy { get; internal set; }
 
-	/// <summary>
-	/// Occurs when an image is captured by the camera.
-	/// </summary>
-	/// <param name="imageData">The image data held within a <see cref="Stream"/>.</param>
-	void OnMediaCaptured(Stream imageData);
-
-	/// <summary>
-	/// Occurs when an image capture fails.
-	/// </summary>
-	/// <param name="failureReason">A string containing the reason why the capture attempt failed.</param>
-	void OnMediaCapturedFailed(string failureReason);
-
 	/// <summary>
 	/// Triggers the camera to capture an image.
 	/// </summary>
@@ -79,7 +64,7 @@ public interface ICameraView : IView, IAsynchronousHandler
 	/// To customize the behavior of starting the camera preview, consider overriding the behavior through
 	/// <c>CameraViewHandler.CommandMapper.ReplaceMapping(nameof(ICameraView.StartCameraPreview), ADD YOUR METHOD);</c>.
 	/// </remarks>
-	ValueTask StartCameraPreview(CancellationToken token);
+	Task StartCameraPreview(CancellationToken token);
 
 	/// <summary>
 	/// Stops the camera preview.
@@ -96,4 +81,16 @@ public interface ICameraView : IView, IAsynchronousHandler
 	/// <param name="token"></param>
 	/// <returns></returns>
 	ValueTask<IReadOnlyList<CameraInfo>> GetAvailableCameras(CancellationToken token);
+
+	/// <summary>
+	/// Occurs when an image is captured by the camera.
+	/// </summary>
+	/// <param name="imageData">The image data held within a <see cref="Stream"/>.</param>
+	internal void OnMediaCaptured(Stream imageData);
+
+	/// <summary>
+	/// Occurs when an image capture fails.
+	/// </summary>
+	/// <param name="failureReason">A string containing the reason why the capture attempt failed.</param>
+	internal void OnMediaCapturedFailed(string failureReason);
 }

src/CommunityToolkit.Maui.Camera/Primitives/CameraFlashMode.shared.cs

@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Maui.Core.Primitives;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Enumeration of the possible flash modes supported by the camera.

src/CommunityToolkit.Maui.Camera/Primitives/CameraPosition.shared.cs

@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Maui.Core.Primitives;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Enumeration of the possible positions that a camera can be placed.

src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 using System.Runtime.Versioning;
 using System.Windows.Input;
-using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Views;
+
 namespace CommunityToolkit.Maui.Core;
 
 /// <summary>Default Values for <see cref="ICameraView"/>"/></summary>
@@ -47,18 +47,18 @@
 	internal static Command<CancellationToken> CreateCaptureImageCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
 		return new(async token => await cameraView.CaptureImage(token).ConfigureAwait(false));
 	}
 
 	internal static Command<CancellationToken> CreateStartCameraPreviewCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
 		return new(async token => await cameraView.StartCameraPreview(token).ConfigureAwait(false));
 	}
 
 	internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command(token => cameraView.StopCameraPreview());
+		return new Command(_ => cameraView.StopCameraPreview());
 	}
 }

src/CommunityToolkit.Maui.Camera/Primitives/MediaCaptureFailedEventArgs.shared.cs

@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Maui.Views;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Event args containing all contextual information related to a media capture failure event.

src/CommunityToolkit.Maui.Camera/Primitives/MediaCapturedEventArgs.shared.cs

@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Maui.Views;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Event args containing all contextual information related to media capture event.

src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.android.cs

@@ -7,7 +7,6 @@
 using AndroidX.Camera.Core;
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Core.Content;
-using CommunityToolkit.Maui.Core.Primitives;
 using Java.Lang;
 
 namespace CommunityToolkit.Maui.Core;

src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.macios.cs

@@ -1,5 +1,4 @@
 using AVFoundation;
-using CommunityToolkit.Maui.Core.Primitives;
 using CoreMedia;
 using CoreVideo;
 using UIKit;

src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.windows.cs

@@ -1,4 +1,4 @@
-using CommunityToolkit.Maui.Core.Primitives;
+
 using CommunityToolkit.Maui.Extensions;
 using Windows.Devices.Enumeration;
 using Windows.Media.Capture;