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

Author: TheCodeTraveler

.github/workflows/benchmarks.yml

@@ -63,7 +63,7 @@ jobs:
 
       - name: Publish Benchmarks
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Benchmarks
           path: |

.github/workflows/dotnet-build.yml

@@ -246,7 +246,7 @@ jobs:
         shell: pwsh
 
       - name: Upload Package List
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ runner.os == 'Windows' }}
         with:
           name: nuget-list
@@ -256,7 +256,7 @@ jobs:
 
       - name: Publish Packages
         if: ${{ runner.os == 'Windows' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: packages
           path: ${{ github.workspace }}/nuget/
@@ -276,13 +276,13 @@ jobs:
           dotnet-quality: 'ga'
 
       - name: Download NuGet List
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: nuget-list
           path: ./
 
       - name: Download Package List
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: packages
           path: ./packages
@@ -328,7 +328,7 @@ jobs:
           --verbosity Information
 
       - name: Publish Packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: signed-packages
           if-no-files-found: error
@@ -348,7 +348,7 @@ jobs:
           dotnet-quality: 'ga'
 
       - name: Download signed packages
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: signed-packages
           path: ./packages
@@ -376,7 +376,7 @@ jobs:
           dotnet-quality: 'ga'
 
       - name: Download signed packages
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: signed-packages
           path: ./packages

Directory.Build.props

@@ -16,8 +16,7 @@
     <NuGetAuditMode>all</NuGetAuditMode>
 
     <!-- MAUI Specific -->
-    <MauiPackageVersion>9.0.111</MauiPackageVersion>
-    <NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
+    <MauiPackageVersion>9.0.120</MauiPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>

azure-pipelines.yml

@@ -57,14 +57,14 @@
             <Button Clicked="ZoomIn" Text="Zoom +" Grid.Column="2"/>
         </Grid>
 
-        <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" BackgroundColor="#80CCCCCC">
+        <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" BackgroundColor="#80CCCCCC">
 
             <FlexLayout Margin="5" JustifyContent="SpaceBetween" Wrap="Wrap">
 
                 <Picker 
                     Title="Cameras" 
                     ItemsSource="{Binding Cameras}"
-                    ItemDisplayBinding="{Binding Name}" 
+                    ItemDisplayBinding="{Binding Name, x:DataType={x:Null}}" 
                     SelectedItem="{Binding SelectedCamera}" />
 
                 <Picker 
@@ -73,15 +73,28 @@
                     ItemsSource="{Binding FlashModes}"
                     SelectedItem="{Binding FlashMode}" />
 
-                <Button Command="{Binding CaptureImageCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
-                        CommandParameter="{Binding Token}"
-                        Text="Capture Image"/>
                 <Button Command="{Binding StartCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
                         CommandParameter="{Binding Token}"
-                        Text="StartCameraPreview" />
+                        Text="Start Camera Preview" />
 
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
-                        Text="StopCameraPreview" />
+                        Text="Stop Camera Preview" />
+
+
+                <Button Clicked="StartCameraRecording"
+                        Text="Start Video Recording" />
+
+                <Button  Clicked="StopCameraRecording"
+                         CommandParameter="{Binding Token}"
+                         Text="Stop Video Recording" />
+
+                <Button Clicked="SaveVideo" Text="Save Video Recording" />
+
+                <Button Command="{Binding CaptureImageCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
+                        CommandParameter="{Binding Token}"
+                        Text="Capture Image"/>
+
+                <Button Clicked="SetNightMode" Text="Set Night Mode (Android)" />
 
             </FlexLayout>
         </Grid>

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

@@ -1,26 +1,28 @@
 using System.Diagnostics;
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Storage;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
-public partial class CameraViewPage : BasePage<CameraViewViewModel>
+public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>
 {
+	readonly IFileSaver fileSaver;
 	readonly string imagePath;
+
 	int pageCount;
+	Stream videoRecordingStream = Stream.Null;
 
-	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem) : base(viewModel)
+	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
 	{
 		InitializeComponent();
 
+		this.fileSaver = fileSaver;
 		imagePath = Path.Combine(fileSystem.CacheDirectory, "camera-view-image.jpg");
 
 		Camera.MediaCaptured += OnMediaCaptured;
 
-		Loaded += (s, e) =>
-		{
-			pageCount = Navigation.NavigationStack.Count;
-		};
+		Loaded += (s, e) => { pageCount = Navigation.NavigationStack.Count; };
 	}
 
 	protected override async void OnAppearing()
@@ -51,6 +53,7 @@ async void OnImageTapped(object? sender, TappedEventArgs args)
 		{
 			return;
 		}
+
 		await Navigation.PushAsync(new ImageViewPage(imagePath));
 	}
 
@@ -82,7 +85,6 @@ void OnMediaCaptured(object? sender, MediaCapturedEventArgs e)
 
 			debugText.Text = $"Image saved to {imagePath}";
 		});
