Merge branch 'main' into feature/stephenquan/math-ar

Author: TheCodeTraveler

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

@@ -61,6 +61,12 @@
 
             <FlexLayout Margin="5" JustifyContent="SpaceBetween" Wrap="Wrap">
 
+                <Picker 
+                    Title="Cameras" 
+                    ItemsSource="{Binding Cameras}"
+                    ItemDisplayBinding="{Binding Name}" 
+                    SelectedItem="{Binding SelectedCamera}" />
+
                 <Picker 
                     Title="Flash"
                     IsVisible="{Binding Path=SelectedCamera.IsFlashSupported, FallbackValue=false}"

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs

@@ -66,13 +66,36 @@ partial void OnSelectedResolutionChanged(Size value)
 		UpdateResolutionText();
 	}
 
+	partial void OnSelectedCameraChanged(CameraInfo? oldValue, CameraInfo? newValue)
+	{
+		UpdateCameraInfoText();
+	}
+
+	void UpdateCameraInfoText()
+	{
+		if (SelectedCamera is null)
+		{
+			CameraNameText = string.Empty;
+			ZoomRangeText = string.Empty;
+		}
+		else
+		{
+			CameraNameText = $"{SelectedCamera.Name}";
+			ZoomRangeText = $"Min Zoom: {SelectedCamera.MinimumZoomFactor}, Max Zoom: {SelectedCamera.MaximumZoomFactor}";
+			UpdateFlashModeText();
+		}
+	}
+
 	void UpdateFlashModeText()
 	{
 		if (SelectedCamera is null)
 		{
-			return;
+			FlashModeText = string.Empty;
+		}
+		else
+		{
+			FlashModeText = $"{(SelectedCamera.IsFlashSupported ? $"Flash mode: {FlashMode}" : "Flash not supported")}";
 		}
-		FlashModeText = $"{(SelectedCamera.IsFlashSupported ? $"Flash mode: {FlashMode}" : "Flash not supported")}";
 	}
 
 	void UpdateCurrentZoomText()

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

@@ -14,12 +14,12 @@ public async partial ValueTask RefreshAvailableCameras(CancellationToken token)
 		var deviceInfoCollection = await DeviceInformation.FindAllAsync(DeviceClass.VideoCapture).AsTask(token);
 		var mediaFrameSourceGroup = await MediaFrameSourceGroup.FindAllAsync().AsTask(token);
 		var videoCaptureSourceGroup = mediaFrameSourceGroup.Where(sourceGroup => deviceInfoCollection.Any(deviceInfo => deviceInfo.Id == sourceGroup.Id)).ToList();
-		var mediaCapture = new MediaCapture();
 
 		var availableCameras = new List<CameraInfo>();
 
 		foreach (var sourceGroup in videoCaptureSourceGroup)
 		{
+			using var mediaCapture = new MediaCapture();
 			await mediaCapture.InitializeCameraForCameraView(sourceGroup.Id, token);
 
 			CameraPosition position = CameraPosition.Unknown;

src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj

@@ -7,6 +7,8 @@
     <SingleProject>true</SingleProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsAotCompatible>true</IsAotCompatible>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    
 
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>

src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.windows.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.InteropServices;
 using CommunityToolkit.Maui.Extensions;
 using CommunityToolkit.Maui.Primitives;
 using CommunityToolkit.Maui.Views;
@@ -8,7 +9,6 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Markup;
-using WinRT.Interop;
 using Application = Microsoft.Maui.Controls.Application;
 using Grid = Microsoft.UI.Xaml.Controls.Grid;
 using Page = Microsoft.Maui.Controls.Page;
@@ -20,7 +20,17 @@ namespace CommunityToolkit.Maui.Core.Views;
 /// </summary>
 public partial class MauiMediaElement : Grid, IDisposable
 {
-	static readonly AppWindow appWindow = GetAppWindowForCurrentWindow();
+	[LibraryImport("user32.dll")]
+	internal static partial IntPtr GetForegroundWindow();
+
+	/// <summary>
+	/// Safely gets the foreground window handle, returning null if no foreground window exists.
+	/// </summary>
+	internal static IntPtr? TryGetForegroundWindow()
+	{
+		var hwnd = GetForegroundWindow();
+		return hwnd == IntPtr.Zero ? null : hwnd;
+	}
 	readonly Popup popup = new();
 	readonly Grid fullScreenGrid = new();
 	readonly MediaPlayerElement mediaPlayerElement;
@@ -157,24 +167,16 @@ protected virtual void Dispose(bool disposing)
 
 	static AppWindow GetAppWindowForCurrentWindow()
 	{
-		// let's cache the CurrentPage here, since the user can navigate or background the app
-		// while this method is running
-		var currentPage = CurrentPage;
-
-		if (currentPage?.GetParentWindow().Handler.PlatformView is not MauiWinUIWindow window)
-		{
-			throw new InvalidOperationException($"{nameof(window)} cannot be null.");
-		}
-
-		var handle = WindowNative.GetWindowHandle(window);
-		var id = Win32Interop.GetWindowIdFromWindow(handle);
-
+		var windowHandle = TryGetForegroundWindow() ?? throw new InvalidOperationException("No foreground window found.");
+		var id = Win32Interop.GetWindowIdFromWindow(windowHandle);
 		return AppWindow.GetFromWindowId(id);
 	}
 
 	void OnFullScreenButtonClick(object sender, RoutedEventArgs e)
 	{
 		var currentPage = CurrentPage;
+		var appWindow = GetAppWindowForCurrentWindow();
+
 		if (appWindow.Presenter.Kind is AppWindowPresenterKind.FullScreen)
 		{
 			appWindow.SetPresenter(AppWindowPresenterKind.Default);