-
 	}
 
 	void ZoomIn(object? sender, EventArgs e)
@@ -94,4 +96,37 @@ void ZoomOut(object? sender, EventArgs e)
 	{
 		Camera.ZoomFactor -= 1.0f;
 	}
+
+	async void SetNightMode(object? sender, EventArgs e)
+	{
+#if ANDROID
+		await Camera.SetExtensionMode(AndroidX.Camera.Extensions.ExtensionMode.Night);
+#else
+		await Task.CompletedTask;
+#endif
+	}
+
+	async void StartCameraRecording(object? sender, EventArgs e)
+	{
+		await Camera.StartVideoRecording(CancellationToken.None);
+	}
+
+	async void StopCameraRecording(object? sender, EventArgs e)
+	{
+		videoRecordingStream = await Camera.StopVideoRecording(CancellationToken.None);
+	}
+
+	async void SaveVideo(object? sender, EventArgs e)
+	{
+		if (videoRecordingStream == Stream.Null)
+		{
+			await DisplayAlert("Unable to Save Video", "Stream is null", "OK");
+		}
+		else
+		{
+			await fileSaver.SaveAsync("recording.mp4", videoRecordingStream);
+			await videoRecordingStream.DisposeAsync();
+			videoRecordingStream = Stream.Null;
+		}
+	}
 }

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

@@ -35,6 +35,8 @@
                 <Button Text="Updating Popup" Command="{Binding UpdatingPopupCommand}" />
 
                 <Button Text="Show Popup content" Command="{Binding ShowPopupContentCommand}" />
+                
+                <Button Text="Show Popup in a Modal Page in a Custom Navigation Page" Clicked="HandleModalPopupInCustomNavigationPage" />
 
                 <Button Text="Custom Positioning Popup" Clicked="HandlePopupPositionButtonClicked" />
 

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml

@@ -20,6 +20,15 @@ public PopupsPage(PopupsViewModel multiplePopupViewModel, IPopupService popupSer
 		InitializeComponent();
 	}
 
+	protected override async void OnNavigatedTo(NavigatedToEventArgs args)
+	{
+		base.OnNavigatedTo(args);
+		if (args.WasPreviousPageACommunityToolkitPopupPage())
+		{
+			await Toast.Make("Popup Closed").Show();
+		}
+	}
+
 	async void HandleSimplePopupButtonClicked(object sender, EventArgs e)
 	{
 		var queryAttributes = new Dictionary<string, object>
@@ -160,6 +169,29 @@ async void HandleComplexPopupClicked(object? sender, EventArgs e)
 			// Display Popup Result as a Toast
 			await Toast.Make($"You entered {popupResult.Result}").Show(CancellationToken.None);
 		}
+	}
+
+	async void HandleModalPopupInCustomNavigationPage(object? sender, EventArgs eventArgs)
+	{
+		var modalPopupPage = new ContentPage
+		{
+			Content = new VerticalStackLayout
+			{
+				Spacing = 24,
+				Children =
+				{
+					new Button()
+						.Text("Show Popup")
+						.Invoke(button => button.Command = new Command(async () => await popupService.ShowPopupAsync<ButtonPopup>(Shell.Current))),
+
+					new Button()
+						.Text("Back")
+						.Invoke(button => button.Command = new Command(async () => await Navigation.PopModalAsync()))
+				}
+			}.Center()
+		};
 
+		var customNavigationPage = new NavigationPage(modalPopupPage);
+		await Shell.Current.Navigation.PushModalAsync(customNavigationPage, true);
 	}
 }

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs

@@ -107,7 +107,7 @@ void UpdateResolutionText()
 	{
 		ResolutionText = $"Selected Resolution: {SelectedResolution.Width} x {SelectedResolution.Height}";
 	}
-	
+
 	void HandleAvailableCamerasChanged(object? sender, IReadOnlyList<CameraInfo>? e)
 	{
 		OnPropertyChanged(nameof(Cameras));