From 1d89461e8ff08f4b1aabef421b38a0a2428542ea Mon Sep 17 00:00:00 2001
From: Jens-Christian Skibakk <jens.christian@skibakk.no>
Date: Thu, 19 Dec 2024 19:12:50 +0100
Subject: [PATCH 01/39] Fix bug: Support for arrays in
 IsListNotNullOrEmptyConverter/IsListNotNullOrEmptyConverter (#2396)

* Update IsListNotNullOrEmptyConverter tests and method

Modified IsListNotNullOrEmptyConverterTests:
- Empty List<string> now returns true.
- Added empty array (Array.Empty<string>()) returning true.
- List<string> with "TestValue" now returns false.
- Null value now returns true.
- Enumerable.Range(1, 3) now returns false.

Added new test cases:
- Empty array (Array.Empty<string>()) returning true.
- Array with "TestValue" returning false.

Updated IsListNullOrEmpty method:
- Check if enumerator is IDisposable before disposing.

* Fix tests

---------

Co-authored-by: Jens-Christian Skibakk <jens.christian.skibakk@lexit.no>
---
 .../Converters/IsListNotNullOrEmptyConverterTests.cs | 12 +++++++++++-
 .../Converters/IsListNullOrEmptyConverterTests.cs    | 12 +++++++++++-
 .../Converters/IsListNullOrEmptyConverter.shared.cs  |  6 +++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
index 546bd8c519..5099196573 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
@@ -12,6 +12,9 @@ public class IsListNotNullOrEmptyConverterTests : BaseOneWayConverterTest<IsList
 		{
 			new List<string>(), false
 		},
+		{
+			Array.Empty<string>(), false
+		},
 		{
 			new List<string>
 			{
@@ -19,12 +22,19 @@ public class IsListNotNullOrEmptyConverterTests : BaseOneWayConverterTest<IsList
 			},
 			true
 		},
+		{
+			new []
+			{
+				"TestValue"
+			},
+			true
+		},
 		{
 			null, false
 		},
 		{
 			Enumerable.Range(1, 3), true
-		},
+		}
 	};
 
 	[Theory]
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
index 441a721eaf..4df13eb44a 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
@@ -12,6 +12,9 @@ public class IsListNullOrEmptyConverterTests : BaseOneWayConverterTest<IsListNul
 		{
 			new List<string>(), true
 		},
+		{
+			Array.Empty<string>(), true
+		},
 		{
 			new List<string>
 			{
@@ -19,12 +22,19 @@ public class IsListNullOrEmptyConverterTests : BaseOneWayConverterTest<IsListNul
 			},
 			false
 		},
+		{
+			new []
+			{
+				"TestValue"
+			},
+			false
+		},
 		{
 			null, true
 		},
 		{
 			Enumerable.Range(1, 3), false
-		},
+		}
 	};
 
 	[Theory]
diff --git a/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
index e39b247785..80e9d2e431 100644
--- a/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
@@ -30,7 +30,11 @@ internal static bool IsListNullOrEmpty(IEnumerable? value)
 		var enumerator = value.GetEnumerator();
 		bool result = !enumerator.MoveNext();
 
-		((IDisposable)enumerator).Dispose();
+		if (enumerator is IDisposable disposable)
+		{
+			disposable.Dispose();
+		}
+
 		return result;
 	}
 }
\ No newline at end of file

From f101cbe10a20a90bbbb03c4c2d739e63142eb812 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Thu, 19 Dec 2024 13:26:47 -0800
Subject: [PATCH 02/39] Fix ObservableProperties error: mvvmtk0045 (#2399)

* Fix ObservableProperties

* Resolve null dereference

* Bump `CommunityToolkitSampleApp_Xcode_Version` to 16.2

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 azure-pipelines.yml                                |  2 +-
 .../Views/CameraView/CameraViewViewModel.cs        | 14 +++++++++++++-
 .../Views/Popup/MauiPopup.macios.cs                |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7e30ed19e3..d0b7e1583a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,7 +28,7 @@ variables:
   PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
   PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
   DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
-  CommunityToolkitSampleApp_Xcode_Version: '16.1'
+  CommunityToolkitSampleApp_Xcode_Version: '16.2'
   CommunityToolkitLibrary_Xcode_Version: '16.1'
 
 trigger:
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index d3e9c3a432..1520ed8017 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -20,7 +20,19 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 	public partial float CurrentZoom { get; set; }
 
 	[ObservableProperty]
-	string cameraNameText = "", zoomRangeText = "", currentZoomText = "", flashModeText = "", resolutionText = "";
+	public partial string CameraNameText { get; set; } = string.Empty;
+
+	[ObservableProperty]
+	public partial string ZoomRangeText { get; set; } = string.Empty;
+
+	[ObservableProperty]
+	public partial string CurrentZoomText { get; set; } = string.Empty;
+	
+	[ObservableProperty] 
+	public partial string FlashModeText { get; set; } = string.Empty;
+	
+	[ObservableProperty] 
+	public partial string ResolutionText { get; set; } = string.Empty;
 
 	public IReadOnlyList<CameraInfo> Cameras => cameraProvider?.AvailableCameras ?? [];
 
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs
index c6061660a0..b93f426cbe 100644
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs
@@ -42,6 +42,7 @@ public override void ViewDidLayoutSubviews()
 		base.ViewDidLayoutSubviews();
 
 		_ = View ?? throw new InvalidOperationException($"{nameof(View)} cannot be null.");
+		_ = View.Superview ?? throw new InvalidOperationException($"{nameof(View.Superview)} cannot be null.");
 
 		View.Superview.Layer.CornerRadius = 0.0f;
 		View.Superview.Layer.MasksToBounds = false;
@@ -115,7 +116,7 @@ public void SetElement(IPopup element)
 	}
 
 	/// <summary>
-	/// Method to CleanUp the resources of the <see cref="MauiPopup"/>.
+	/// Method to clean up the resources of the <see cref="MauiPopup"/>.
 	/// </summary>
 	public void CleanUp()
 	{

From be16c67978f277e25041e8e755108421e14bea00 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Thu, 19 Dec 2024 13:46:43 -0800
Subject: [PATCH 03/39] Fix mvvmtk0045 warnings for `SpeechToTextViewModel`
 (#2402)

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../ViewModels/Essentials/SpeechToTextViewModel.cs          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
index 8e30cf1cd9..6ae0f3b8a4 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
@@ -24,13 +24,13 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	public partial string? RecognitionText { get; set; } = "Welcome to .NET MAUI Community Toolkit!";
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ListenCommand))]
-	bool canListenExecute = true;
+	public partial bool CanListenExecute { get; set; } = true;
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StartListenCommand))]
-	bool canStartListenExecute = true;
+	public partial bool CanStartListenExecute { get; set; } = true;
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StopListenCommand))]
-	bool canStopListenExecute = false;
+	public partial bool CanStopListenExecute { get; set; } = false;
 
 	public SpeechToTextViewModel(ITextToSpeech textToSpeech, ISpeechToText speechToText)
 	{

From 1bcee8c054a09c79cc7b8fef36b0df08d50e5425 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Thu, 19 Dec 2024 14:04:04 -0800
Subject: [PATCH 04/39] Fix mvvmtk0045 warnings for
 `VariableMultiValueConverterViewModel` (#2401)

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../VariableMultiValueConverterViewModel.cs   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/VariableMultiValueConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/VariableMultiValueConverterViewModel.cs
index ec84d4ffd6..a9ee805be6 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/VariableMultiValueConverterViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/VariableMultiValueConverterViewModel.cs
@@ -5,6 +5,26 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Converters;
 public partial class VariableMultiValueConverterViewModel : BaseViewModel
 {
 	[ObservableProperty]
-	bool isAllGroupSwitch1On, isAllGroupSwitch2On, isAnyGroupSwitch1On, isAnyGroupSwitch2On,
-		isGreaterThanGroupSwitch1On, isGreaterThanGroupSwitch2On, isGreaterThanGroupSwitch3On, isGreaterThanGroupSwitch4On;
+	public partial bool IsAllGroupSwitch1On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsAllGroupSwitch2On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsAnyGroupSwitch1On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsAnyGroupSwitch2On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsGreaterThanGroupSwitch1On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsGreaterThanGroupSwitch2On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsGreaterThanGroupSwitch3On { get; set; }
+
+	[ObservableProperty]
+	public partial bool IsGreaterThanGroupSwitch4On { get; set; }
 }
\ No newline at end of file

From b01a18dcef03f955523b8ec71a3f02ec98c96824 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Thu, 19 Dec 2024 14:20:40 -0800
Subject: [PATCH 05/39] Fix mvvmtk0045 warning for `StateContainerViewModel`
 (#2400)

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../Layouts/StateContainerViewModel.cs        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Layouts/StateContainerViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Layouts/StateContainerViewModel.cs
index 6253d3faf6..dd083184ea 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Layouts/StateContainerViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Layouts/StateContainerViewModel.cs
@@ -6,16 +6,28 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Layouts;
 public partial class StateContainerViewModel : BaseViewModel
 {
 	[ObservableProperty]
-	string? currentState, gridState, noAnimateState, notFoundState, fullPageState;
+	public partial string? CurrentState { get; set; }
+
+	[ObservableProperty]
+	public partial string? GridState { get; set; }
+
+	[ObservableProperty]
+	public partial string? NoAnimateState { get; set; }
+
+	[ObservableProperty]
+	public partial string? NotFoundState { get; set; }
+
+	[ObservableProperty]
+	public partial string? FullPageState { get; set; }
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ToggleGridStateCommand))]
-	bool canGridStateChange = true;
+	public partial bool CanGridStateChange { get; set; } = true;
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(CycleStatesCommand))]
-	bool canCycleStateChange = true;
+	public partial bool CanCycleStateChange { get; set; } = true;
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ToggleFullPageStateCommand))]
-	bool canFullPageStateChange = true;
+	public partial bool CanFullPageStateChange { get; set; } = true;
 
 	[ObservableProperty]
 	public partial bool CanAnimationStateChange { get; set; } = true;

From 4766a1492fba0519bb101f961aa9c98fb8e40447 Mon Sep 17 00:00:00 2001
From: matt-bartholomew <148586208+matt-bartholomew@users.noreply.github.com>
Date: Tue, 24 Dec 2024 15:16:55 -0500
Subject: [PATCH 06/39] change to ResetValidationTokenSource to guard against a
 disposed validationTokenSource (#2344)

* change to ResetValidationTokenSource to guard against a disposed validationTokenSource

* add .Dispose() after cancel()

---------

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../Validators/ValidationBehavior.shared.cs          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs b/src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs
index 4b5f6a000a..797ccdd884 100644
--- a/src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs
+++ b/src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs
@@ -419,8 +419,16 @@ void UpdateStyle(in VisualElement view, bool isValid)
 
 	void ResetValidationTokenSource(CancellationTokenSource? newTokenSource)
 	{
-		validationTokenSource?.Cancel();
-		validationTokenSource = newTokenSource;
+		try
+		{
+			validationTokenSource?.Cancel();
+			validationTokenSource?.Dispose();
+		}
+		catch (ObjectDisposedException) { }
+		finally
+		{
+			validationTokenSource = newTokenSource;
+		}
 	}
 }
 

From e97b4a631ff9e3fc592bf1e3858beb3e32bc7938 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Tue, 24 Dec 2024 12:40:58 -0800
Subject: [PATCH 07/39] Fix mvvmtk0045 and XC0045 warnings (#2403)

* Fix mvvmtk0045 warnings
Fix XamlC warning XC0045 Value not found

* Fix incorrect initial bool values

* Update formatting

* Update Formatting

* Update CustomSizeAndPositionPopupViewModel.cs

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../IndexToArrayItemConverterPage.xaml        |  4 +--
 .../Essentials/SpeechToTextViewModel.cs       | 24 +++++++-------
 .../Views/CameraView/CameraViewViewModel.cs   | 14 ++++----
 .../CustomSizeAndPositionPopupViewModel.cs    | 33 ++++++++++++++++---
 4 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IndexToArrayItemConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IndexToArrayItemConverterPage.xaml
index 19f3d0ca65..af9c14dcf1 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IndexToArrayItemConverterPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IndexToArrayItemConverterPage.xaml
@@ -45,8 +45,8 @@
                      Grid.Column="0"
                      Grid.Row="2"/>
 
-            <Label Text="{Binding Source={x:Reference Stepper},
-                                Path=Value, StringFormat='Selected index: {0}'}"
+            <Label x:DataType="{x:Type Stepper}" 
+                    Text="{Binding Source={x:Reference Stepper}, Path=Value, StringFormat='Selected index: {0}'}"
                     VerticalOptions="CenterAndExpand"
                     FontAttributes="Bold"
                     Grid.Row="2"
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
index 6ae0f3b8a4..da9f1d19b0 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
@@ -17,6 +17,18 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	readonly ITextToSpeech textToSpeech;
 	readonly ISpeechToText speechToText;
 
+	public SpeechToTextViewModel(ITextToSpeech textToSpeech, ISpeechToText speechToText)
+	{
+		this.textToSpeech = textToSpeech;
+		this.speechToText = speechToText;
+
+		Locales.CollectionChanged += HandleLocalesCollectionChanged;
+		this.speechToText.StateChanged += HandleSpeechToTextStateChanged;
+		this.speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
+	}
+
+	public ObservableCollection<Locale> Locales { get; } = [];
+	
 	[ObservableProperty]
 	public partial Locale? CurrentLocale { get; set; }
 
@@ -32,18 +44,6 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StopListenCommand))]
 	public partial bool CanStopListenExecute { get; set; } = false;
 
-	public SpeechToTextViewModel(ITextToSpeech textToSpeech, ISpeechToText speechToText)
-	{
-		this.textToSpeech = textToSpeech;
-		this.speechToText = speechToText;
-
-		Locales.CollectionChanged += HandleLocalesCollectionChanged;
-		this.speechToText.StateChanged += HandleSpeechToTextStateChanged;
-		this.speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
-	}
-
-	public ObservableCollection<Locale> Locales { get; } = [];
-
 	[RelayCommand]
 	async Task SetLocales(CancellationToken token)
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 1520ed8017..c8d5113bd4 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -7,6 +7,14 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseViewModel
 {
+	readonly ICameraProvider cameraProvider = cameraProvider;
+	
+	public IReadOnlyList<CameraInfo> Cameras => cameraProvider.AvailableCameras ?? [];
+
+	public CancellationToken Token => CancellationToken.None;
+
+	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
+	
 	[ObservableProperty]
 	public partial CameraFlashMode FlashMode { get; set; }
 
@@ -34,12 +42,6 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 	[ObservableProperty] 
 	public partial string ResolutionText { get; set; } = string.Empty;
 
-	public IReadOnlyList<CameraInfo> Cameras => cameraProvider?.AvailableCameras ?? [];
-
-	public CancellationToken Token => CancellationToken.None;
-
-	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
-
 	[RelayCommand]
 	async Task RefreshCameras(CancellationToken token) => await cameraProvider.RefreshAvailableCameras(token);
 
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
index 4013d3da44..f870365fe7 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
@@ -8,17 +8,40 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 public partial class CustomSizeAndPositionPopupViewModel : BaseViewModel
 {
+	public IReadOnlyList<string> FlowDirectionOptions { get; } = [.. Enum.GetNames<FlowDirection>()];
+	
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	double height = 100, width = 100;
+	public partial double Height { get; set; } = 100;
+	
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial double Width { get; set; } = 100;
+
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsStartHorizontalOptionSelected { get; set; } = true;
+	
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsCenterHorizontalOptionSelected { get; set; }
+
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsEndHorizontalOptionSelected { get; set; }
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	bool isStartHorizontalOptionSelected = true, isCenterHorizontalOptionSelected, isEndHorizontalOptionSelected, isFillHorizontalOptionSelected,
-		isStartVerticalOptionSelected = true, isCenterVerticalOptionSelected, isEndVerticalOptionSelected, isFillVerticalOptionSelected;
+	public partial bool IsFillHorizontalOptionSelected { get; set; }
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	int flowDirectionSelectedIndex;
+	public partial bool IsStartVerticalOptionSelected { get; set; } = true;
 
-	public IReadOnlyList<string> FlowDirectionOptions { get; } = Enum.GetNames<FlowDirection>().ToList();
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsCenterVerticalOptionSelected { get; set; }
+
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsEndVerticalOptionSelected { get; set; }
+	
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial bool IsFillVerticalOptionSelected { get; set; }
+
+	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
+	public partial int FlowDirectionSelectedIndex { get; set; }
 
 	[RelayCommand(CanExecute = nameof(CanShowButtonExecute))]
 	public Task ExecuteShowButton(CancellationToken token)

From 3c44236ed9cc7bef059e7d5d4478dfb7b029ade6 Mon Sep 17 00:00:00 2001
From: Marcel Wolterbeek <Marcel@forestcreek.nl>
Date: Tue, 24 Dec 2024 21:58:56 +0100
Subject: [PATCH 08/39] Fix bug CameraView on iOS: camera preview is not always
 rotated correct and photos are rotated (#2312)

* Fix bug CameraView on iOS: camera preview is not always rotated correct and photos are rotated

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

Co-authored-by: Shaun Lawrence <shaunrlawrence@gmail.com>

* Removed the null forgiving operator ! and added null checks. Removed TODO comment.

* Add exception message to the OnMediaCaptureFailed call

* Use `static` on iOS Devices

* Assign field `previewView`, Use pattern matching on `AVMediaTypes.Video.GetConstant()` , remove iOS 11 and iOS 13 checks since `CommunityToolkit.Maui.Camera` only supports iOS 15+

* Initialize `previewView` first

---------

Co-authored-by: Shaun Lawrence <shaunrlawrence@gmail.com>
Co-authored-by: James Crutchley <ne0rmatrix@gmail.com>
Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../CommunityToolkit.Maui.Sample.csproj       |   2 +-
 .../CameraManager.macios.cs                   | 104 ++++++++++++------
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 02e75fa0bc..d71cec561b 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -101,7 +101,7 @@
 
   <!-- Fixes Static Registrar causing Linker error: https://github.com/xamarin/xamarin-macios/blob/main/docs/managed-static-registrar.md -->
   <Target Name="SelectStaticRegistrar" AfterTargets="SelectRegistrar">
-    <PropertyGroup Condition="'$(Registrar)' == 'managed-static' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='maccatalyst'">
+    <PropertyGroup Condition="'$(Registrar)' == 'managed-static'">
         <Registrar>static</Registrar>
     </PropertyGroup>
   </Target>
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 8136af4374..6947fde272 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -1,6 +1,4 @@
-using System.Buffers;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
+using System.Diagnostics;
 using AVFoundation;
 using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Extensions;
@@ -22,6 +20,10 @@ partial class CameraManager
 
 	AVCaptureFlashMode flashMode;
 
+	IDisposable? orientationDidChangeObserver;
+	PreviewView? previewView;
+	AVCaptureVideoOrientation videoOrientation;
+
 	// IN the future change the return type to be an alias
 	public UIView CreatePlatformView()
 	{
@@ -29,12 +31,15 @@ public UIView CreatePlatformView()
 		{
 			SessionPreset = AVCaptureSession.PresetPhoto
 		};
-
-		var previewView = new PreviewView
+		
+		previewView = new PreviewView
 		{
 			Session = captureSession
 		};
 
+		orientationDidChangeObserver = UIDevice.Notifications.ObserveOrientationDidChange((_, _) => UpdateVideoOrientation());
+		UpdateVideoOrientation();
+
 		return previewView;
 	}
 
@@ -194,41 +199,51 @@ protected virtual async partial ValueTask PlatformTakePicture(CancellationToken
 		var capturePhotoSettings = AVCapturePhotoSettings.FromFormat(codecSettings);
 		capturePhotoSettings.FlashMode = photoOutput.SupportedFlashModes.Contains(flashMode) ? flashMode : photoOutput.SupportedFlashModes.First();
 
+		if (AVMediaTypes.Video.GetConstant() is NSString avMediaTypeVideo)
+		{
+			var photoOutputConnection = photoOutput.ConnectionFromMediaType(avMediaTypeVideo);
+			if (photoOutputConnection is not null)
+			{
+				photoOutputConnection.VideoOrientation = videoOrientation;
+			}
+		}
+
 		var wrapper = new AVCapturePhotoCaptureDelegateWrapper();
 
 		photoOutput.CapturePhoto(capturePhotoSettings, wrapper);
 
 		var result = await wrapper.Task.WaitAsync(token);
-		var data = result.Photo.FileDataRepresentation;
-
 		if (result.Error is not null)
 		{
-			cameraView.OnMediaCapturedFailed(result.Error.LocalizedFailureReason);
-			return;
-		}
+			var failureReason = result.Error.LocalizedDescription;
+			if (!string.IsNullOrEmpty(result.Error.LocalizedFailureReason))
+			{
+				failureReason = $"{failureReason} - {result.Error.LocalizedFailureReason}";
+			}
 
-		if (data is null)
-		{
-			cameraView.OnMediaCapturedFailed("Unable to retrieve the file data representation from the captured result.");
+			cameraView.OnMediaCapturedFailed(failureReason);
 			return;
 		}
 
-		var dataBytes = ArrayPool<byte>.Shared.Rent((int)data.Length);
-
+		Stream? imageData;
 		try
 		{
-			Marshal.Copy(data.Bytes, dataBytes, 0, (int)data.Length);
-
-			cameraView.OnMediaCaptured(new MemoryStream(dataBytes));
+			imageData = result.Photo.FileDataRepresentation?.AsStream();
+		}
+		catch (Exception e)
+		{
+			// possible exception: ObjCException NSInvalidArgumentException NSAllocateMemoryPages(...) failed in AVCapturePhoto.get_FileDataRepresentation()
+			cameraView.OnMediaCapturedFailed($"Unable to retrieve the file data representation from the captured result: {e.Message}");
+			return;
 		}
-		catch (Exception ex)
+
+		if (imageData is null)
 		{
-			cameraView.OnMediaCapturedFailed(ex.Message);
-			throw;
+			cameraView.OnMediaCapturedFailed("Unable to retrieve the file data representation from the captured result.");
 		}
-		finally
+		else
 		{
-			ArrayPool<byte>.Shared.Return(dataBytes);
+			cameraView.OnMediaCaptured(imageData);
 		}
 	}
 
@@ -243,11 +258,37 @@ protected virtual void Dispose(bool disposing)
 			captureInput?.Dispose();
 			captureInput = null;
 
+			orientationDidChangeObserver?.Dispose();
+			orientationDidChangeObserver = null;
+
 			photoOutput?.Dispose();
 			photoOutput = null;
 		}
 	}
 
+	static AVCaptureVideoOrientation GetVideoOrientation()
+	{
+		IEnumerable<UIScene> scenes = UIApplication.SharedApplication.ConnectedScenes;
+		var interfaceOrientation = scenes.FirstOrDefault() is UIWindowScene windowScene 
+			? windowScene.InterfaceOrientation 
+			: UIApplication.SharedApplication.StatusBarOrientation;
+
+		return interfaceOrientation switch
+		{
+			UIInterfaceOrientation.Portrait => AVCaptureVideoOrientation.Portrait,
+			UIInterfaceOrientation.PortraitUpsideDown => AVCaptureVideoOrientation.PortraitUpsideDown,
+			UIInterfaceOrientation.LandscapeRight => AVCaptureVideoOrientation.LandscapeRight,
+			UIInterfaceOrientation.LandscapeLeft => AVCaptureVideoOrientation.LandscapeLeft,
+			_ => AVCaptureVideoOrientation.Portrait
+		};
+	}
+
+	void UpdateVideoOrientation()
+	{
+		videoOrientation = GetVideoOrientation();
+		previewView?.UpdatePreviewVideoOrientation(videoOrientation);
+	}
+
 	sealed class AVCapturePhotoCaptureDelegateWrapper : AVCapturePhotoCaptureDelegate
 	{
 		readonly TaskCompletionSource<CapturePhotoResult> taskCompletionSource = new();
@@ -299,20 +340,15 @@ public AVCaptureSession? Session
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
+			UpdatePreviewVideoOrientation(GetVideoOrientation());
+		}
 
-			if (PreviewLayer.Connection is null)
+		public void UpdatePreviewVideoOrientation(AVCaptureVideoOrientation videoOrientation)
+		{
+			if (PreviewLayer.Connection is not null)
 			{
-				return;
+				PreviewLayer.Connection.VideoOrientation = videoOrientation;
 			}
-
-			PreviewLayer.Connection.VideoOrientation = UIDevice.CurrentDevice.Orientation switch
-			{
-				UIDeviceOrientation.Portrait => AVCaptureVideoOrientation.Portrait,
-				UIDeviceOrientation.PortraitUpsideDown => AVCaptureVideoOrientation.PortraitUpsideDown,
-				UIDeviceOrientation.LandscapeLeft => AVCaptureVideoOrientation.LandscapeRight,
-				UIDeviceOrientation.LandscapeRight => AVCaptureVideoOrientation.LandscapeLeft,
-				_ => PreviewLayer.Connection.VideoOrientation
-			};
 		}
 	}
 }
\ No newline at end of file

From 1f67ed4d976ee2edfed9b5d9c36f2c4e9b1d736a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:09:35 +0000
Subject: [PATCH 09/39] Bump coverlet.collector from 6.0.2 to 6.0.3 in /samples
 (#2421)

---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index a827be166e..ba0727555e 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="All" />
-    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="All" />
+    <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
   </ItemGroup>
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index 6819bfa349..a3d925a581 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit.v3" Version="1.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="All" />
-    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="All" />
+    <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>
   </ItemGroup>
 

From 33bda603e922cb5b07435bcbb60dea5c235cda00 Mon Sep 17 00:00:00 2001
From: mike lorengo <mikelor@gmail.com>
Date: Thu, 2 Jan 2025 10:48:30 -0800
Subject: [PATCH 10/39] Fix for #2407 - MapHandler Throws
 InvalidSystemOperationExcetption (#2409)

* Call EnsureCoreWebView2Async() before trying to execute script
Fixes #2407

* Rename to `TryCallJSMethod`

* Update MapHandler.Windows.cs

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../CommunityToolkit.Maui.Sample.csproj       |  2 +-
 .../Handler/Map/MapHandler.Windows.cs         | 56 +++++++++++--------
 .../CommunityToolkit.Maui.csproj              |  9 ++-
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index d71cec561b..48b07aeb5f 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -22,7 +22,7 @@
     <ApplicationVersion>1</ApplicationVersion>
 
     <!--
-    Uncomment the line below if you need to debug the SG code
+    Uncomment the lines below if you need to debug the SG code
     If you see any LongPath issue on Windows, check this doc
     https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later
     -->
diff --git a/src/CommunityToolkit.Maui.Maps/Handler/Map/MapHandler.Windows.cs b/src/CommunityToolkit.Maui.Maps/Handler/Map/MapHandler.Windows.cs
index 04da317f1c..c205c93a02 100644
--- a/src/CommunityToolkit.Maui.Maps/Handler/Map/MapHandler.Windows.cs
+++ b/src/CommunityToolkit.Maui.Maps/Handler/Map/MapHandler.Windows.cs
@@ -62,6 +62,7 @@ protected override FrameworkElement CreatePlatformView()
 		webView.NavigationCompleted += HandleWebViewNavigationCompleted;
 		webView.WebMessageReceived += WebViewWebMessageReceived;
 		webView.LoadHtml(mapPage, null);
+
 		return webView;
 	}
 
@@ -88,7 +89,7 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 	/// </summary>
 	public static new Task MapMapType(IMapHandler handler, IMap map)
 	{
-		return CallJSMethod(handler.PlatformView, $"setMapType('{map.MapType}');");
+		return TryCallJSMethod(handler.PlatformView, $"setMapType('{map.MapType}');");
 	}
 
 	/// <summary>
@@ -96,7 +97,7 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 	/// </summary>
 	public static new Task MapIsZoomEnabled(IMapHandler handler, IMap map)
 	{
-		return CallJSMethod(handler.PlatformView, $"disableMapZoom({(!map.IsZoomEnabled).ToString().ToLower()});");
+		return TryCallJSMethod(handler.PlatformView, $"disableMapZoom({(!map.IsZoomEnabled).ToString().ToLower()});");
 	}
 
 	/// <summary>
@@ -104,7 +105,7 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 	/// </summary>
 	public static new Task MapIsScrollEnabled(IMapHandler handler, IMap map)
 	{
-		return CallJSMethod(handler.PlatformView, $"disablePanning({(!map.IsScrollEnabled).ToString().ToLower()});");
+		return TryCallJSMethod(handler.PlatformView, $"disablePanning({(!map.IsScrollEnabled).ToString().ToLower()});");
 	}
 
 	/// <summary>
@@ -112,7 +113,7 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 	/// </summary>
 	public static new Task MapIsTrafficEnabled(IMapHandler handler, IMap map)
 	{
-		return CallJSMethod(handler.PlatformView, $"disableTraffic({(!map.IsTrafficEnabled).ToString().ToLower()});");
+		return TryCallJSMethod(handler.PlatformView, $"disableTraffic({(!map.IsTrafficEnabled).ToString().ToLower()});");
 	}
 
 	/// <summary>
@@ -123,14 +124,14 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 		if (map.IsShowingUser)
 		{
 			var location = await GetCurrentLocation();
-			if (location != null)
+			if (location is not null)
 			{
-				await CallJSMethod(handler.PlatformView, $"addLocationPin({location.Latitude.ToString(CultureInfo.InvariantCulture)},{location.Longitude.ToString(CultureInfo.InvariantCulture)});");
+				await TryCallJSMethod(handler.PlatformView, $"addLocationPin({location.Latitude.ToString(CultureInfo.InvariantCulture)},{location.Longitude.ToString(CultureInfo.InvariantCulture)});");
 			}
 		}
 		else
 		{
-			await CallJSMethod(handler.PlatformView, "removeLocationPin();");
+			await TryCallJSMethod(handler.PlatformView, "removeLocationPin();");
 		}
 	}
 
@@ -139,13 +140,13 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 	/// </summary>
 	public static new async Task MapPins(IMapHandler handler, IMap map)
 	{
-		await CallJSMethod(handler.PlatformView, "removeAllPins();");
+		await TryCallJSMethod(handler.PlatformView, "removeAllPins();");
 
 		var addPinTaskList = new List<Task>();
 
 		foreach (var pin in map.Pins)
 		{
-			addPinTaskList.Add(CallJSMethod(handler.PlatformView, $"addPin({pin.Location.Latitude.ToString(CultureInfo.InvariantCulture)}," +
+			addPinTaskList.Add(TryCallJSMethod(handler.PlatformView, $"addPin({pin.Location.Latitude.ToString(CultureInfo.InvariantCulture)}," +
 				$"{pin.Location.Longitude.ToString(CultureInfo.InvariantCulture)},'{pin.Label}', '{pin.Address}', '{(pin as Pin)?.Id}');"));
 		}
 
@@ -172,22 +173,33 @@ protected override void DisconnectHandler(FrameworkElement platformView)
 			mapHandler.regionToGo = newRegion;
 		}
 
-		await CallJSMethod(handler.PlatformView, $"setRegion({newRegion.Center.Latitude.ToString(CultureInfo.InvariantCulture)},{newRegion.Center.Longitude.ToString(CultureInfo.InvariantCulture)},{newRegion.LatitudeDegrees.ToString(CultureInfo.InvariantCulture)},{newRegion.LongitudeDegrees.ToString(CultureInfo.InvariantCulture)});");
+		await TryCallJSMethod(handler.PlatformView, $"setRegion({newRegion.Center.Latitude.ToString(CultureInfo.InvariantCulture)},{newRegion.Center.Longitude.ToString(CultureInfo.InvariantCulture)},{newRegion.LatitudeDegrees.ToString(CultureInfo.InvariantCulture)},{newRegion.LongitudeDegrees.ToString(CultureInfo.InvariantCulture)});");
 	}
 
-	static async Task CallJSMethod(FrameworkElement platformWebView, string script)
+	static async Task<bool> TryCallJSMethod(FrameworkElement platformWebView, string script)
 	{
-		if (platformWebView is WebView2 webView2)
+		if (platformWebView is not WebView2 webView2)
 		{
-			var tcs = new TaskCompletionSource();
-			webView2.DispatcherQueue.TryEnqueue(async () =>
-			{
-				await webView2.ExecuteScriptAsync(script);
-				tcs.SetResult();
-			});
+			return false;
+		}
 
-			await tcs.Task;
+		await webView2.EnsureCoreWebView2Async();
+
+		var tcs = new TaskCompletionSource();
+		var isEnqueueSuccessful = webView2.DispatcherQueue.TryEnqueue(async () =>
+		{
+			await webView2.ExecuteScriptAsync(script);
+			tcs.SetResult();
+		});
+
+		if (!isEnqueueSuccessful)
+		{
+			return false;
 		}
+
+		await tcs.Task;
+
+		return true;
 	}
 
 	static string GetMapHtmlPage(string key)
@@ -413,7 +425,7 @@ async void HandleWebViewNavigationCompleted(WebView2 sender, CoreWebView2Navigat
 		// Update initial properties when our page is loaded
 		Mapper.UpdateProperties(this, VirtualView);
 
-		if (regionToGo != null)
+		if (regionToGo is not null)
 		{
 			await MapMoveToRegion(this, VirtualView, regionToGo);
 		}
@@ -476,7 +488,7 @@ async void WebViewWebMessageReceived(WebView2 sender, CoreWebView2WebMessageRece
 					var hideInfoWindow = clickedPin?.SendInfoWindowClick();
 					if (hideInfoWindow is not false)
 					{
-						await CallJSMethod(PlatformView, "hideInfoWindow();");
+						await TryCallJSMethod(PlatformView, "hideInfoWindow();");
 					}
 				}
 				break;
@@ -492,7 +504,7 @@ async void WebViewWebMessageReceived(WebView2 sender, CoreWebView2WebMessageRece
 					var hideInfoWindow = clickedPin?.SendMarkerClick();
 					if (hideInfoWindow is not false)
 					{
-						await CallJSMethod(PlatformView, "hideInfoWindow();");
+						await TryCallJSMethod(PlatformView, "hideInfoWindow();");
 					}
 				}
 				break;
diff --git a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
index 1b7881f10a..4ad219cbda 100644
--- a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
+++ b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
@@ -8,8 +8,13 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsAotCompatible>true</IsAotCompatible>
 
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
+    <!--
+    Uncomment the lines below if you need to debug the SG code
+    If you see any LongPath issue on Windows, check this doc
+    https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later
+    -->
+    <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath> -->
 
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 

From 03ba2002689f5d991005b14a59bb40acc4fbdd38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Jan 2025 22:32:14 -0800
Subject: [PATCH 11/39] Bump xunit from 2.9.2 to 2.9.3 in /samples (#2432)

---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index ba0727555e..3e373b36f4 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />

From 9df634999ae7088f594a207cf2f0f81458ecc52a Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:25:08 +0200
Subject: [PATCH 12/39] Offline Speech Recognition #2089 (#2242)

---
 samples/CommunityToolkit.Maui.Sample.sln      |   2 +-
 .../AppShell.xaml.cs                          |   1 +
 .../CommunityToolkit.Maui.Sample.csproj       |   1 -
 .../MauiProgram.cs                            |   4 +-
 .../Essentials/OfflineSpeechToTextPage.xaml   |  82 +++++++++
 .../OfflineSpeechToTextPage.xaml.cs           |  11 ++
 .../Pages/Essentials/SpeechToTextPage.xaml    |  49 ++----
 .../Essentials/EssentialsGalleryViewModel.cs  |   3 +-
 .../OfflineSpeechToTextViewModel.cs           |  77 ++++++++
 .../Essentials/SpeechToTextViewModel.cs       |  91 +++-------
 ...TextRecognitionResultCompletedEventArgs.cs |   4 +-
 .../SpeechToText/ISpeechToText.shared.cs      |  15 +-
 ...SharedSpeechToTextImplementation.macios.cs |  71 ++++++++
 .../OfflineSpeechToText.shared.cs             |  30 ++++
 ...flineSpeechToTextImplementation.android.cs | 164 ++++++++++++++++++
 .../OfflineSpeechToTextImplementation.ios.cs  |  84 +++++++++
 ...OfflineSpeechToTextImplementation.macos.cs |  95 ++++++++++
 .../OfflineSpeechToTextImplementation.net.cs  |  26 +++
 ...fflineSpeechToTextImplementation.shared.cs |  85 +++++++++
 ...OfflineSpeechToTextImplementation.tizen.cs | 122 +++++++++++++
 ...flineSpeechToTextImplementation.windows.cs | 110 ++++++++++++
 ...SharedSpeechToTextImplementation.macios.cs |  40 +----
 .../SpeechToText/SpeechToText.shared.cs       |   8 +-
 .../SpeechToTextImplementation.android.cs     |  62 +++----
 .../SpeechToTextImplementation.ios.cs         |  19 +-
 .../SpeechToTextImplementation.macos.cs       |  24 +--
 .../SpeechToTextImplementation.net.cs         |   8 +-
 .../SpeechToTextImplementation.shared.cs      |  27 +--
 .../SpeechToTextImplementation.tizen.cs       |  46 +----
 .../SpeechToTextImplementation.windows.cs     |  72 +++-----
 .../SpeechToText/SpeechToTextOptions.cs       |  19 ++
 .../SpeechToText/SpeechToTextResult.shared.cs |   4 +
 .../SpeechToText/SpeechToTextState.shared.cs  |   7 +-
 .../Essentials/SpeechToTextTests.cs           |  19 +-
 .../Mocks/SpeechToTextImplementationMock.cs   |  13 +-
 35 files changed, 1130 insertions(+), 365 deletions(-)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSharedSpeechToTextImplementation.macios.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.net.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.tizen.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.windows.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextOptions.cs

diff --git a/samples/CommunityToolkit.Maui.Sample.sln b/samples/CommunityToolkit.Maui.Sample.sln
index 94bec1c258..880a72a736 100644
--- a/samples/CommunityToolkit.Maui.Sample.sln
+++ b/samples/CommunityToolkit.Maui.Sample.sln
@@ -51,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Camer
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{ED5A9C0B-D270-442D-BABE-F4FF622926C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "..\src\CommunityToolkit.Maui.Analyzers.Benchmarks\CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "{B80F59B7-276C-4A55-A8DD-54587C8BC3D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Analyzers.Benchmarks", "..\src\CommunityToolkit.Maui.Analyzers.Benchmarks\CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "{B80F59B7-276C-4A55-A8DD-54587C8BC3D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index d24ccb279f..5010fa1b96 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -93,6 +93,7 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<FileSaverPage, FileSaverViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<FolderPickerPage, FolderPickerViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<SpeechToTextPage, SpeechToTextViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
+		CreateViewModelMapping<OfflineSpeechToTextPage, OfflineSpeechToTextViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 
 		// Add Extensions View Models
 		CreateViewModelMapping<ColorAnimationExtensionsPage, ColorAnimationExtensionsViewModel, ExtensionsGalleryPage, ExtensionsGalleryViewModel>(),
diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 48b07aeb5f..e42add8cf5 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -65,7 +65,6 @@
     <MauiFont Include="Resources\Fonts\*" />
 
     <PackageReference Include="Microsoft.Maui.Controls" Version="*" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="*" />
     <PackageReference Include="CommunityToolkit.Maui.Markup" Version="5.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index 3fbe220fba..1dba8b3525 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -228,6 +228,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<FileSaverPage, FileSaverViewModel>();
 		services.AddTransientWithShellRoute<FolderPickerPage, FolderPickerViewModel>();
 		services.AddTransientWithShellRoute<SpeechToTextPage, SpeechToTextViewModel>();
+		services.AddTransientWithShellRoute<OfflineSpeechToTextPage, OfflineSpeechToTextViewModel>();
 
 		// Add Extensions Pages + ViewModels
 		services.AddTransientWithShellRoute<ColorAnimationExtensionsPage, ColorAnimationExtensionsViewModel>();
@@ -279,7 +280,8 @@ static void RegisterEssentials(in IServiceCollection services)
 		services.AddSingleton<IFileSystem>(FileSystem.Current);
 		services.AddSingleton<IFolderPicker>(FolderPicker.Default);
 		services.AddSingleton<IBadge>(Badge.Default);
-		services.AddSingleton<ISpeechToText>(SpeechToText.Default);
+		services.AddKeyedSingleton<ISpeechToText, SpeechToTextImplementation>("Online");
+		services.AddKeyedSingleton<ISpeechToText, OfflineSpeechToTextImplementation>("Offline");
 		services.AddSingleton<ITextToSpeech>(TextToSpeech.Default);
 	}
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml
new file mode 100644
index 0000000000..e2821e21bd
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
+                x:Class="CommunityToolkit.Maui.Sample.Pages.Essentials.OfflineSpeechToTextPage"
+                xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Essentials"
+                xmlns:essentials="clr-namespace:CommunityToolkit.Maui.Sample.Pages.Essentials"
+                x:TypeArguments="vm:OfflineSpeechToTextViewModel"
+                x:DataType="vm:OfflineSpeechToTextViewModel"
+                Title="OfflineSpeechToText">
+
+    <ScrollView>
+        <VerticalStackLayout
+            Spacing="20"
+            Padding="30,0">
+
+            <Label
+                Text="OfflineSpeechToText allows the user to convert speech to text in real time in offline."
+                HorizontalTextAlignment="Center"/>
+
+            <Label
+                Text="State"
+                FontAttributes="Bold"/>
+
+            <Label
+                Text="{Binding State}"
+                FontSize="18"
+                HorizontalOptions="Center"
+                HorizontalTextAlignment="Center"
+                MinimumHeightRequest="100" />
+
+            <Label
+                Text="Language Output"
+                FontAttributes="Bold"/>
+
+            <Label
+                Text="{Binding RecognitionText}"
+                FontSize="18"
+                HorizontalOptions="Center"
+                HorizontalTextAlignment="Center"
+                MinimumHeightRequest="100" />
+
+            <Border
+                StrokeThickness="2"
+                Stroke="#808080"
+                StrokeShape="RoundRectangle 8,8,8,8"
+                Padding="12">
+                <Border.Content>
+                    <Grid RowDefinitions="*,60"
+                          ColumnDefinitions="*,*"
+                          RowSpacing="12"
+                          ColumnSpacing="12">
+
+                        <Button
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Text="StartListenAsync"
+                            Command="{Binding StartListenCommand}"
+                            HorizontalOptions="End" />
+
+                        <Button
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Text="StopListenAsync"
+                            Command="{Binding StopListenCommand}"
+                            HorizontalOptions="Start" />
+
+                        <Label
+                            Grid.Row="1"
+                            Grid.ColumnSpan="2"
+                            Text="The `StartListenAsync` API starts the speech-to-text service and shares the results using `RecognitionResultUpdated` event and `RecognitionResultCompleted` event."
+                            HorizontalOptions="Center"
+                            HorizontalTextAlignment="Center"
+                            FontSize="12"/>
+
+                    </Grid>
+                </Border.Content>
+            </Border>
+        </VerticalStackLayout>
+    </ScrollView>
+
+</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs
new file mode 100644
index 0000000000..dcba9abc1a
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Essentials;
+
+public partial class OfflineSpeechToTextPage : BasePage<OfflineSpeechToTextViewModel>
+{
+	public OfflineSpeechToTextPage(OfflineSpeechToTextViewModel viewModel) : base(viewModel)
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml
index f1e425a533..f3bdf5777d 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml
@@ -31,6 +31,17 @@
                 SelectedItem="{Binding CurrentLocale}"
                 ItemDisplayBinding="{Binding ., Converter={StaticResource PickerLocaleDisplayConverter}}"/>
 
+            <Label
+                Text="State"
+                FontAttributes="Bold"/>
+
+            <Label
+                Text="{Binding State}"
+                FontSize="18"
+                HorizontalOptions="Center"
+                HorizontalTextAlignment="Center"
+                MinimumHeightRequest="100" />
+
             <Label
                 Text="Language Output"
                 FontAttributes="Bold"/>
@@ -47,44 +58,6 @@
                 Command="{Binding PlayCommand}"
                 HorizontalOptions="Center" />
 
-            <Border
-                StrokeThickness="2"
-                Stroke="#808080"
-                StrokeShape="RoundRectangle 8,8,8,8"
-                Padding="12">
-                <Border.Content>
-
-                    <Grid RowDefinitions="*,60"
-                          ColumnDefinitions="*,*"
-                          RowSpacing="12"
-                          ColumnSpacing="12">
-
-                        <Button
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Text="ListenAsync"
-                            Command="{Binding ListenCommand}"
-                            HorizontalOptions="End" />
-
-                        <Button
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Text="Cancel Token"
-                            Command="{Binding ListenCancelCommand}"
-                            HorizontalOptions="Start" />
-
-                        <Label
-                            Grid.Row="1"
-                            Grid.ColumnSpan="2"
-                            Text="The `ListenAsync` API allows you to await the final speech recognition results using async/await. `ListenAsync` is cancelled via CancellationToken."
-                            HorizontalOptions="Center"
-                            HorizontalTextAlignment="Center"
-                            FontSize="12"/>
-
-                    </Grid>
-                </Border.Content>
-            </Border>
-
             <Border
                 StrokeThickness="2"
                 Stroke="#808080"
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
index 7fb3de2b4b..fac6e18712 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
@@ -8,5 +8,6 @@ public partial class EssentialsGalleryViewModel() : BaseGalleryViewModel(
 	SectionModel.Create<BadgeViewModel>("Badge", "Allows the user to set app icon badge count on the home screen"),
 	SectionModel.Create<FileSaverViewModel>("FileSaver", "Allows the user to save files to the filesystem"),
 	SectionModel.Create<FolderPickerViewModel>("FolderPicker", "Allows picking folders from the file system"),
-	SectionModel.Create<SpeechToTextViewModel>("SpeechToText", "Converts speech to text")
+	SectionModel.Create<SpeechToTextViewModel>("SpeechToText", "Converts speech to text"),
+	SectionModel.Create<OfflineSpeechToTextViewModel>("OfflineSpeechToText", "Converts speech to text offline")
 ]);
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
new file mode 100644
index 0000000000..e4d2b90f4d
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
@@ -0,0 +1,77 @@
+using System.Globalization;
+using CommunityToolkit.Maui.Alerts;
+using CommunityToolkit.Maui.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+
+public partial class OfflineSpeechToTextViewModel : BaseViewModel
+{
+	readonly ISpeechToText speechToText;
+
+	public SpeechToTextState? State => speechToText.CurrentState;
+
+	[ObservableProperty]
+	string? recognitionText = "Welcome to .NET MAUI Community Toolkit!";
+
+	public OfflineSpeechToTextViewModel()
+	{
+		// For demo purposes. You can resolve dependency from the DI container,
+		speechToText = OfflineSpeechToText.Default;
+
+		speechToText.StateChanged += HandleSpeechToTextStateChanged;
+		speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
+	}
+
+	[RelayCommand]
+	async Task StartListen()
+	{
+		var isGranted = await speechToText.RequestPermissions(CancellationToken.None);
+		if (!isGranted)
+		{
+			await Toast.Make("Permission not granted").Show(CancellationToken.None);
+			return;
+		}
+
+		const string beginSpeakingPrompt = "Begin speaking...";
+
+		RecognitionText = beginSpeakingPrompt;
+
+		speechToText.RecognitionResultUpdated += HandleRecognitionResultUpdated;
+
+		await speechToText.StartListenAsync(new SpeechToTextOptions
+		{
+			Culture = CultureInfo.CurrentCulture,
+			ShouldReportPartialResults = true
+		}, CancellationToken.None);
+
+		if (RecognitionText is beginSpeakingPrompt)
+		{
+			RecognitionText = string.Empty;
+		}
+	}
+
+	[RelayCommand]
+	Task StopListen()
+	{
+		speechToText.RecognitionResultUpdated -= HandleRecognitionResultUpdated;
+
+		return speechToText.StopListenAsync(CancellationToken.None);
+	}
+
+	void HandleRecognitionResultUpdated(object? sender, SpeechToTextRecognitionResultUpdatedEventArgs e)
+	{
+		RecognitionText += e.RecognitionResult;
+	}
+
+	void HandleRecognitionResultCompleted(object? sender, SpeechToTextRecognitionResultCompletedEventArgs e)
+	{
+		RecognitionText = e.RecognitionResult.IsSuccessful ? e.RecognitionResult.Text : e.RecognitionResult.Exception.Message;
+	}
+
+	void HandleSpeechToTextStateChanged(object? sender, SpeechToTextStateChangedEventArgs e)
+	{
+		OnPropertyChanged(nameof(State));
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
index da9f1d19b0..ff7937ef41 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
@@ -17,7 +17,7 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	readonly ITextToSpeech textToSpeech;
 	readonly ISpeechToText speechToText;
 
-	public SpeechToTextViewModel(ITextToSpeech textToSpeech, ISpeechToText speechToText)
+	public SpeechToTextViewModel(ITextToSpeech textToSpeech, [FromKeyedServices("Online")]ISpeechToText speechToText)
 	{
 		this.textToSpeech = textToSpeech;
 		this.speechToText = speechToText;
@@ -28,16 +28,15 @@ public SpeechToTextViewModel(ITextToSpeech textToSpeech, ISpeechToText speechToT
 	}
 
 	public ObservableCollection<Locale> Locales { get; } = [];
+  
+	public SpeechToTextState? State => speechToText.CurrentState;
 	
 	[ObservableProperty]
 	public partial Locale? CurrentLocale { get; set; }
 
 	[ObservableProperty]
 	public partial string? RecognitionText { get; set; } = "Welcome to .NET MAUI Community Toolkit!";
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ListenCommand))]
-	public partial bool CanListenExecute { get; set; } = true;
-
+	
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StartListenCommand))]
 	public partial bool CanStartListenExecute { get; set; } = true;
 
@@ -82,67 +81,22 @@ async Task Play(CancellationToken cancellationToken)
 		}
 	}
 
-	[RelayCommand(IncludeCancelCommand = true, CanExecute = nameof(CanListenExecute))]
-	async Task Listen(CancellationToken cancellationToken)
-	{
-		CanStartListenExecute = false;
-
-		try
-		{
-			var isGranted = await speechToText.RequestPermissions(cancellationToken);
-			if (!isGranted)
-			{
-				await Toast.Make("Permission not granted").Show(cancellationToken);
-				return;
-			}
-
-			const string beginSpeakingPrompt = "Begin speaking...";
-
-			RecognitionText = beginSpeakingPrompt;
-
-			var recognitionResult = await speechToText.ListenAsync(
-				CultureInfo.GetCultureInfo(CurrentLocale?.Language ?? defaultLanguage),
-				new Progress<string>(partialText =>
-				{
-					if (RecognitionText is beginSpeakingPrompt)
-					{
-						RecognitionText = string.Empty;
-					}
-
-					RecognitionText += partialText + " ";
-				}), cancellationToken);
-
-			if (recognitionResult.IsSuccessful)
-			{
-				RecognitionText = recognitionResult.Text;
-			}
-			else
-			{
-				await Toast.Make(recognitionResult.Exception?.Message ?? "Unable to recognize speech").Show(CancellationToken.None);
-			}
-
-			if (RecognitionText is beginSpeakingPrompt)
-			{
-				RecognitionText = string.Empty;
-			}
-		}
-		finally
-		{
-			CanStartListenExecute = true;
-		}
-	}
-
 	[RelayCommand(CanExecute = nameof(CanStartListenExecute))]
-	async Task StartListen(CancellationToken cancellationToken)
+	async Task StartListen()
 	{
-		CanListenExecute = false;
 		CanStartListenExecute = false;
 		CanStopListenExecute = true;
 
-		var isGranted = await speechToText.RequestPermissions(cancellationToken);
+		var isGranted = await speechToText.RequestPermissions(CancellationToken.None);
 		if (!isGranted)
 		{
-			await Toast.Make("Permission not granted").Show(cancellationToken);
+			await Toast.Make("Permission not granted").Show(CancellationToken.None);
+			return;
+		}
+
+		if (Connectivity.NetworkAccess != NetworkAccess.Internet)
+		{
+			await Toast.Make("Internet connection is required").Show(CancellationToken.None);
 			return;
 		}
 
@@ -150,10 +104,14 @@ async Task StartListen(CancellationToken cancellationToken)
 
 		RecognitionText = beginSpeakingPrompt;
 
-		await speechToText.StartListenAsync(CultureInfo.GetCultureInfo(CurrentLocale?.Language ?? defaultLanguage), cancellationToken);
-
 		speechToText.RecognitionResultUpdated += HandleRecognitionResultUpdated;
 
+		await speechToText.StartListenAsync(new SpeechToTextOptions()
+		{
+			Culture = CultureInfo.GetCultureInfo(CurrentLocale?.Language ?? defaultLanguage),
+			ShouldReportPartialResults = true
+		}, CancellationToken.None);
+
 		if (RecognitionText is beginSpeakingPrompt)
 		{
 			RecognitionText = string.Empty;
@@ -161,15 +119,14 @@ async Task StartListen(CancellationToken cancellationToken)
 	}
 
 	[RelayCommand(CanExecute = nameof(CanStopListenExecute))]
-	Task StopListen(CancellationToken cancellationToken)
+	Task StopListen()
 	{
-		CanListenExecute = true;
 		CanStartListenExecute = true;
 		CanStopListenExecute = false;
 
 		speechToText.RecognitionResultUpdated -= HandleRecognitionResultUpdated;
 
-		return speechToText.StopListenAsync(cancellationToken);
+		return speechToText.StopListenAsync(CancellationToken.None);
 	}
 
 	void HandleRecognitionResultUpdated(object? sender, SpeechToTextRecognitionResultUpdatedEventArgs e)
@@ -179,12 +136,12 @@ void HandleRecognitionResultUpdated(object? sender, SpeechToTextRecognitionResul
 
 	void HandleRecognitionResultCompleted(object? sender, SpeechToTextRecognitionResultCompletedEventArgs e)
 	{
-		RecognitionText = e.RecognitionResult;
+		RecognitionText = e.RecognitionResult.IsSuccessful ? e.RecognitionResult.Text : e.RecognitionResult.Exception.Message;
 	}
 
-	async void HandleSpeechToTextStateChanged(object? sender, SpeechToTextStateChangedEventArgs e)
+	void HandleSpeechToTextStateChanged(object? sender, SpeechToTextStateChangedEventArgs e)
 	{
-		await Toast.Make($"State Changed: {e.State}").Show(CancellationToken.None);
+		OnPropertyChanged(nameof(State));
 	}
 
 	void HandleLocalesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/Events/SpeechToTextRecognitionResultCompletedEventArgs.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/Events/SpeechToTextRecognitionResultCompletedEventArgs.cs
index 3a08eb196c..03c3ff8596 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/Events/SpeechToTextRecognitionResultCompletedEventArgs.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/Events/SpeechToTextRecognitionResultCompletedEventArgs.cs
@@ -8,7 +8,7 @@ public class SpeechToTextRecognitionResultCompletedEventArgs : EventArgs
 	/// <summary>
 	/// Initialize a new instance of <see cref="SpeechToTextRecognitionResultCompletedEventArgs"/>
 	/// </summary>
-	public SpeechToTextRecognitionResultCompletedEventArgs(string recognitionResult)
+	public SpeechToTextRecognitionResultCompletedEventArgs(SpeechToTextResult recognitionResult)
 	{
 		RecognitionResult = recognitionResult;
 	}
@@ -16,5 +16,5 @@ public SpeechToTextRecognitionResultCompletedEventArgs(string recognitionResult)
 	/// <summary>
 	/// Speech recognition result
 	/// </summary>
-	public string RecognitionResult { get; }
+	public SpeechToTextResult RecognitionResult { get; }
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/ISpeechToText.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/ISpeechToText.shared.cs
index c9e6964905..75f3925446 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/ISpeechToText.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/ISpeechToText.shared.cs
@@ -27,24 +27,15 @@ public interface ISpeechToText : IAsyncDisposable
 	/// </summary>
 	SpeechToTextState CurrentState { get; }
 
-	/// <summary>
-	/// Converts speech to text in real time.
-	/// </summary>
-	/// <param name="culture">Speak language</param>
-	/// <param name="recognitionResult">Intermediate recognition result.</param>
-	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-	/// <returns>Final recognition result</returns>
-	Task<SpeechToTextResult> ListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken = default);
-
 	/// <summary>
 	/// Starts the SpeechToText service
 	/// </summary>
 	/// <remarks>
 	/// Real time speech recognition results will be surfaced via <see cref="RecognitionResultUpdated"/> and <see cref="RecognitionResultCompleted"/>
 	/// </remarks>
-	/// <param name="culture">Speak language</param>
-	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-	Task StartListenAsync(CultureInfo culture, CancellationToken cancellationToken = default);
+	/// <param name="options">The <see cref="SpeechToTextOptions"/> used to customize how the speech will be detected and converted to text.</param>
+	/// <param name="cancellationToken">A <see cref="CancellationToken"/> that provides the ability to cancel the starting process. Note that listening has started then you can only stop listening by calling <see cref="StopListenAsync"/>.</param>
+	Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Stops the SpeechToText service
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSharedSpeechToTextImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSharedSpeechToTextImplementation.macios.cs
new file mode 100644
index 0000000000..3e584d093e
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSharedSpeechToTextImplementation.macios.cs
@@ -0,0 +1,71 @@
+using AVFoundation;
+using Speech;
+
+namespace CommunityToolkit.Maui.Media;
+
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	AVAudioEngine? audioEngine;
+	SFSpeechRecognizer? speechRecognizer;
+	SFSpeechRecognitionTask? recognitionTask;
+	SFSpeechAudioBufferRecognitionRequest? liveSpeechRequest;
+
+	/// <inheritdoc/>
+	public SpeechToTextState CurrentState => recognitionTask?.State is SFSpeechRecognitionTaskState.Running
+												? SpeechToTextState.Listening
+												: SpeechToTextState.Stopped;
+
+
+	/// <inheritdoc />
+	public ValueTask DisposeAsync()
+	{
+		audioEngine?.Dispose();
+		speechRecognizer?.Dispose();
+		liveSpeechRequest?.Dispose();
+		recognitionTask?.Dispose();
+
+		audioEngine = null;
+		speechRecognizer = null;
+		liveSpeechRequest = null;
+		recognitionTask = null;
+		return ValueTask.CompletedTask;
+	}
+
+	/// <inheritdoc />
+	public Task<bool> RequestPermissions(CancellationToken cancellationToken = default)
+	{
+		var taskResult = new TaskCompletionSource<bool>();
+
+		SFSpeechRecognizer.RequestAuthorization(status => taskResult.SetResult(status is SFSpeechRecognizerAuthorizationStatus.Authorized));
+
+		return taskResult.Task.WaitAsync(cancellationToken);
+	}
+
+	static Task<bool> IsSpeechPermissionAuthorized(CancellationToken cancellationToken)
+	{
+		cancellationToken.ThrowIfCancellationRequested();
+		return Task.FromResult(SFSpeechRecognizer.AuthorizationStatus is SFSpeechRecognizerAuthorizationStatus.Authorized);
+	}
+
+	static void InitializeAvAudioSession(out AVAudioSession sharedAvAudioSession)
+	{
+		sharedAvAudioSession = AVAudioSession.SharedInstance();
+		if (UIDevice.CurrentDevice.CheckSystemVersion(15, 0))
+		{
+			sharedAvAudioSession.SetSupportsMultichannelContent(true, out _);
+		}
+
+		sharedAvAudioSession.SetCategory(
+			AVAudioSessionCategory.PlayAndRecord,
+			AVAudioSessionCategoryOptions.DefaultToSpeaker | AVAudioSessionCategoryOptions.AllowBluetooth | AVAudioSessionCategoryOptions.AllowAirPlay | AVAudioSessionCategoryOptions.AllowBluetoothA2DP);
+	}
+
+	void InternalStopListening()
+	{
+		audioEngine?.InputNode.RemoveTapOnBus(0);
+		audioEngine?.Stop();
+		liveSpeechRequest?.EndAudio();
+		recognitionTask?.Cancel();
+		OnSpeechToTextStateChanged(CurrentState);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
new file mode 100644
index 0000000000..d6f17e297f
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
@@ -0,0 +1,30 @@
+using System.Globalization;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc cref="ISpeechToText"/>
+/// <remarks>Offline Speech-To-Text provides offline speech recognition.</remarks>
+public static class OfflineSpeechToText
+{
+	static Lazy<ISpeechToText> defaultImplementation = new(new OfflineSpeechToTextImplementation());
+
+	/// <summary>
+	/// Default implementation of <see cref="ISpeechToText"/>
+	/// </summary>
+	public static ISpeechToText Default => defaultImplementation.Value;
+
+	/// <inheritdoc cref="ISpeechToText.StartListenAsync"/>
+	public static Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken = default) =>
+		Default.StartListenAsync(options, cancellationToken);
+
+	/// <inheritdoc cref="ISpeechToText.StopListenAsync"/>
+	public static Task StopListenAsync(CancellationToken cancellationToken = default) =>
+		Default.StopListenAsync(cancellationToken);
+	
+	/// <inheritdoc cref="ISpeechToText.RequestPermissions"/>
+	public static Task<bool> RequestPermissions(CancellationToken cancellationToken = default) =>
+		Default.RequestPermissions(cancellationToken);
+
+	internal static void SetDefault(ISpeechToText implementation) =>
+		defaultImplementation = new(implementation);
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
new file mode 100644
index 0000000000..ee0449d724
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
@@ -0,0 +1,164 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Runtime.Versioning;
+using Android.Content;
+using Android.Runtime;
+using Android.Speech;
+using Microsoft.Maui.ApplicationModel;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	SpeechRecognizer? speechRecognizer;
+	SpeechRecognitionListener? listener;
+	SpeechToTextState currentState = SpeechToTextState.Stopped;
+
+	/// <inheritdoc />
+	public SpeechToTextState CurrentState
+	{
+		get => currentState;
+		private set
+		{
+			if (currentState != value)
+			{
+				currentState = value;
+				OnSpeechToTextStateChanged(currentState);
+			}
+		}
+	}
+
+	/// <inheritdoc />
+	public ValueTask DisposeAsync()
+	{
+		listener?.Dispose();
+		speechRecognizer?.Dispose();
+
+		listener = null;
+		speechRecognizer = null;
+		return ValueTask.CompletedTask;
+	}
+
+	static Intent CreateSpeechIntent(SpeechToTextOptions options)
+	{
+		var intent = new Intent(RecognizerIntent.ActionRecognizeSpeech);
+		intent.PutExtra(RecognizerIntent.ExtraLanguagePreference, Java.Util.Locale.Default.ToString());
+		intent.PutExtra(RecognizerIntent.ExtraLanguageModel, RecognizerIntent.LanguageModelFreeForm);
+		intent.PutExtra(RecognizerIntent.ExtraCallingPackage, Application.Context.PackageName);
+		intent.PutExtra(RecognizerIntent.ExtraPartialResults, options.ShouldReportPartialResults);
+
+		var javaLocale = Java.Util.Locale.ForLanguageTag(options.Culture.Name).ToString();
+		intent.PutExtra(RecognizerIntent.ExtraLanguage, javaLocale);
+
+		return intent;
+	}
+
+	static bool IsSpeechRecognitionAvailable() => OperatingSystem.IsAndroidVersionAtLeast(33) && SpeechRecognizer.IsOnDeviceRecognitionAvailable(Application.Context);
+	
+	[MemberNotNull(nameof(speechRecognizer), nameof(listener))]
+	[SupportedOSPlatform("Android33.0")]
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		if (!IsSpeechRecognitionAvailable())
+		{
+			throw new FeatureNotSupportedException("Speech Recognition is not available on this device");
+		}
+
+		var recognizerIntent = CreateSpeechIntent(options);
+
+		speechRecognizer = SpeechRecognizer.CreateOnDeviceSpeechRecognizer(Application.Context);
+		speechRecognizer.TriggerModelDownload(recognizerIntent);
+
+		listener = new SpeechRecognitionListener(this)
+		{
+			Error = HandleListenerError,
+			PartialResults = HandleListenerPartialResults,
+			Results = HandleListenerResults
+		};
+		speechRecognizer.SetRecognitionListener(listener);
+		speechRecognizer.StartListening(recognizerIntent);
+	}
+
+	void HandleListenerError(SpeechRecognizerError error)
+	{
+		OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception($"Failure in speech engine - {error}")));
+	}
+
+	void HandleListenerPartialResults(string sentence)
+	{
+		OnRecognitionResultUpdated(sentence);
+	}
+
+	void HandleListenerResults(string result)
+	{
+		OnRecognitionResultCompleted(SpeechToTextResult.Success(result));
+	}
+
+	void InternalStopListening()
+	{
+		speechRecognizer?.StopListening();
+		speechRecognizer?.Destroy();
+		CurrentState = SpeechToTextState.Stopped;
+	}
+
+	class SpeechRecognitionListener(OfflineSpeechToTextImplementation speechToText) : Java.Lang.Object, IRecognitionListener
+	{
+		public required Action<SpeechRecognizerError> Error { get; init; }
+		public required Action<string> PartialResults { get; init; }
+		public required Action<string> Results { get; init; }
+
+		public void OnBeginningOfSpeech()
+		{
+			speechToText.CurrentState = SpeechToTextState.Listening;
+		}
+
+		public void OnBufferReceived(byte[]? buffer)
+		{
+		}
+
+		public void OnEndOfSpeech()
+		{
+			speechToText.CurrentState = SpeechToTextState.Silence;
+		}
+
+		public void OnError([GeneratedEnum] SpeechRecognizerError error)
+		{
+			Error.Invoke(error);
+			speechToText.CurrentState = SpeechToTextState.Stopped;
+		}
+
+		public void OnEvent(int eventType, Bundle? @params)
+		{
+		}
+
+		public void OnPartialResults(Bundle? partialResults)
+		{
+			SendResults(partialResults, PartialResults);
+		}
+
+		public void OnReadyForSpeech(Bundle? @params)
+		{
+		}
+
+		public void OnResults(Bundle? results)
+		{
+			SendResults(results, Results);
+		}
+
+		public void OnRmsChanged(float rmsdB)
+		{
+		}
+
+		static void SendResults(Bundle? bundle, Action<string> action)
+		{
+			var matches = bundle?.GetStringArrayList(SpeechRecognizer.ResultsRecognition);
+			if (matches is null || matches.Count == 0)
+			{
+				return;
+			}
+
+			action.Invoke(matches[0]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
new file mode 100644
index 0000000000..2119da2259
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
@@ -0,0 +1,84 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Runtime.Versioning;
+using AVFoundation;
+using Speech;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest))]
+	[SupportedOSPlatform("ios13.0")]
+	[SupportedOSPlatform("maccatalyst")]
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		if (!UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
+		{
+			throw new NotSupportedException("Offline listening is supported on iOS 13 and later");
+		}
+
+		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
+		speechRecognizer.SupportsOnDeviceRecognition = true;
+		
+		if (!speechRecognizer.Available)
+		{
+			throw new ArgumentException("Speech recognizer is not available");
+		}
+
+		audioEngine = new AVAudioEngine();
+		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest()
+		{
+			ShouldReportPartialResults = options.ShouldReportPartialResults,
+			RequiresOnDeviceRecognition = true
+		};
+
+		InitializeAvAudioSession(out _);
+
+		var node = audioEngine.InputNode;
+		var recordingFormat = node.GetBusOutputFormat(0);
+		node.InstallTapOnBus(0, 1024, recordingFormat, (buffer, _) => liveSpeechRequest.Append(buffer));
+
+		audioEngine.Prepare();
+		audioEngine.StartAndReturnError(out var error);
+
+		if (error is not null)
+		{
+			throw new ArgumentException("Error starting audio engine - " + error.LocalizedDescription);
+		}
+
+		var currentIndex = 0;
+		recognitionTask = speechRecognizer.GetRecognitionTask(liveSpeechRequest, (result, err) =>
+		{
+			if (err is not null)
+			{
+				InternalStopListening();
+				OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(err.LocalizedDescription)));
+			}
+			else
+			{
+				if (result.Final)
+				{
+					currentIndex = 0;
+					InternalStopListening();
+					OnRecognitionResultCompleted(SpeechToTextResult.Success(result.BestTranscription.FormattedString));
+				}
+				else
+				{
+					if (currentIndex <= 0)
+					{
+						OnSpeechToTextStateChanged(CurrentState);
+					}
+
+					for (var i = currentIndex; i < result.BestTranscription.Segments.Length; i++)
+					{
+						var s = result.BestTranscription.Segments[i].Substring;
+						currentIndex++;
+						OnRecognitionResultUpdated(s);
+					}
+				}
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
new file mode 100644
index 0000000000..6475ce799c
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
@@ -0,0 +1,95 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using AVFoundation;
+using Speech;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest))]
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
+		speechRecognizer.SupportsOnDeviceRecognition = true;
+		
+		if (!speechRecognizer.Available)
+		{
+			throw new ArgumentException("Speech recognizer is not available");
+		}
+
+		audioEngine = new AVAudioEngine
+		{
+			AutoShutdownEnabled = false
+		};
+		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest()
+		{
+			ShouldReportPartialResults = options.ShouldReportPartialResults,
+			RequiresOnDeviceRecognition = true
+		};
+
+		InitializeAvAudioSession(out var audioSession);
+
+		var mode = audioSession.AvailableModes.Contains("AVAudioSessionModeMeasurement")
+			? AVAudioSessionMode.Measurement
+			: AVAudioSessionMode.Default;
+
+		audioSession.SetMode(mode, out var audioSessionError);
+		if (audioSessionError is not null)
+		{
+			throw new Exception(audioSessionError.LocalizedDescription);
+		}
+
+		audioSession.SetActive(true, AVAudioSessionSetActiveOptions.NotifyOthersOnDeactivation, out audioSessionError);
+		if (audioSessionError is not null)
+		{
+			throw new Exception(audioSessionError.LocalizedDescription);
+		}
+
+		var node = audioEngine.InputNode;
+		var recordingFormat = node.GetBusOutputFormat(0);
+		node.InstallTapOnBus(0, 1024, recordingFormat, (buffer, _) => liveSpeechRequest.Append(buffer));
+
+		audioEngine.Prepare();
+		audioEngine.StartAndReturnError(out var error);
+
+		if (error is not null)
+		{
+			throw new Exception(error.LocalizedDescription);
+		}
+
+		var currentIndex = 0;
+		recognitionTask = speechRecognizer.GetRecognitionTask(liveSpeechRequest, (result, err) =>
+		{
+			if (err is not null)
+			{
+				InternalStopListening();
+				OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(err.LocalizedDescription)));
+			}
+			else
+			{
+				if (result.Final)
+				{
+					currentIndex = 0;
+					InternalStopListening();
+					OnRecognitionResultCompleted(SpeechToTextResult.Success(result.BestTranscription.FormattedString));
+				}
+				else
+				{
+					if (currentIndex <= 0)
+					{
+						OnSpeechToTextStateChanged(CurrentState);
+					}
+
+					for (var i = currentIndex; i < result.BestTranscription.Segments.Length; i++)
+					{
+						var s = result.BestTranscription.Segments[i].Substring;
+						currentIndex++;
+						OnRecognitionResultUpdated(s);
+					}
+				}
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.net.cs
new file mode 100644
index 0000000000..6fa5cc468b
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.net.cs
@@ -0,0 +1,26 @@
+using System.Globalization;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	/// <inheritdoc />
+	public ValueTask DisposeAsync()
+	{
+		return ValueTask.CompletedTask;
+	}
+
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		throw new NotSupportedException();
+	}
+
+	void InternalStopListening()
+	{
+		throw new NotSupportedException();
+	}
+
+	/// <inheritdoc />
+	public SpeechToTextState CurrentState { get; } = SpeechToTextState.Stopped;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.shared.cs
new file mode 100644
index 0000000000..46504e9bda
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.shared.cs
@@ -0,0 +1,85 @@
+using System.Globalization;
+using Microsoft.Maui.ApplicationModel;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc cref="ISpeechToText"/>
+public sealed partial class OfflineSpeechToTextImplementation : ISpeechToText
+{
+	readonly WeakEventManager recognitionResultUpdatedWeakEventManager = new();
+	readonly WeakEventManager recognitionResultCompletedWeakEventManager = new();
+	readonly WeakEventManager speechToTextStateChangedWeakEventManager = new();
+
+	/// <inheritdoc />
+	public event EventHandler<SpeechToTextRecognitionResultUpdatedEventArgs> RecognitionResultUpdated
+	{
+		add => recognitionResultUpdatedWeakEventManager.AddEventHandler(value);
+		remove => recognitionResultUpdatedWeakEventManager.RemoveEventHandler(value);
+	}
+
+	/// <inheritdoc />
+	public event EventHandler<SpeechToTextRecognitionResultCompletedEventArgs> RecognitionResultCompleted
+	{
+		add => recognitionResultCompletedWeakEventManager.AddEventHandler(value);
+		remove => recognitionResultCompletedWeakEventManager.RemoveEventHandler(value);
+	}
+
+	/// <inheritdoc />
+	public event EventHandler<SpeechToTextStateChangedEventArgs> StateChanged
+	{
+		add => speechToTextStateChangedWeakEventManager.AddEventHandler(value);
+		remove => speechToTextStateChangedWeakEventManager.RemoveEventHandler(value);
+	}
+
+	/// <inheritdoc/>
+	public async Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken = default)
+	{
+		cancellationToken.ThrowIfCancellationRequested();
+
+		var isPermissionGranted = await IsSpeechPermissionAuthorized(cancellationToken).ConfigureAwait(false);
+		if (!isPermissionGranted)
+		{
+			throw new PermissionException($"{nameof(Permissions)}.{nameof(Permissions.Microphone)} Not Granted");
+		}
+
+		InternalStartListening(options);
+	}
+
+	/// <inheritdoc/>
+	public Task StopListenAsync(CancellationToken cancellationToken = default)
+	{
+		cancellationToken.ThrowIfCancellationRequested();
+		InternalStopListening();
+		return Task.CompletedTask;
+	}
+
+	void OnRecognitionResultUpdated(string recognitionResult)
+	{
+		recognitionResultUpdatedWeakEventManager.HandleEvent(this, new SpeechToTextRecognitionResultUpdatedEventArgs(recognitionResult), nameof(RecognitionResultUpdated));
+	}
+
+	void OnRecognitionResultCompleted(SpeechToTextResult recognitionResult)
+	{
+		recognitionResultCompletedWeakEventManager.HandleEvent(this, new SpeechToTextRecognitionResultCompletedEventArgs(recognitionResult), nameof(RecognitionResultCompleted));
+	}
+
+	void OnSpeechToTextStateChanged(SpeechToTextState speechToTextState)
+	{
+		speechToTextStateChangedWeakEventManager.HandleEvent(this, new SpeechToTextStateChangedEventArgs(speechToTextState), nameof(StateChanged));
+	}
+
+#if !MACCATALYST && !IOS
+	/// <inheritdoc/>
+	public async Task<bool> RequestPermissions(CancellationToken cancellationToken = default)
+	{
+		var status = await Permissions.RequestAsync<Permissions.Microphone>().WaitAsync(cancellationToken).ConfigureAwait(false);
+		return status is PermissionStatus.Granted;
+	}
+
+	static async Task<bool> IsSpeechPermissionAuthorized(CancellationToken cancellationToken)
+	{
+		var status = await Permissions.CheckStatusAsync<Permissions.Microphone>().WaitAsync(cancellationToken).ConfigureAwait(false);
+		return status is PermissionStatus.Granted;
+	}
+#endif
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.tizen.cs
new file mode 100644
index 0000000000..118d5d32ef
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.tizen.cs
@@ -0,0 +1,122 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Threading;
+using Tizen.Uix.Stt;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	SttClient? sttClient;
+	TaskCompletionSource<bool>? tcsInitialize;
+
+	/// <inheritdoc/>
+	public SpeechToTextState CurrentState => sttClient?.CurrentState is Tizen.Uix.Stt.State.Recording
+		? SpeechToTextState.Listening
+		: SpeechToTextState.Stopped;
+
+	/// <inheritdoc />
+	public ValueTask DisposeAsync()
+	{
+		if (sttClient is not null)
+		{
+			if (sttClient.CurrentState is Tizen.Uix.Stt.State.Ready)
+			{
+				sttClient.Unprepare();
+			}
+			else
+			{
+				sttClient.Cancel();
+				sttClient.RecognitionResult -= OnRecognitionResult;
+				sttClient.ErrorOccurred -= OnErrorOccurred;
+				sttClient.StateChanged -= OnStateChanged;
+			}
+
+			sttClient.Dispose();
+
+			sttClient = null;
+		}
+
+		return ValueTask.CompletedTask;
+	}
+
+	void InternalStopListening()
+	{
+		if (sttClient is null)
+		{
+			return;
+		}
+
+		if (sttClient.CurrentState is Tizen.Uix.Stt.State.Recording)
+		{
+			sttClient.Stop();
+		}
+
+		sttClient.RecognitionResult -= OnRecognitionResult;
+		sttClient.ErrorOccurred -= OnErrorOccurred;
+		sttClient.StateChanged -= OnStateChanged;
+	}
+
+	void OnErrorOccurred(object? sender, ErrorOccurredEventArgs e)
+	{
+		InternalStopListening();
+		OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("STT failed - " + e.ErrorMessage)));
+	}
+
+	void OnRecognitionResult(object? sender, RecognitionResultEventArgs e)
+	{
+		if (e.Result is ResultEvent.Error)
+		{
+			InternalStopListening();
+			OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("Failure in speech engine - " + e.Message)));
+		}
+		else if (e.Result is ResultEvent.PartialResult)
+		{
+			foreach (var d in e.Data)
+			{
+				OnRecognitionResultUpdated(d);
+			}
+		}
+		else
+		{
+			InternalStopListening();
+			OnRecognitionResultCompleted(SpeechToTextResult.Success(e.Data.ToString() ?? string.Empty));
+		}
+	}
+
+	void OnStateChanged(object? sender, StateChangedEventArgs e)
+	{
+		OnSpeechToTextStateChanged(CurrentState);
+	}
+
+	[MemberNotNull(nameof(sttClient))]
+	void Initialize()
+	{
+		sttClient = new SttClient();
+		
+		try
+		{
+			sttClient.Prepare();
+		}
+		catch (Exception ex)
+		{
+			OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("STT is not available - " + ex)));
+		}
+	}
+
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		Initialize();
+
+		sttClient.ErrorOccurred += OnErrorOccurred;
+		sttClient.RecognitionResult += OnRecognitionResult;
+		sttClient.StateChanged += OnStateChanged;
+
+		var recognitionType = options.ShouldReportPartialResults && sttClient.IsRecognitionTypeSupported(RecognitionType.Partial)
+			? RecognitionType.Partial
+			: RecognitionType.Free;
+
+		sttClient.Start(options.Culture.Name, recognitionType);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.windows.cs
new file mode 100644
index 0000000000..0424f4a249
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.windows.cs
@@ -0,0 +1,110 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Speech.Recognition;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <inheritdoc />
+public sealed partial class OfflineSpeechToTextImplementation
+{
+	string recognitionText = string.Empty;
+	SpeechRecognitionEngine? offlineSpeechRecognizer;
+	SpeechToTextOptions? speechToTextOptions;
+
+	/// <inheritdoc/>
+	public SpeechToTextState CurrentState
+	{
+		get
+		{
+			return offlineSpeechRecognizer?.AudioState switch
+			{
+				AudioState.Speech => SpeechToTextState.Listening,
+				AudioState.Silence => SpeechToTextState.Silence,
+				_ => SpeechToTextState.Stopped
+			};
+		}
+	}
+
+	/// <inheritdoc />
+	public ValueTask DisposeAsync()
+	{
+		InternalStopListening();
+
+		offlineSpeechRecognizer?.Dispose();
+		offlineSpeechRecognizer = null;
+		return ValueTask.CompletedTask;
+	}
+
+	void InternalStartListening(SpeechToTextOptions options)
+	{
+		Initialize(options);
+
+		offlineSpeechRecognizer.AudioStateChanged += OfflineSpeechRecognizer_StateChanged;
+		offlineSpeechRecognizer.LoadGrammar(new DictationGrammar());
+
+		offlineSpeechRecognizer.InitialSilenceTimeout = TimeSpan.MaxValue;
+		offlineSpeechRecognizer.BabbleTimeout = TimeSpan.MaxValue;
+
+		offlineSpeechRecognizer.SetInputToDefaultAudioDevice();
+
+		offlineSpeechRecognizer.RecognizeCompleted += OnRecognizeCompleted;
+		offlineSpeechRecognizer.SpeechRecognized += OnSpeechRecognized;
+		offlineSpeechRecognizer.RecognizeAsync(RecognizeMode.Multiple);
+	}
+
+	void OnRecognizeCompleted(object? sender, RecognizeCompletedEventArgs args)
+	{
+		if (args.Cancelled)
+		{
+			OnRecognitionResultCompleted(new SpeechToTextResult(recognitionText, new TaskCanceledException("Operation cancelled")));
+		}
+		else if (args.Error is not null)
+		{
+			OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(args.Error.ToString())));
+		}
+		else
+		{
+			OnRecognitionResultCompleted(SpeechToTextResult.Success(recognitionText));
+		}
+	}
+
+	void OnSpeechRecognized(object? sender, SpeechRecognizedEventArgs args)
+	{
+		recognitionText += args.Result.Text;
+		if (speechToTextOptions?.ShouldReportPartialResults == true)
+		{
+			OnRecognitionResultUpdated(args.Result.Text);
+		}
+	}
+
+	void InternalStopListening()
+	{
+		try
+		{
+			if (offlineSpeechRecognizer is not null)
+			{
+				offlineSpeechRecognizer.RecognizeAsyncStop();
+
+				offlineSpeechRecognizer.AudioStateChanged -= OfflineSpeechRecognizer_StateChanged;
+				offlineSpeechRecognizer.RecognizeCompleted -= OnRecognizeCompleted;
+				offlineSpeechRecognizer.SpeechRecognized -= OnSpeechRecognized;
+			}
+		}
+		catch
+		{
+			// ignored. Recording may be already stopped
+		}
+	}
+
+	[MemberNotNull(nameof(recognitionText), nameof(offlineSpeechRecognizer), nameof(speechToTextOptions))]
+	void Initialize(SpeechToTextOptions options)
+	{
+		speechToTextOptions = options;
+		recognitionText = string.Empty;
+		offlineSpeechRecognizer = new SpeechRecognitionEngine(options.Culture);
+	}
+
+	void OfflineSpeechRecognizer_StateChanged(object? sender, AudioStateChangedEventArgs e)
+	{
+		OnSpeechToTextStateChanged(CurrentState);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SharedSpeechToTextImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SharedSpeechToTextImplementation.macios.cs
index 9b0b7a03eb..9871bea8f9 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SharedSpeechToTextImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SharedSpeechToTextImplementation.macios.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using AVFoundation;
+using AVFoundation;
 using Speech;
 
 namespace CommunityToolkit.Maui.Media;
@@ -9,13 +7,9 @@ public sealed partial class SpeechToTextImplementation
 {
 	AVAudioEngine? audioEngine;
 	SFSpeechRecognizer? speechRecognizer;
-	IProgress<string>? recognitionProgress;
 	SFSpeechRecognitionTask? recognitionTask;
 	SFSpeechAudioBufferRecognitionRequest? liveSpeechRequest;
 
-	TaskCompletionSource<string>? getRecognitionTaskCompletionSource;
-	CancellationTokenRegistration? userProvidedCancellationTokenRegistration;
-
 	/// <inheritdoc/>
 	public SpeechToTextState CurrentState => recognitionTask?.State is SFSpeechRecognitionTaskState.Running
 												? SpeechToTextState.Listening
@@ -23,22 +17,18 @@ public sealed partial class SpeechToTextImplementation
 
 
 	/// <inheritdoc />
-	public async ValueTask DisposeAsync()
+	public ValueTask DisposeAsync()
 	{
-		getRecognitionTaskCompletionSource?.TrySetCanceled();
-
 		audioEngine?.Dispose();
 		speechRecognizer?.Dispose();
 		liveSpeechRequest?.Dispose();
 		recognitionTask?.Dispose();
-		await (userProvidedCancellationTokenRegistration?.DisposeAsync() ?? ValueTask.CompletedTask);
 
 		audioEngine = null;
 		speechRecognizer = null;
 		liveSpeechRequest = null;
 		recognitionTask = null;
-		getRecognitionTaskCompletionSource = null;
-		userProvidedCancellationTokenRegistration = null;
+		return ValueTask.CompletedTask;
 	}
 
 	/// <inheritdoc />
@@ -70,18 +60,9 @@ static void InitializeAvAudioSession(out AVAudioSession sharedAvAudioSession)
 			AVAudioSessionCategoryOptions.DefaultToSpeaker | AVAudioSessionCategoryOptions.AllowBluetooth | AVAudioSessionCategoryOptions.AllowAirPlay | AVAudioSessionCategoryOptions.AllowBluetoothA2DP);
 	}
 
-	async Task<string> InternalListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken)
-	{
-		recognitionProgress = recognitionResult;
-
-		await InternalStartListeningAsync(culture, cancellationToken);
-
-		return await getRecognitionTaskCompletionSource.Task.WaitAsync(cancellationToken);
-	}
-
 	void StopRecording()
 	{
-		audioEngine?.InputNode.RemoveTapOnBus(new nuint(0));
+		audioEngine?.InputNode.RemoveTapOnBus(0);
 		audioEngine?.Stop();
 		liveSpeechRequest?.EndAudio();
 		recognitionTask?.Cancel();
@@ -94,17 +75,4 @@ Task InternalStopListeningAsync(CancellationToken cancellationToken)
 		StopRecording();
 		return Task.CompletedTask;
 	}
-
-	[MemberNotNull(nameof(getRecognitionTaskCompletionSource), nameof(userProvidedCancellationTokenRegistration))]
-	void ResetGetRecognitionTaskCompletionSource(CancellationToken token)
-	{
-		getRecognitionTaskCompletionSource?.TrySetCanceled(token);
-		getRecognitionTaskCompletionSource = new();
-
-		userProvidedCancellationTokenRegistration = token.Register(() =>
-		{
-			StopRecording();
-			getRecognitionTaskCompletionSource.TrySetCanceled(token);
-		});
-	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToText.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToText.shared.cs
index 9a85ccd572..1b7ad3bdcb 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToText.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToText.shared.cs
@@ -12,13 +12,9 @@ public static class SpeechToText
 	/// </summary>
 	public static ISpeechToText Default => defaultImplementation.Value;
 
-	/// <inheritdoc cref="ISpeechToText.ListenAsync"/>
-	public static Task<SpeechToTextResult> ListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken = default) =>
-		Default.ListenAsync(culture, recognitionResult, cancellationToken);
-
 	/// <inheritdoc cref="ISpeechToText.StartListenAsync"/>
-	public static Task StartListenAsync(CultureInfo culture, CancellationToken cancellationToken = default) =>
-		Default.StartListenAsync(culture, cancellationToken);
+	public static Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken = default) =>
+		Default.StartListenAsync(options, cancellationToken);
 
 	/// <inheritdoc cref="ISpeechToText.StopListenAsync"/>
 	public static Task StopListenAsync(CancellationToken cancellationToken = default) =>
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
index 2b2736a24e..5f5b747b6f 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
@@ -12,9 +12,6 @@ public sealed partial class SpeechToTextImplementation
 {
 	SpeechRecognizer? speechRecognizer;
 	SpeechRecognitionListener? listener;
-	TaskCompletionSource<string>? speechRecognitionListenerTaskCompletionSource;
-	CancellationTokenRegistration? userProvidedCancellationTokenRegistration;
-	IProgress<string>? recognitionProgress;
 	CultureInfo? cultureInfo;
 
 	/// <inheritdoc />
@@ -32,69 +29,58 @@ private set
 	} = SpeechToTextState.Stopped;
 
 	/// <inheritdoc />
-	public async ValueTask DisposeAsync()
+	public ValueTask DisposeAsync()
 	{
-		speechRecognitionListenerTaskCompletionSource?.TrySetCanceled();
-
 		listener?.Dispose();
 		speechRecognizer?.Dispose();
-		await (userProvidedCancellationTokenRegistration?.DisposeAsync() ?? ValueTask.CompletedTask);
 
 		listener = null;
 		speechRecognizer = null;
-		userProvidedCancellationTokenRegistration = null;
-		speechRecognitionListenerTaskCompletionSource = null;
+		return ValueTask.CompletedTask;
 	}
 
-	static Intent CreateSpeechIntent(CultureInfo culture)
+	static Intent CreateSpeechIntent(SpeechToTextOptions options)
 	{
 		var intent = new Intent(RecognizerIntent.ActionRecognizeSpeech);
 		intent.PutExtra(RecognizerIntent.ExtraLanguagePreference, Java.Util.Locale.Default.ToString());
 		intent.PutExtra(RecognizerIntent.ExtraLanguageModel, RecognizerIntent.LanguageModelFreeForm);
 		intent.PutExtra(RecognizerIntent.ExtraCallingPackage, Application.Context.PackageName);
-		intent.PutExtra(RecognizerIntent.ExtraPartialResults, true);
+		intent.PutExtra(RecognizerIntent.ExtraPartialResults, options.ShouldReportPartialResults);
 
-		var javaLocale = Java.Util.Locale.ForLanguageTag(culture.Name).ToString();
+		var javaLocale = Java.Util.Locale.ForLanguageTag(options.Culture.Name).ToString();
 		intent.PutExtra(RecognizerIntent.ExtraLanguage, javaLocale);
 
 		return intent;
 	}
 
 	static bool IsSpeechRecognitionAvailable() => SpeechRecognizer.IsRecognitionAvailable(Application.Context);
-
-	[MemberNotNull(nameof(speechRecognizer), nameof(listener), nameof(speechRecognitionListenerTaskCompletionSource))]
-	Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	
+	[MemberNotNull(nameof(speechRecognizer), nameof(listener))]
+	Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
-		speechRecognitionListenerTaskCompletionSource?.TrySetCanceled(cancellationToken);
-		speechRecognitionListenerTaskCompletionSource = new();
-		userProvidedCancellationTokenRegistration = cancellationToken.Register(() =>
-		{
-			StopRecording();
-			speechRecognitionListenerTaskCompletionSource.TrySetCanceled(cancellationToken);
-		});
-
-		cultureInfo = culture;
 		var isSpeechRecognitionAvailable = IsSpeechRecognitionAvailable();
 		if (!isSpeechRecognitionAvailable)
 		{
 			throw new FeatureNotSupportedException("Speech Recognition is not available on this device");
 		}
 
+		var recognizerIntent = CreateSpeechIntent(options);
+
 		speechRecognizer = SpeechRecognizer.CreateSpeechRecognizer(Application.Context);
+
 		if (speechRecognizer is null)
 		{
 			throw new FeatureNotSupportedException("Speech recognizer is not available on this device");
 		}
 
-		listener = new SpeechRecognitionListener
+		listener = new SpeechRecognitionListener(this)
 		{
 			Error = HandleListenerError,
 			PartialResults = HandleListenerPartialResults,
 			Results = HandleListenerResults
 		};
 		speechRecognizer.SetRecognitionListener(listener);
-		speechRecognizer.StartListening(CreateSpeechIntent(cultureInfo));
-		CurrentState = SpeechToTextState.Listening;
+		speechRecognizer.StartListening(recognizerIntent);
 
 		cancellationToken.ThrowIfCancellationRequested();
 
@@ -108,30 +94,19 @@ Task InternalStopListeningAsync(CancellationToken cancellationToken)
 		return Task.CompletedTask;
 	}
 
-	async Task<string> InternalListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken)
-	{
-		recognitionProgress = recognitionResult;
-
-		await InternalStartListeningAsync(culture, cancellationToken);
-
-		return await speechRecognitionListenerTaskCompletionSource.Task.WaitAsync(cancellationToken);
-	}
-
 	void HandleListenerError(SpeechRecognizerError error)
 	{
-		speechRecognitionListenerTaskCompletionSource?.TrySetException(new Exception($"Failure in speech engine - {error}"));
+		OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception($"Failure in speech engine - {error}")));
 	}
 
 	void HandleListenerPartialResults(string sentence)
 	{
 		OnRecognitionResultUpdated(sentence);
-		recognitionProgress?.Report(sentence);
 	}
 
 	void HandleListenerResults(string result)
 	{
-		OnRecognitionResultCompleted(result);
-		speechRecognitionListenerTaskCompletionSource?.TrySetResult(result);
+		OnRecognitionResultCompleted(SpeechToTextResult.Success(result));
 	}
 
 	void StopRecording()
@@ -141,7 +116,7 @@ void StopRecording()
 		CurrentState = SpeechToTextState.Stopped;
 	}
 
-	class SpeechRecognitionListener : Java.Lang.Object, IRecognitionListener
+	class SpeechRecognitionListener(SpeechToTextImplementation speechToText) : Java.Lang.Object, IRecognitionListener
 	{
 		public required Action<SpeechRecognizerError> Error { get; init; }
 		public required Action<string> PartialResults { get; init; }
@@ -149,6 +124,7 @@ class SpeechRecognitionListener : Java.Lang.Object, IRecognitionListener
 
 		public void OnBeginningOfSpeech()
 		{
+			speechToText.CurrentState = SpeechToTextState.Listening;
 		}
 
 		public void OnBufferReceived(byte[]? buffer)
@@ -157,11 +133,13 @@ public void OnBufferReceived(byte[]? buffer)
 
 		public void OnEndOfSpeech()
 		{
+			speechToText.CurrentState = SpeechToTextState.Silence;
 		}
 
 		public void OnError([GeneratedEnum] SpeechRecognizerError error)
 		{
 			Error.Invoke(error);
+			speechToText.CurrentState = SpeechToTextState.Stopped;
 		}
 
 		public void OnEvent(int eventType, Bundle? @params)
@@ -189,7 +167,7 @@ public void OnRmsChanged(float rmsdB)
 		static void SendResults(Bundle? bundle, Action<string> action)
 		{
 			var matches = bundle?.GetStringArrayList(SpeechRecognizer.ResultsRecognition);
-			if (matches?.Any() is not true)
+			if (matches is null || matches.Count == 0)
 			{
 				return;
 			}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.ios.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.ios.cs
index fa1b4a373d..433c2cf920 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.ios.cs
@@ -8,12 +8,10 @@ namespace CommunityToolkit.Maui.Media;
 /// <inheritdoc />
 public sealed partial class SpeechToTextImplementation
 {
-	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest), nameof(getRecognitionTaskCompletionSource))]
-	Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest))]
+	Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
-		ResetGetRecognitionTaskCompletionSource(cancellationToken);
-
-		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(culture.Name));
+		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
 
 		if (!speechRecognizer.Available)
 		{
@@ -21,7 +19,10 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 		}
 
 		audioEngine = new AVAudioEngine();
-		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest();
+		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest()
+		{
+			ShouldReportPartialResults = options.ShouldReportPartialResults
+		};
 
 		InitializeAvAudioSession(out _);
 
@@ -45,7 +46,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 			if (err is not null)
 			{
 				StopRecording();
-				getRecognitionTaskCompletionSource.TrySetException(new Exception(err.LocalizedDescription));
+				OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(err.LocalizedDescription)));
 			}
 			else
 			{
@@ -53,8 +54,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 				{
 					currentIndex = 0;
 					StopRecording();
-					OnRecognitionResultCompleted(result.BestTranscription.FormattedString);
-					getRecognitionTaskCompletionSource.TrySetResult(result.BestTranscription.FormattedString);
+					OnRecognitionResultCompleted(SpeechToTextResult.Success(result.BestTranscription.FormattedString));
 				}
 				else
 				{
@@ -67,7 +67,6 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 					{
 						var s = result.BestTranscription.Segments[i].Substring;
 						currentIndex++;
-						recognitionProgress?.Report(s);
 						OnRecognitionResultUpdated(s);
 					}
 				}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.macos.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.macos.cs
index 0bbd119e76..4de6c17bbd 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.macos.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.macos.cs
@@ -8,20 +8,24 @@ namespace CommunityToolkit.Maui.Media;
 /// <inheritdoc />
 public sealed partial class SpeechToTextImplementation
 {
-	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest), nameof(getRecognitionTaskCompletionSource))]
-	Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	[MemberNotNull(nameof(audioEngine), nameof(recognitionTask), nameof(liveSpeechRequest))]
+	Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
-		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(culture.Name));
-
-		ResetGetRecognitionTaskCompletionSource(cancellationToken);
+		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
 
 		if (!speechRecognizer.Available)
 		{
 			throw new ArgumentException("Speech recognizer is not available");
 		}
 
-		audioEngine = new AVAudioEngine();
-		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest();
+		audioEngine = new AVAudioEngine
+		{
+			AutoShutdownEnabled = false
+		};
+		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest()
+		{
+			ShouldReportPartialResults = options.ShouldReportPartialResults
+		};
 
 		InitializeAvAudioSession(out var audioSession);
 
@@ -61,7 +65,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 			if (err is not null)
 			{
 				StopRecording();
-				getRecognitionTaskCompletionSource.TrySetException(new Exception(err.LocalizedDescription));
+				OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(err.LocalizedDescription)));
 			}
 			else
 			{
@@ -69,8 +73,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 				{
 					currentIndex = 0;
 					StopRecording();
-					OnRecognitionResultCompleted(result.BestTranscription.FormattedString);
-					getRecognitionTaskCompletionSource.TrySetResult(result.BestTranscription.FormattedString);
+					OnRecognitionResultCompleted(SpeechToTextResult.Success(result.BestTranscription.FormattedString));
 				}
 				else
 				{
@@ -83,7 +86,6 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 					{
 						var s = result.BestTranscription.Segments[i].Substring;
 						currentIndex++;
-						recognitionProgress?.Report(s);
 						OnRecognitionResultUpdated(s);
 					}
 				}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.net.cs
index 35355be2a6..c4558e9443 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.net.cs
@@ -11,13 +11,7 @@ public ValueTask DisposeAsync()
 		return ValueTask.CompletedTask;
 	}
 
-	Task<string> InternalListenAsync(CultureInfo culture, IProgress<string>? recognitionResult,
-		CancellationToken cancellationToken)
-	{
-		throw new NotSupportedException();
-	}
-
-	Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
 		throw new NotSupportedException();
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.shared.cs
index 35291f26ab..5d01647326 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.shared.cs
@@ -31,29 +31,8 @@ public event EventHandler<SpeechToTextStateChangedEventArgs> StateChanged
 		remove => speechToTextStateChangedWeakEventManager.RemoveEventHandler(value);
 	}
 
-
-	/// <inheritdoc/>
-	public async Task<SpeechToTextResult> ListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken = default)
-	{
-		try
-		{
-			var isPermissionGranted = await IsSpeechPermissionAuthorized(cancellationToken).ConfigureAwait(false);
-			if (!isPermissionGranted)
-			{
-				return new SpeechToTextResult(null, new Exception("Speech Recognizer Permission not granted"));
-			}
-
-			var finalResult = await InternalListenAsync(culture, recognitionResult, cancellationToken).ConfigureAwait(false);
-			return new SpeechToTextResult(finalResult, null);
-		}
-		catch (Exception e)
-		{
-			return new SpeechToTextResult(null, e);
-		}
-	}
-
 	/// <inheritdoc/>
-	public async Task StartListenAsync(CultureInfo culture, CancellationToken cancellationToken = default)
+	public async Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken = default)
 	{
 		cancellationToken.ThrowIfCancellationRequested();
 
@@ -63,7 +42,7 @@ public async Task StartListenAsync(CultureInfo culture, CancellationToken cancel
 			throw new PermissionException($"{nameof(Permissions)}.{nameof(Permissions.Microphone)} Not Granted");
 		}
 
-		await InternalStartListeningAsync(culture, cancellationToken).ConfigureAwait(false);
+		await InternalStartListeningAsync(options, cancellationToken).ConfigureAwait(false);
 	}
 
 	/// <inheritdoc/>
@@ -74,7 +53,7 @@ void OnRecognitionResultUpdated(string recognitionResult)
 		recognitionResultUpdatedWeakEventManager.HandleEvent(this, new SpeechToTextRecognitionResultUpdatedEventArgs(recognitionResult), nameof(RecognitionResultUpdated));
 	}
 
-	void OnRecognitionResultCompleted(string recognitionResult)
+	void OnRecognitionResultCompleted(SpeechToTextResult recognitionResult)
 	{
 		recognitionResultCompletedWeakEventManager.HandleEvent(this, new SpeechToTextRecognitionResultCompletedEventArgs(recognitionResult), nameof(RecognitionResultCompleted));
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.tizen.cs
index a112f959e0..7572b31831 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.tizen.cs
@@ -10,9 +10,6 @@ public sealed partial class SpeechToTextImplementation
 {
 	SttClient? sttClient;
 	TaskCompletionSource<bool>? tcsInitialize;
-	TaskCompletionSource<string>? taskResult;
-	IProgress<string>? recognitionProgress;
-	string defaultSttEngineLocale = "ko_KR";
 
 	/// <inheritdoc/>
 	public SpeechToTextState CurrentState => sttClient?.CurrentState is Tizen.Uix.Stt.State.Recording
@@ -35,6 +32,7 @@ public ValueTask DisposeAsync()
 				sttClient.ErrorOccurred -= OnErrorOccurred;
 				sttClient.StateChanged -= OnStateChanged;
 			}
+
 			sttClient.Dispose();
 
 			sttClient = null;
@@ -55,30 +53,6 @@ void StopRecording(in SttClient sttClient)
 		sttClient.StateChanged -= OnStateChanged;
 	}
 
-	[MemberNotNull(nameof(taskResult))]
-	async Task<string> InternalListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken)
-	{
-		recognitionProgress = recognitionResult;
-		
-		taskResult?.TrySetCanceled(cancellationToken);
-		taskResult = new TaskCompletionSource<string>();
-
-		await InternalStartListeningAsync(culture, cancellationToken);
-
-		await using (cancellationToken.Register(() =>
-		{
-			if (sttClient is not null)
-			{
-				StopRecording(sttClient);
-			}
-
-			taskResult.TrySetCanceled(cancellationToken);
-		}))
-		{
-			return await taskResult.Task.WaitAsync(cancellationToken);
-		}
-	}
-
 	void OnErrorOccurred(object? sender, ErrorOccurredEventArgs e)
 	{
 		if (sttClient is not null)
@@ -86,7 +60,7 @@ void OnErrorOccurred(object? sender, ErrorOccurredEventArgs e)
 			StopRecording(sttClient);
 		}
 
-		taskResult?.TrySetException(new Exception("STT failed - " + e.ErrorMessage));
+		OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("STT failed - " + e.ErrorMessage)));
 	}
 
 	void OnRecognitionResult(object? sender, RecognitionResultEventArgs e)
@@ -98,14 +72,13 @@ void OnRecognitionResult(object? sender, RecognitionResultEventArgs e)
 				StopRecording(sttClient);
 			}
 
-			taskResult?.TrySetException(new Exception("Failure in speech engine - " + e.Message));
+			OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("Failure in speech engine - " + e.Message)));
 		}
 		else if (e.Result is ResultEvent.PartialResult)
 		{
-			foreach(var d in e.Data)
+			foreach (var d in e.Data)
 			{
 				OnRecognitionResultUpdated(d);
-				recognitionProgress?.Report(d);
 			}
 		}
 		else
@@ -115,8 +88,7 @@ void OnRecognitionResult(object? sender, RecognitionResultEventArgs e)
 				StopRecording(sttClient);
 			}
 
-			OnRecognitionResultCompleted(e.Data.ToString() ?? string.Empty);
-			taskResult?.TrySetResult(e.Data.ToString() ?? string.Empty);
+			OnRecognitionResultCompleted(SpeechToTextResult.Success(e.Data.ToString() ?? string.Empty));
 		}
 	}
 
@@ -150,13 +122,13 @@ Task<bool> Initialize(CancellationToken cancellationToken)
 		}
 		catch (Exception ex)
 		{
-			taskResult?.TrySetException(new Exception("STT is not available - " + ex));
+			OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception("STT is not available - " + ex)));
 		}
 
 		return tcsInitialize.Task.WaitAsync(cancellationToken);
 	}
 
-	async Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	async Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
 		await Initialize(cancellationToken);
 
@@ -164,11 +136,11 @@ async Task InternalStartListeningAsync(CultureInfo culture, CancellationToken ca
 		sttClient.RecognitionResult += OnRecognitionResult;
 		sttClient.StateChanged += OnStateChanged;
 
-		var recognitionType = sttClient.IsRecognitionTypeSupported(RecognitionType.Partial)
+		var recognitionType = options.ShouldReportPartialResults && sttClient.IsRecognitionTypeSupported(RecognitionType.Partial)
 			? RecognitionType.Partial
 			: RecognitionType.Free;
 
-		sttClient.Start(defaultSttEngineLocale, recognitionType);
+		sttClient.Start(options.Culture.Name, recognitionType);
 	}
 
 	Task InternalStopListeningAsync(CancellationToken cancellationToken)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
index 49154997f5..694eae374b 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Speech.Recognition;
 using Microsoft.Maui.ApplicationModel;
 using Windows.Globalization;
 using Windows.Media.SpeechRecognition;
@@ -14,30 +15,33 @@ public sealed partial class SpeechToTextImplementation
 
 	string recognitionText = string.Empty;
 	SpeechRecognizer? speechRecognizer;
-	IProgress<string>? recognitionProgress;
-	TaskCompletionSource<string>? speechRecognitionTaskCompletionSource;
+	SpeechToTextOptions? speechToTextOptions;
 
 	/// <inheritdoc/>
-	public SpeechToTextState CurrentState => speechRecognizer?.State switch
+	public SpeechToTextState CurrentState
 	{
-		SpeechRecognizerState.Idle => SpeechToTextState.Stopped,
-		_ => SpeechToTextState.Listening,
-	};
+		get
+		{
+			return speechRecognizer?.State switch
+			{
+				SpeechRecognizerState.Capturing or SpeechRecognizerState.SoundStarted or SpeechRecognizerState.SpeechDetected or SpeechRecognizerState.Processing => SpeechToTextState.Listening,
+				SpeechRecognizerState.SoundEnded => SpeechToTextState.Silence,
+				_ => SpeechToTextState.Stopped,
+			};
+		}
+	}
 
 	/// <inheritdoc />
 	public async ValueTask DisposeAsync()
 	{
 		await StopRecording(CancellationToken.None);
-
 		speechRecognizer?.Dispose();
 		speechRecognizer = null;
 	}
 
-	async Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancellationToken)
+	async Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
-		ResetSpeechRecognitionTaskCompletionSource(cancellationToken);
-
-		await Initialize(culture, cancellationToken);
+		await Initialize(options, cancellationToken);
 
 		speechRecognizer.ContinuousRecognitionSession.AutoStopSilenceTimeout = TimeSpan.MaxValue;
 		speechRecognizer.ContinuousRecognitionSession.ResultGenerated += ResultGenerated;
@@ -58,14 +62,13 @@ void OnCompleted(SpeechContinuousRecognitionSession sender, SpeechContinuousReco
 		switch (args.Status)
 		{
 			case SpeechRecognitionResultStatus.Success:
-				OnRecognitionResultCompleted(recognitionText);
-				speechRecognitionTaskCompletionSource?.TrySetResult(recognitionText);
+				OnRecognitionResultCompleted(SpeechToTextResult.Success(recognitionText));
 				break;
 			case SpeechRecognitionResultStatus.UserCanceled:
-				speechRecognitionTaskCompletionSource?.TrySetCanceled();
+				OnRecognitionResultCompleted(new SpeechToTextResult(recognitionText, new TaskCanceledException("Operation cancelled")));
 				break;
 			default:
-				speechRecognitionTaskCompletionSource?.TrySetException(new Exception(args.Status.ToString()));
+				OnRecognitionResultCompleted(SpeechToTextResult.Failed(new Exception(args.Status.ToString())));
 				break;
 		}
 	}
@@ -73,22 +76,14 @@ void OnCompleted(SpeechContinuousRecognitionSession sender, SpeechContinuousReco
 	void ResultGenerated(SpeechContinuousRecognitionSession sender, SpeechContinuousRecognitionResultGeneratedEventArgs args)
 	{
 		recognitionText += args.Result.Text;
-		recognitionProgress?.Report(args.Result.Text);
-		OnRecognitionResultUpdated(args.Result.Text);
+		if (speechToTextOptions?.ShouldReportPartialResults == true)
+		{
+			OnRecognitionResultUpdated(args.Result.Text);
+		}
 	}
 
 	Task InternalStopListeningAsync(CancellationToken cancellationToken) => StopRecording(cancellationToken);
-
-	async Task<string> InternalListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken)
-	{
-		ResetSpeechRecognitionTaskCompletionSource(cancellationToken);
-
-		recognitionProgress = recognitionResult;
-		await StartListenAsync(culture, cancellationToken);
-
-		return await speechRecognitionTaskCompletionSource.Task.WaitAsync(cancellationToken);
-	}
-
+	
 	async Task StopRecording(CancellationToken cancellationToken)
 	{
 		try
@@ -109,25 +104,12 @@ async Task StopRecording(CancellationToken cancellationToken)
 		}
 	}
 
-	[MemberNotNull(nameof(speechRecognitionTaskCompletionSource))]
-	void ResetSpeechRecognitionTaskCompletionSource(CancellationToken token)
-	{
-		speechRecognitionTaskCompletionSource?.TrySetCanceled(token);
-		speechRecognitionTaskCompletionSource = new();
-
-		token.Register(async () =>
-		{
-			await StopRecording(token);
-			speechRecognitionTaskCompletionSource.TrySetCanceled(token);
-		});
-	}
-
-
-	[MemberNotNull(nameof(recognitionText), nameof(speechRecognizer))]
-	async Task Initialize(CultureInfo culture, CancellationToken cancellationToken)
+	[MemberNotNull(nameof(recognitionText), nameof(speechRecognizer), nameof(speechToTextOptions))]
+	async Task Initialize(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
+		speechToTextOptions = options;
 		recognitionText = string.Empty;
-		speechRecognizer = new SpeechRecognizer(new Language(culture.IetfLanguageTag));
+		speechRecognizer = new SpeechRecognizer(new Language(options.Culture.IetfLanguageTag));
 		speechRecognizer.StateChanged += SpeechRecognizer_StateChanged;
 		cancellationToken.ThrowIfCancellationRequested();
 		await speechRecognizer.CompileConstraintsAsync().AsTask(cancellationToken);
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextOptions.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextOptions.cs
new file mode 100644
index 0000000000..b402bf8b0a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextOptions.cs
@@ -0,0 +1,19 @@
+using System.Globalization;
+
+namespace CommunityToolkit.Maui.Media;
+
+/// <summary>
+/// Options for configuring speech recognition.
+/// </summary>
+public class SpeechToTextOptions
+{
+	/// <summary>
+	/// The culture to use for speech recognition.
+	/// </summary>
+	public required CultureInfo Culture { get; init; }
+
+	/// <summary>
+	/// Include partial recognition results.
+	/// </summary>
+	public bool ShouldReportPartialResults { get; init; } = true;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextResult.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextResult.shared.cs
index 6bba67e4f3..a6f523ec3c 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextResult.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextResult.shared.cs
@@ -51,4 +51,8 @@ public void EnsureSuccess()
 			throw Exception;
 		}
 	}
+
+	internal static SpeechToTextResult Failed(Exception exception) => new(null, exception);
+
+	internal static SpeechToTextResult Success(string text) => new(text, null);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextState.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextState.shared.cs
index 9ae1aa970d..b504f2dd20 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextState.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextState.shared.cs
@@ -13,5 +13,10 @@ public enum SpeechToTextState
 	/// <summary>
 	/// Listening is active
 	/// </summary>
-	Listening
+	Listening,
+
+	/// <summary>
+	/// Listening is active, but no sound is detected
+	/// </summary>
+	Silence
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
index 5e76fc1eff..dd828ee550 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
@@ -17,20 +17,11 @@ public void SpeechToTextTestsSetDefaultUpdatesInstance()
 		speechToText.Should().BeSameAs(speechToTextImplementationMock);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ListenAsyncFailsOnNet()
-	{
-		SpeechToText.SetDefault(new SpeechToTextImplementation());
-		var result = await SpeechToText.ListenAsync(CultureInfo.CurrentCulture, null, CancellationToken.None);
-		result.Text.Should().BeNull();
-		result.Exception.Should().BeOfType<NotImplementedInReferenceAssemblyException>();
-	}
-
 	[Fact(Timeout = (int)TestDuration.Short)]
 	public async Task StartListenAsyncFailsOnNet()
 	{
 		SpeechToText.SetDefault(new SpeechToTextImplementation());
-		await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(() => SpeechToText.StartListenAsync(CultureInfo.CurrentCulture, CancellationToken.None));
+		await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(() => SpeechToText.StartListenAsync(new SpeechToTextOptions { Culture = CultureInfo.CurrentCulture }, CancellationToken.None));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
@@ -39,7 +30,7 @@ public async Task StartStopListenAsyncShouldChangeState()
 		SpeechToText.SetDefault(new SpeechToTextImplementationMock(string.Empty, string.Empty));
 		SpeechToText.Default.StateChanged += OnStateChanged;
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Stopped);
-		await SpeechToText.StartListenAsync(CultureInfo.CurrentCulture, CancellationToken.None);
+		await SpeechToText.StartListenAsync(new SpeechToTextOptions{Culture = CultureInfo.CurrentCulture}, CancellationToken.None);
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Listening);
 		await SpeechToText.StopListenAsync(CancellationToken.None);
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Stopped);
@@ -47,7 +38,7 @@ public async Task StartStopListenAsyncShouldChangeState()
 		void OnStateChanged(object? sender, SpeechToTextStateChangedEventArgs args)
 		{
 			testOutputHelper.WriteLine(args.State.ToString());
-		};
+		}
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
@@ -60,7 +51,7 @@ public async Task StartStopListenAsyncShouldChangeRecognitionText()
 		SpeechToText.SetDefault(new SpeechToTextImplementationMock(expectedPartialText, expectedFinalText));
 		SpeechToText.Default.RecognitionResultUpdated += OnRecognitionTextUpdated;
 		SpeechToText.Default.RecognitionResultCompleted += OnRecognitionTextCompleted;
-		await SpeechToText.StartListenAsync(CultureInfo.CurrentCulture, CancellationToken.None);
+		await SpeechToText.StartListenAsync(new SpeechToTextOptions { Culture = CultureInfo.CurrentCulture }, CancellationToken.None);
 		await Task.Delay(500, CancellationToken.None);
 		await SpeechToText.StopListenAsync(CancellationToken.None);
 		SpeechToText.Default.RecognitionResultUpdated -= OnRecognitionTextUpdated;
@@ -74,7 +65,7 @@ void OnRecognitionTextUpdated(object? sender, SpeechToTextRecognitionResultUpdat
 		};
 		void OnRecognitionTextCompleted(object? sender, SpeechToTextRecognitionResultCompletedEventArgs args)
 		{
-			currentFinalText = args.RecognitionResult;
+			currentFinalText = args.RecognitionResult.Text;
 		};
 	}
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/SpeechToTextImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/SpeechToTextImplementationMock.cs
index 5d1a4f43e6..a1f748c753 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/SpeechToTextImplementationMock.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/SpeechToTextImplementationMock.cs
@@ -32,22 +32,17 @@ private set
 		}
 	} = SpeechToTextState.Stopped;
 
-	Task<SpeechToTextResult> ISpeechToText.ListenAsync(CultureInfo culture, IProgress<string>? recognitionResult, CancellationToken cancellationToken)
-	{
-		throw new NotImplementedException();
-	}
-
-	public async Task StartListenAsync(CultureInfo culture, CancellationToken cancellationToken)
+	public async Task StartListenAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
 		CurrentState = SpeechToTextState.Listening;
-		await Task.Delay(1000, cancellationToken);
+		await Task.Delay(100, cancellationToken);
 		RecognitionResultUpdated?.Invoke(this, new SpeechToTextRecognitionResultUpdatedEventArgs(partialText));
 	}
 
 	public async Task StopListenAsync(CancellationToken cancellationToken)
 	{
 		CurrentState = SpeechToTextState.Stopped;
-		await Task.Delay(1000, cancellationToken);
-		RecognitionResultCompleted?.Invoke(this, new SpeechToTextRecognitionResultCompletedEventArgs(finalText));
+		await Task.Delay(100, cancellationToken);
+		RecognitionResultCompleted?.Invoke(this, new SpeechToTextRecognitionResultCompletedEventArgs(SpeechToTextResult.Success(finalText)));
 	}
 }
\ No newline at end of file

From 0a917b8213df26657e9cb93d875d65b9f8e811a6 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:55:18 -0800
Subject: [PATCH 13/39] Add ModalPageButton to StatusBarBehaviorPage

---
 .../Behaviors/StatusBarBehaviorPage.xaml      |  5 ++
 .../Behaviors/StatusBarBehaviorPage.xaml.cs   | 77 +++++++++++++++----
 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
index c48efd858d..f86bf5f884 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
@@ -153,6 +153,11 @@
                 </RadioButton>
 
             </HorizontalStackLayout>
+            
+            <Button
+                x:Name="ModalPageButton"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
         </VerticalStackLayout>
     </ScrollView>
 </pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
index a4448d69f6..9f23ab562c 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
@@ -1,20 +1,71 @@
+using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.Maui.Sample.ViewModels.Behaviors;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Behaviors;
 
 public partial class StatusBarBehaviorPage : BasePage<StatusBarBehaviorViewModel>
 {
-	public StatusBarBehaviorPage(StatusBarBehaviorViewModel viewModel)
-		: base(viewModel)
-	{
-		InitializeComponent();
-	}
-
-	protected override void OnNavigatedTo(NavigatedToEventArgs args)
-	{
-		base.OnNavigatedTo(args);
-
-		var statusBarColor = Color.FromRgba(BindingContext.RedSliderValue, BindingContext.GreenSliderValue, BindingContext.BlueSliderValue, 1.0);
-		Core.Platform.StatusBar.SetColor(statusBarColor);
-	}
+    const string tryStatusBarOnModalPageButtonText = "Try StatusBarBehavior on Modal Page";
+
+    public StatusBarBehaviorPage(StatusBarBehaviorViewModel viewModel)
+        : base(viewModel)
+    {
+        InitializeComponent();
+
+        ModalPageButton.Text = tryStatusBarOnModalPageButtonText;
+        ModalPageButton.Clicked += HandleModalButtonClicked;
+    }
+
+    protected override void OnNavigatedTo(NavigatedToEventArgs args)
+    {
+        base.OnNavigatedTo(args);
+
+        var statusBarColor = Color.FromRgba(BindingContext.RedSliderValue, BindingContext.GreenSliderValue, BindingContext.BlueSliderValue, 1.0);
+        Core.Platform.StatusBar.SetColor(statusBarColor);
+    }
+
+    static async void HandleModalButtonClicked(object? sender, EventArgs e)
+    {
+        var statusBarBehaviorModelPage = new StatusBarBehaviorPage(new StatusBarBehaviorViewModel());
+
+        // Get Modal Page Button
+        if (!TryGetModalPageButton((Microsoft.Maui.ILayout)((ScrollView)statusBarBehaviorModelPage.Content).Content, out var modalPageButton))
+        {
+            throw new InvalidOperationException("Unable To Find Modal Page Button");
+        }
+
+        // Change Text on Modal Page Button
+        modalPageButton.Text = "Pop Modal Page";
+
+        // Modify Behavior of Modal Page Button
+        modalPageButton.Clicked -= HandleModalButtonClicked;
+        modalPageButton.Clicked += async (_, _) => await Shell.Current.Navigation.PopModalAsync();
+
+        await Shell.Current.Navigation.PushModalAsync(statusBarBehaviorModelPage);
+    }
+
+    static bool TryGetModalPageButton(Microsoft.Maui.ILayout layout, [NotNullWhen(true)] out Button? button)
+    {
+        button = null;
+        
+        foreach (var view in layout)
+        {
+            switch (view)
+            {
+                case Button { Text: tryStatusBarOnModalPageButtonText } modalPageButton:
+                    button = modalPageButton;
+                    return true;
+                
+                case ILayout nestedLayout:
+                    if (TryGetModalPageButton(nestedLayout, out var modalPageButtonInLayout))
+                    {
+                        button = modalPageButtonInLayout;
+                        return true;
+                    }
+                    break;
+            }
+        }
+
+        return false;
+    }
 }
\ No newline at end of file

From 862345eaf7d7a301692a747e563f92651af776e3 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:57:57 -0800
Subject: [PATCH 14/39] Define `Microsoft.Maui.ILayout`

---
 .../Pages/Behaviors/StatusBarBehaviorPage.xaml.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
index 9f23ab562c..bbccf85596 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
@@ -56,7 +56,7 @@ static bool TryGetModalPageButton(Microsoft.Maui.ILayout layout, [NotNullWhen(tr
                     button = modalPageButton;
                     return true;
                 
-                case ILayout nestedLayout:
+                case Microsoft.Maui.ILayout nestedLayout:
                     if (TryGetModalPageButton(nestedLayout, out var modalPageButtonInLayout))
                     {
                         button = modalPageButtonInLayout;

From 161b4202c5a70c93722ad27635a701bb7028fbeb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 08:39:19 -0800
Subject: [PATCH 15/39] Bump xunit.runner.visualstudio from 3.0.0 to 3.0.1 in
 /samples (#2435)

---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index 3e373b36f4..0051a0d06d 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index a3d925a581..be8439d1d7 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit.v3" Version="1.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>
   </ItemGroup>

From 112e4ffd747ddc1c59d358208365cae946545443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:01:56 -0800
Subject: [PATCH 16/39] Bump xunit.v3 from 1.0.0 to 1.0.1 in /samples (#2436)

---
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index be8439d1d7..3bfe9b4720 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit.v3" Version="1.0.0" />
+    <PackageReference Include="xunit.v3" Version="1.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>

From f6894cec4cefc611f2ebb539dac3c6f2edf83c33 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:25:12 -0800
Subject: [PATCH 17/39] `dotnet format`

---
 .../Behaviors/StatusBarBehaviorPage.xaml.cs   | 104 +++++++++---------
 .../Essentials/SpeechToTextViewModel.cs       |   8 +-
 .../Views/CameraView/CameraViewViewModel.cs   |  12 +-
 .../CustomSizeAndPositionPopupViewModel.cs    |   8 +-
 .../CameraManager.macios.cs                   |   6 +-
 .../Handlers/CameraViewHandler.shared.cs      |   2 +-
 .../OfflineSpeechToText.shared.cs             |   2 +-
 ...flineSpeechToTextImplementation.android.cs |   2 +-
 .../OfflineSpeechToTextImplementation.ios.cs  |   2 +-
 ...OfflineSpeechToTextImplementation.macos.cs |   2 +-
 .../SpeechToTextImplementation.android.cs     |   2 +-
 .../Handlers/MediaElementHandler.android.cs   |   1 +
 .../Handlers/MediaElementHandler.shared.cs    |   1 +
 .../Services/MediaControlsService.android.cs  |   2 +
 .../Views/MauiMediaElement.android.cs         |   1 +
 .../Views/MediaManager.macios.cs              |  19 ++++
 .../MaxLengthReachedBehaviorTests.cs          |   9 ++
 .../SetFocusOnEntryCompletedTests.cs          |   2 +
 .../UserStoppedTypingBehaviorTests.cs         |   9 ++
 .../Essentials/SpeechToTextTests.cs           |   2 +-
 20 files changed, 120 insertions(+), 76 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
index bbccf85596..485fdd777a 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml.cs
@@ -5,67 +5,67 @@ namespace CommunityToolkit.Maui.Sample.Pages.Behaviors;
 
 public partial class StatusBarBehaviorPage : BasePage<StatusBarBehaviorViewModel>
 {
-    const string tryStatusBarOnModalPageButtonText = "Try StatusBarBehavior on Modal Page";
+	const string tryStatusBarOnModalPageButtonText = "Try StatusBarBehavior on Modal Page";
 
-    public StatusBarBehaviorPage(StatusBarBehaviorViewModel viewModel)
-        : base(viewModel)
-    {
-        InitializeComponent();
+	public StatusBarBehaviorPage(StatusBarBehaviorViewModel viewModel)
+		: base(viewModel)
+	{
+		InitializeComponent();
 
-        ModalPageButton.Text = tryStatusBarOnModalPageButtonText;
-        ModalPageButton.Clicked += HandleModalButtonClicked;
-    }
+		ModalPageButton.Text = tryStatusBarOnModalPageButtonText;
+		ModalPageButton.Clicked += HandleModalButtonClicked;
+	}
 
-    protected override void OnNavigatedTo(NavigatedToEventArgs args)
-    {
-        base.OnNavigatedTo(args);
+	protected override void OnNavigatedTo(NavigatedToEventArgs args)
+	{
+		base.OnNavigatedTo(args);
 
-        var statusBarColor = Color.FromRgba(BindingContext.RedSliderValue, BindingContext.GreenSliderValue, BindingContext.BlueSliderValue, 1.0);
-        Core.Platform.StatusBar.SetColor(statusBarColor);
-    }
+		var statusBarColor = Color.FromRgba(BindingContext.RedSliderValue, BindingContext.GreenSliderValue, BindingContext.BlueSliderValue, 1.0);
+		Core.Platform.StatusBar.SetColor(statusBarColor);
+	}
 
-    static async void HandleModalButtonClicked(object? sender, EventArgs e)
-    {
-        var statusBarBehaviorModelPage = new StatusBarBehaviorPage(new StatusBarBehaviorViewModel());
+	static async void HandleModalButtonClicked(object? sender, EventArgs e)
+	{
+		var statusBarBehaviorModelPage = new StatusBarBehaviorPage(new StatusBarBehaviorViewModel());
 
-        // Get Modal Page Button
-        if (!TryGetModalPageButton((Microsoft.Maui.ILayout)((ScrollView)statusBarBehaviorModelPage.Content).Content, out var modalPageButton))
-        {
-            throw new InvalidOperationException("Unable To Find Modal Page Button");
-        }
+		// Get Modal Page Button
+		if (!TryGetModalPageButton((Microsoft.Maui.ILayout)((ScrollView)statusBarBehaviorModelPage.Content).Content, out var modalPageButton))
+		{
+			throw new InvalidOperationException("Unable To Find Modal Page Button");
+		}
 
-        // Change Text on Modal Page Button
-        modalPageButton.Text = "Pop Modal Page";
+		// Change Text on Modal Page Button
+		modalPageButton.Text = "Pop Modal Page";
 
-        // Modify Behavior of Modal Page Button
-        modalPageButton.Clicked -= HandleModalButtonClicked;
-        modalPageButton.Clicked += async (_, _) => await Shell.Current.Navigation.PopModalAsync();
+		// Modify Behavior of Modal Page Button
+		modalPageButton.Clicked -= HandleModalButtonClicked;
+		modalPageButton.Clicked += async (_, _) => await Shell.Current.Navigation.PopModalAsync();
 
-        await Shell.Current.Navigation.PushModalAsync(statusBarBehaviorModelPage);
-    }
+		await Shell.Current.Navigation.PushModalAsync(statusBarBehaviorModelPage);
+	}
 
-    static bool TryGetModalPageButton(Microsoft.Maui.ILayout layout, [NotNullWhen(true)] out Button? button)
-    {
-        button = null;
-        
-        foreach (var view in layout)
-        {
-            switch (view)
-            {
-                case Button { Text: tryStatusBarOnModalPageButtonText } modalPageButton:
-                    button = modalPageButton;
-                    return true;
-                
-                case Microsoft.Maui.ILayout nestedLayout:
-                    if (TryGetModalPageButton(nestedLayout, out var modalPageButtonInLayout))
-                    {
-                        button = modalPageButtonInLayout;
-                        return true;
-                    }
-                    break;
-            }
-        }
+	static bool TryGetModalPageButton(Microsoft.Maui.ILayout layout, [NotNullWhen(true)] out Button? button)
+	{
+		button = null;
 
-        return false;
-    }
+		foreach (var view in layout)
+		{
+			switch (view)
+			{
+				case Button { Text: tryStatusBarOnModalPageButtonText } modalPageButton:
+					button = modalPageButton;
+					return true;
+
+				case Microsoft.Maui.ILayout nestedLayout:
+					if (TryGetModalPageButton(nestedLayout, out var modalPageButtonInLayout))
+					{
+						button = modalPageButtonInLayout;
+						return true;
+					}
+					break;
+			}
+		}
+
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
index ff7937ef41..f9d394a864 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
@@ -17,7 +17,7 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	readonly ITextToSpeech textToSpeech;
 	readonly ISpeechToText speechToText;
 
-	public SpeechToTextViewModel(ITextToSpeech textToSpeech, [FromKeyedServices("Online")]ISpeechToText speechToText)
+	public SpeechToTextViewModel(ITextToSpeech textToSpeech, [FromKeyedServices("Online")] ISpeechToText speechToText)
 	{
 		this.textToSpeech = textToSpeech;
 		this.speechToText = speechToText;
@@ -28,15 +28,15 @@ public SpeechToTextViewModel(ITextToSpeech textToSpeech, [FromKeyedServices("Onl
 	}
 
 	public ObservableCollection<Locale> Locales { get; } = [];
-  
+
 	public SpeechToTextState? State => speechToText.CurrentState;
-	
+
 	[ObservableProperty]
 	public partial Locale? CurrentLocale { get; set; }
 
 	[ObservableProperty]
 	public partial string? RecognitionText { get; set; } = "Welcome to .NET MAUI Community Toolkit!";
-	
+
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StartListenCommand))]
 	public partial bool CanStartListenExecute { get; set; } = true;
 
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index c8d5113bd4..055637f821 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -8,13 +8,13 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseViewModel
 {
 	readonly ICameraProvider cameraProvider = cameraProvider;
-	
+
 	public IReadOnlyList<CameraInfo> Cameras => cameraProvider.AvailableCameras ?? [];
 
 	public CancellationToken Token => CancellationToken.None;
 
 	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
-	
+
 	[ObservableProperty]
 	public partial CameraFlashMode FlashMode { get; set; }
 
@@ -35,11 +35,11 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 
 	[ObservableProperty]
 	public partial string CurrentZoomText { get; set; } = string.Empty;
-	
-	[ObservableProperty] 
+
+	[ObservableProperty]
 	public partial string FlashModeText { get; set; } = string.Empty;
-	
-	[ObservableProperty] 
+
+	[ObservableProperty]
 	public partial string ResolutionText { get; set; } = string.Empty;
 
 	[RelayCommand]
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
index f870365fe7..5ef956c7fd 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
@@ -9,16 +9,16 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 public partial class CustomSizeAndPositionPopupViewModel : BaseViewModel
 {
 	public IReadOnlyList<string> FlowDirectionOptions { get; } = [.. Enum.GetNames<FlowDirection>()];
-	
+
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial double Height { get; set; } = 100;
-	
+
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial double Width { get; set; } = 100;
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial bool IsStartHorizontalOptionSelected { get; set; } = true;
-	
+
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial bool IsCenterHorizontalOptionSelected { get; set; }
 
@@ -36,7 +36,7 @@ public partial class CustomSizeAndPositionPopupViewModel : BaseViewModel
 
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial bool IsEndVerticalOptionSelected { get; set; }
-	
+
 	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
 	public partial bool IsFillVerticalOptionSelected { get; set; }
 
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 6947fde272..9c905f3285 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -31,7 +31,7 @@ public UIView CreatePlatformView()
 		{
 			SessionPreset = AVCaptureSession.PresetPhoto
 		};
-		
+
 		previewView = new PreviewView
 		{
 			Session = captureSession
@@ -269,8 +269,8 @@ protected virtual void Dispose(bool disposing)
 	static AVCaptureVideoOrientation GetVideoOrientation()
 	{
 		IEnumerable<UIScene> scenes = UIApplication.SharedApplication.ConnectedScenes;
-		var interfaceOrientation = scenes.FirstOrDefault() is UIWindowScene windowScene 
-			? windowScene.InterfaceOrientation 
+		var interfaceOrientation = scenes.FirstOrDefault() is UIWindowScene windowScene
+			? windowScene.InterfaceOrientation
 			: UIApplication.SharedApplication.StatusBarOrientation;
 
 		return interfaceOrientation switch
diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
index 3836325a10..7a345bc61a 100644
--- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
@@ -74,7 +74,7 @@ protected override NativePlatformCameraPreviewView CreatePlatformView()
 		ArgumentNullException.ThrowIfNull(MauiContext);
 		cameraManager = new(MauiContext, VirtualView, cameraProvider, () => Init(VirtualView));
 
-		return 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
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
index d6f17e297f..93e942c6af 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToText.shared.cs
@@ -20,7 +20,7 @@ public static Task StartListenAsync(SpeechToTextOptions options, CancellationTok
 	/// <inheritdoc cref="ISpeechToText.StopListenAsync"/>
 	public static Task StopListenAsync(CancellationToken cancellationToken = default) =>
 		Default.StopListenAsync(cancellationToken);
-	
+
 	/// <inheritdoc cref="ISpeechToText.RequestPermissions"/>
 	public static Task<bool> RequestPermissions(CancellationToken cancellationToken = default) =>
 		Default.RequestPermissions(cancellationToken);
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
index ee0449d724..5d060d77ba 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
@@ -55,7 +55,7 @@ static Intent CreateSpeechIntent(SpeechToTextOptions options)
 	}
 
 	static bool IsSpeechRecognitionAvailable() => OperatingSystem.IsAndroidVersionAtLeast(33) && SpeechRecognizer.IsOnDeviceRecognitionAvailable(Application.Context);
-	
+
 	[MemberNotNull(nameof(speechRecognizer), nameof(listener))]
 	[SupportedOSPlatform("Android33.0")]
 	void InternalStartListening(SpeechToTextOptions options)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
index 2119da2259..0e77fdaa72 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.ios.cs
@@ -21,7 +21,7 @@ void InternalStartListening(SpeechToTextOptions options)
 
 		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
 		speechRecognizer.SupportsOnDeviceRecognition = true;
-		
+
 		if (!speechRecognizer.Available)
 		{
 			throw new ArgumentException("Speech recognizer is not available");
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
index 6475ce799c..33ff8e40b8 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.macos.cs
@@ -13,7 +13,7 @@ void InternalStartListening(SpeechToTextOptions options)
 	{
 		speechRecognizer = new SFSpeechRecognizer(NSLocale.FromLocaleIdentifier(options.Culture.Name));
 		speechRecognizer.SupportsOnDeviceRecognition = true;
-		
+
 		if (!speechRecognizer.Available)
 		{
 			throw new ArgumentException("Speech recognizer is not available");
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
index 5f5b747b6f..6270686ce6 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.android.cs
@@ -54,7 +54,7 @@ static Intent CreateSpeechIntent(SpeechToTextOptions options)
 	}
 
 	static bool IsSpeechRecognitionAvailable() => SpeechRecognizer.IsRecognitionAvailable(Application.Context);
-	
+
 	[MemberNotNull(nameof(speechRecognizer), nameof(listener))]
 	Task InternalStartListeningAsync(SpeechToTextOptions options, CancellationToken cancellationToken)
 	{
diff --git a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
index 6a68aebed5..b3eac0a48f 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
@@ -17,6 +17,7 @@ public static void ShouldLoopPlayback(MediaElementHandler handler, MediaElement
 		handler.mediaManager?.UpdateShouldLoopPlayback();
 	}
 
+	[Obsolete]
 	protected override MauiMediaElement CreatePlatformView()
 	{
 		mediaManager ??= new(MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} cannot be null"),
diff --git a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
index 7830a2ea4a..cf24b345ff 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
@@ -13,6 +13,7 @@ public partial class MediaElementHandler
 	/// <summary>
 	/// The <see cref="MediaManager"/> that is managing the <see cref="IMediaElement"/> instance.
 	/// </summary>
+	[Obsolete]
 	protected MediaManager? mediaManager;
 #endif
 
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
index 25fdc69161..b1cba43fdd 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
@@ -44,6 +44,7 @@ class MediaControlsService : Service
 
 	public override IBinder? OnBind(Intent? intent) => null;
 
+	[Obsolete]
 	public override StartCommandResult OnStartCommand([NotNull] Intent? intent, StartCommandFlags flags, int startId)
 	{
 		ArgumentNullException.ThrowIfNull(intent);
@@ -181,6 +182,7 @@ void OnSetupAudioServices()
 		audioManager.SetStreamVolume(AndroidStream.Music, audioManager.GetStreamVolume(AndroidStream.Music), 0);
 	}
 
+	[Obsolete]
 	async Task OnSetContent(Intent mediaManagerIntent, CancellationToken cancellationToken)
 	{
 		var albumArtUri = mediaManagerIntent.GetStringExtra("albumArtUri") ?? string.Empty;
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
index 2fb28d6594..7462466eaf 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
@@ -85,6 +85,7 @@ protected override void OnVisibilityChanged(Android.Views.View changedView, [Gen
 	/// Releases the unmanaged resources used by the <see cref="MediaElement"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+	[Obsolete]
 	protected override void Dispose(bool disposing)
 	{
 		if (disposing)
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
index 35556abab7..28796829da 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
@@ -90,6 +90,7 @@ public partial class MediaManager : IDisposable
 	/// Creates the corresponding platform view of <see cref="MediaElement"/> on iOS and macOS.
 	/// </summary>
 	/// <returns>The platform native counterpart of <see cref="MediaElement"/>.</returns>
+	[Obsolete]
 	public (PlatformMediaElement Player, AVPlayerViewController PlayerViewController) CreatePlatformView()
 	{
 		Player = new();
@@ -132,6 +133,7 @@ public void Dispose()
 		GC.SuppressFinalize(this);
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformPlay()
 	{
 		if (Player?.CurrentTime == PlayerItem?.Duration)
@@ -142,11 +144,13 @@ protected virtual partial void PlatformPlay()
 		Player?.Play();
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformPause()
 	{
 		Player?.Pause();
 	}
 
+	[Obsolete]
 	protected virtual async partial Task PlatformSeek(TimeSpan position, CancellationToken token)
 	{
 		token.ThrowIfCancellationRequested();
@@ -187,6 +191,7 @@ protected virtual async partial Task PlatformSeek(TimeSpan position, Cancellatio
 		MediaElement.SeekCompleted();
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformStop()
 	{
 		// There's no Stop method so pause the video and reset its position
@@ -211,6 +216,7 @@ protected virtual partial void PlatformUpdateAspect()
 		};
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformUpdateSource()
 	{
 		MediaElement.CurrentStateChanged(MediaElementState.Opening);
@@ -378,6 +384,7 @@ protected virtual partial void PlatformUpdateShouldShowPlaybackControls()
 			MediaElement.ShouldShowPlaybackControls;
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformUpdatePosition()
 	{
 		if (Player is null)
@@ -410,6 +417,7 @@ protected virtual partial void PlatformUpdatePosition()
 		}
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformUpdateVolume()
 	{
 		if (Player is null)
@@ -424,6 +432,7 @@ protected virtual partial void PlatformUpdateVolume()
 		}
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 	{
 		if (Player is null)
@@ -433,6 +442,7 @@ protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 		UIApplication.SharedApplication.IdleTimerDisabled = MediaElement.ShouldKeepScreenOn;
 	}
 
+	[Obsolete]
 	protected virtual partial void PlatformUpdateShouldMute()
 	{
 		if (Player is null)
@@ -452,6 +462,7 @@ protected virtual partial void PlatformUpdateShouldLoopPlayback()
 	/// Releases the unmanaged resources used by the <see cref="MediaManager"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+	[Obsolete]
 	protected virtual void Dispose(bool disposing)
 	{
 		if (disposing)
@@ -536,6 +547,7 @@ protected virtual void Dispose(bool disposing)
 		}
 	}
 
+	[Obsolete]
 	void AddStatusObservers()
 	{
 		if (Player is null)
@@ -550,6 +562,7 @@ void AddStatusObservers()
 		RateObserver = AVPlayer.Notifications.ObserveRateDidChange(RateChanged);
 	}
 
+	[Obsolete]
 	void VolumeChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -564,6 +577,7 @@ void VolumeChanged(NSObservedChange e)
 		}
 	}
 
+	[Obsolete]
 	void MutedChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -602,6 +616,7 @@ void DestroyPlayedToEndObserver()
 		PlayedToEndObserver?.Dispose();
 	}
 
+	[Obsolete]
 	void StatusChanged(NSObservedChange obj)
 	{
 		if (Player is null)
@@ -620,6 +635,7 @@ void StatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
+	[Obsolete]
 	void TimeControlStatusChanged(NSObservedChange obj)
 	{
 		if (Player is null || Player.Status is AVPlayerStatus.Unknown
@@ -641,6 +657,7 @@ void TimeControlStatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
+	[Obsolete]
 	void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 	{
 		string message;
@@ -663,6 +680,7 @@ void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
+	[Obsolete]
 	void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 	{
 		if (args.Notification.Object != PlayerViewController?.Player?.CurrentItem || Player is null)
@@ -688,6 +706,7 @@ void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
+	[Obsolete]
 	void RateChanged(object? sender, NSNotificationEventArgs args)
 	{
 		if (Player is null)
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
index cb83357e34..25fbe1c21a 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
@@ -7,6 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class MaxLengthReachedBehaviorTests() : BaseBehaviorTest<MaxLengthReachedBehavior, InputView>(new MaxLengthReachedBehavior(), new Entry())
 {
 	[Fact]
+	[Obsolete]
 	public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -22,6 +23,7 @@ public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -37,6 +39,7 @@ public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -53,6 +56,7 @@ public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -69,6 +73,7 @@ public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -83,6 +88,7 @@ public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -97,6 +103,7 @@ public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -112,6 +119,7 @@ public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -126,6 +134,7 @@ public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void ShouldNotDismissKeyboardWhenOptionSetToFalse()
 	{
 		// arrange
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
index e881a9aa19..24faf1e414 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
@@ -6,6 +6,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class SetFocusOnEntryCompletedTests() : BaseBehaviorTest<SetFocusOnEntryCompletedBehavior, VisualElement>(new SetFocusOnEntryCompletedBehavior(), new View())
 {
 	[Fact]
+	[Obsolete]
 	public void DoesNotSetFocusBeforeCompletion()
 	{
 		// arrange
@@ -21,6 +22,7 @@ public void DoesNotSetFocusBeforeCompletion()
 	}
 
 	[Fact]
+	[Obsolete]
 	public void SetsFocusWhenCompleted()
 	{
 		// arrange
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
index b7962eada5..19a5699eb6 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
@@ -7,6 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class UserStoppedTypingBehaviorTests() : BaseBehaviorTest<UserStoppedTypingBehavior, InputView>(new UserStoppedTypingBehavior(), new Entry())
 {
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -28,6 +29,7 @@ public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	{
 		// arrange
@@ -48,6 +50,7 @@ public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	{
 		// arrange
@@ -72,6 +75,7 @@ public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultipleTimes()
 	{
 		// arrange
@@ -95,6 +99,7 @@ public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultiple
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldDismissKeyboardWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -119,6 +124,7 @@ void HandleEntryUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	{
 		// arrange
@@ -142,6 +148,7 @@ public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
+	[Obsolete]
 	public async Task ShouldNotExecuteCommandWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -180,6 +187,7 @@ void HandleFocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
+	[Obsolete]
 	public async Task ShouldNotDismissKeyboardWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -220,6 +228,7 @@ void HandleUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
+	[Obsolete]
 	public async Task ShouldExecuteCommandImmediatelyWhenMinimumLengthThresholdHasNotBeenSet()
 	{
 		// arrange
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
index dd828ee550..a610eadedc 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/SpeechToTextTests.cs
@@ -30,7 +30,7 @@ public async Task StartStopListenAsyncShouldChangeState()
 		SpeechToText.SetDefault(new SpeechToTextImplementationMock(string.Empty, string.Empty));
 		SpeechToText.Default.StateChanged += OnStateChanged;
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Stopped);
-		await SpeechToText.StartListenAsync(new SpeechToTextOptions{Culture = CultureInfo.CurrentCulture}, CancellationToken.None);
+		await SpeechToText.StartListenAsync(new SpeechToTextOptions { Culture = CultureInfo.CurrentCulture }, CancellationToken.None);
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Listening);
 		await SpeechToText.StopListenAsync(CancellationToken.None);
 		SpeechToText.Default.CurrentState.Should().Be(SpeechToTextState.Stopped);

From 7439c34abdcae54765b71a34d826342fadb588ba Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Mon, 13 Jan 2025 17:27:40 -0800
Subject: [PATCH 18/39] Update Media Element to use Media3 (#2076)

* Migrate to AndroidX Media3 library

Updated `CommunityToolkit.Maui.MediaElement.csproj` to replace `Xam.Plugins.Android.ExoPlayer` with `Xamarin.AndroidX.Media3` packages.

In `MediaControlsService.android.cs`, updated drawable resources for media control actions to new icons.

Replaced `StyledPlayerView` with `PlayerView` in `MauiMediaElement.android.cs`.

Refactored `MediaManager.android.cs` to use `AndroidX.Media3` classes and interfaces, updating method signatures and interface implementations.

Updated `MediaManager.shared.cs` to use `AndroidX.Media3.ExoPlayer.IExoPlayer` for Android.

Aligned methods and properties with the new Media3 API, including playback state handling, error handling, and media session management.

Refactored `OnPlaybackStateChanged` and `OnPlayerStateChanged` methods to handle new playback state values.

Modified `InitializeMediaSession` to comment out `MediaSessionConnector` and adjust media session setup.

Ensured compatibility with the new Media3 library across various methods.

* Update AndroidX packages and refactor MediaManager

Updated `CommunityToolkit.Maui.Camera.csproj` and `CommunityToolkit.Maui.MediaElement.csproj` to use newer versions of several Xamarin.AndroidX packages and added new package references.

Refactored `MediaManager.android.cs`:
- Removed unused imports and added new ones.
- Replaced `MediaControllerCompat` and `MediaSessionCompat` with `MediaSession`.
- Updated `OnPlaybackStateChanged` to use `PlaybackStateCompat` constants.
- Removed `BroadcastUpdate` method and related calls.
- Introduced `SetPlayerData` method for setting media metadata.
- Removed `InitializeMediaSession` method and related calls.
- Updated `StartService` to use the new `MediaSession`.
- Removed `UIUpdateReceiver` class and related calls.
- Updated method signatures to use new types from updated AndroidX libraries.

* Refactor MediaManager and update to AndroidX Media3

Removed AudioManager and related methods from MediaControlsService.
Replaced Trace.WriteLine with Trace.TraceError for error logging.
Removed OnSetupAudioServices method and its calls.
Modified InitializeNotification to remove SetShowActionsInCompactView.
Refactored OnSetContent and OnSetIntents methods.
Added UIUpdateReceiver class to handle updates from MediaControlsService.
Registered and unregistered UIUpdateReceiver in MediaManager.
Added BroadcastUpdate methods for play and pause actions.
Updated SetPlayerData to return MediaItem.Builder.
Aligned method signatures with new MediaItem.Builder approach.
Handled ACTION_PLAY, ACTION_PAUSE, ACTION_FASTFORWARD, and ACTION_REWIND in UIUpdateReceiver.
Updated method names and parameters to match AndroidX Media3 conventions.
Removed redundant or obsolete code and comments.

* Update AndroidX packages and enhance MediaManager

Updated `CommunityToolkit.Maui.Camera.csproj` and `CommunityToolkit.Maui.MediaElement.csproj`:
- Removed `Xamarin.AndroidX.Lifecycle.LiveData`.
- Downgraded several `Xamarin.AndroidX.Lifecycle` packages from `2.8.4` to `2.8.3.1`.
- Downgraded `Xamarin.AndroidX.Activity.Ktx` from `1.9.1` to `1.9.0.4`.
- Corrected `Xamarin.AndroidX.Media3.Ui` to `Xamarin.AndroidX.Media3.UI`.

Enhanced `MediaManager.android.cs`:
- Added `mediaSession` field to `MediaManager` class.
- Updated `SetPlayerData` to set media ID using `mediaItem.SetMediaId(url)`.
- Updated method signatures to use fully qualified names for `global::AndroidX.Media3.Common` types.

* Refactor MediaManager and update package references

Refactored MediaManager.android.cs for improved readability and maintainability. Updated package references in CommunityToolkit.Maui.MediaElement.csproj, including the removal of Xamarin.AndroidX.Media3.Transformer and addition of new ExoPlayer packages. Enhanced method implementations and ensured compatibility with updated packages.

* Add TODO and note with request for help solving async issue with seeking.

* Simplify player state handling and seeking operations

Refactored `PlatformPause`, `PlatformSeek`, `PlatformStop`, and `PlatformUpdateSource` methods to streamline code and reduce potential issues:
- Removed TODO comment in `PlatformPause`.
- Simplified `PlatformSeek` by removing listener management and async handling.
- Changed `PlatformStop` to a synchronous method, ensuring proper player stop without async seek.
- Updated `PlatformUpdateSource` to set media items directly without modifying the listener.

* Update .NET version, playback states, and error handling

Updated .NET to `net8.0` and Maui to `8.0.70` in `Directory.Build.props`. Removed old `Xamarin.AndroidX` packages and added `Xamarin.AndroidX.Collection.Jvm` and `Xamarin.AndroidX.Activity.Ktx` in `CommunityToolkit.Maui.MediaElement.csproj`.

Introduced constants for playback states (`sTATE_IDLE`, `sTATE_BUFFERING`, `sTATE_READY`, `sTATE_ENDED`) and replaced `PlaybackStateCompat.StatePlaying` with `sTATE_READY` in `MediaManager.android.cs`. Added `Player.SetHandleAudioBecomingNoisy(true)` for handling audio interruptions and a `UIUpdateReceiver` for UI updates based on player state changes.

Improved error handling in `PlatformSeek` method to avoid exceptions and ensure execution on the calling thread. Initialized `MediaItem.Builder` in `SetPlayerData` method. Updated `PlatformUpdateAspect` and `PlatformUpdateShouldLoopPlayback` methods to set properties based on `MediaElement` attributes.

* Refactor player control and resource disposal

* Modified `PlatformStop` to reset media position to start (0) and explicitly set `MediaElement.Position` to `TimeSpan.Zero`.
* Added `MediaSession` release and disposal.

* Update changes from media2 for playerView poster to media3 version that is compatible.

* Add `SafeFireAndForget`

* Update nuget version and apply fixes for changes

* Update .NET, Maui, and AndroidX versions; refactor MediaManager

Updated .NET version to `net8.0` and Maui package to `8.0.80` in `Directory.Build.props`. Updated `Xamarin.AndroidX` packages in `CommunityToolkit.Maui.Camera.csproj` and `CommunityToolkit.Maui.MediaElement.csproj`.

Refactored `MediaManager.android.cs`:
- Removed `sTATE_IDLE`, added `sTATE_BUFFERING`.
- Replaced `Trace.WriteLine` with `Trace.TraceError` for error logging.
- Modified `MediaSession` creation to include a random ID.
- Simplified null-conditional checks in `OnPlayerError`.
- Corrected logging format string in `OnPlayerError`.
- Changed session extras setting method.
- Removed calls to `UseArtwork`, `RemoveListener`, and `Release`.
- Ensured `session` is not null before setting `SessionExtras` in `StartService`.

* Refactor media controls to use modern Android APIs

Refactored MediaControlsService and MediaManager to improve media control updates and notifications using CommunityToolkit.Maui. Replaced LocalBroadcastManager with ContextCompat for broadcast handling. Updated classes to use static events for property changes. Refactored methods for cleaner notification action handling and aligned with modern Android development practices.

* Refactor notification handling with INotificationService

Introduced `INotificationService` and `NotificationService` to manage notification events, replacing `PropertyChangedEventArgs`. Added `NotificationEventArgs` for encapsulating event data.

Updated `MediaControlsService` and `MediaManager` to use `INotificationService`, ensuring proper resource disposal and handling Android-specific logic. Enhanced `MediaManager` for bitmap creation and media session management on Android.

Refactored `ReceiveUpdates` and `UIUpdateReceiver` to use `INotificationService`. Ensured backward compatibility and proper initialization checks. Improved code readability and maintainability by refactoring and organizing imports.

* - Fix dependancy chain for Media Element after switching from local testing to nuget.org
- Remove session ID randomization until it is available in future patch. Until then `Popup`, `CollectionView` and `CarouselView` will not work. I have a PR waiting on review that fixes this. Waiting for that to merge before updating code.

* Remove duplicate `PackageReference`

* Update media session to use random id.
Update nuget for media 3 to 1.3.1.1

* - Fix buttons receiver log error.
- Remove notification request from app and manifest - it is not needed for media notifications.
- Many fixes for crashes related to poor management of class disposal.
- On API's below 33 notification now cancels when stoping video/music and when u exit media element it also closes. This is native on 33-34.
- Added handling of cancelling notification events when disposing

* removed commented code that is no longer relevent

* Remove unused method

* Update src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>

* - Remove `INotiifcation` Interface
- Change how services are instantiated in classes
- Move `EventHandler` from interface to class

* - Fix issue with variable name mismatch

* - Update all classes to use a single type of check for API level on Android
- Use `OperatingSystem.IsAndroidVersionAtLeast` for all API level checks

* - Fix one more API check

* - Remove suppression no longer required

* Add comment about `p0` event args parameter

* Refactor MediaManager to use AndroidX libraries

Significant refactoring and updates to MediaManager and related components:
- Added `android.permission.POST_NOTIFICATIONS` to `AndroidManifest.xml`.
- Removed `NotificationService` and related event handling.
- Updated `MediaManager` to use `AndroidX.Media3` components.
- Introduced `BoundServiceConnection` for managing `MediaControlsService`.
- Refactored `CreatePlatformView` to start and bind foreground service.
- Added `CheckAndRequestForegroundPermission` for permission handling.
- Updated `MauiMediaElement` to dynamically update `PlayerView`.
- Introduced `PlayerViewChanged` event handler in `MediaElementHandler.android.cs`.
- Removed `NotificationEventArgs` class from `CommunityToolkit.Maui.Primitives`.
- Minor formatting and namespace updates.

* Refactor Code

* Delete CommunityToolkit.Maui.MediaElement.sln

* Improve resource management and notifications

Updated MauiProgram.cs to include new fonts. Enhanced MediaControlsService and MediaManager for better resource cleanup and unique session ID usage in notifications. Refactored methods to simplify media source handling and ensure proper service unbinding.

Fonts fix an issue with CarouselView that causes a wall of java errors when you load page.

* Refactor media handling and notification updates

Updated `DisconnectHandler` in `MediaElementHandler.android.cs` to use a more descriptive variable name `currentMediaManager`. Modified `OnBind` in `MediaControlsService.android.cs` to always create a new `BoundServiceBinder` instance. Significant updates to `OnStartCommand` in `MediaControlsService.android.cs` include creating and configuring a new `ExoPlayer`, `MediaSession`, and `PlayerView`, and calling `StartForegroundServices` without parameters. Moved `OnGetSession` from `OnDestroy` to `Dispose` in `MediaControlsService.android.cs`. Refactored `StartForegroundServices` to ensure `Player` and `Session` are initialized and handle `Notification` setup. Updated `SetLegacyNotifications` to use null-coalescing assignment for `playerNotificationManager`. Added `UpdateNotification` method to `MediaManager.android.cs` and refactored related methods to use it, improving notification updates based on media session state.

* Migrate to AndroidX Media3 and enhance media controls

Updated MediaControlsService.android.cs to include new imports for AndroidX.Media3 namespaces. Added DataSourceBitmapLoader and configured PlayerView.

Replaced Android.Support.V4.Media.Session with `PlaybackState` class and refactored AndroidX.Media3.Common.MediaMetadata.  Enhanced UpdatePlayer, OnPlayerStateChanged, PlatformUpdateSource, and UpdateMetaData methods.

Added new static class PlaybackState to define constants for playback states, replacing PlaybackStateCompat.

Refactor Android media handling and permissions

Removed AndroidMediaPermissions class. Updated MediaControlsService.android.cs with new DataSourceBitmapLoader, PlayerView initialization, and notification channel handling. Simplified OnTaskRemoved and OnDestroy methods. Adjusted StartForegroundServices for Android version checks. Made SetLegacyNotifications public.

In MediaManager.android.cs, removed Android.Support.V4.Media.Session and checkPermissionsTask. Updated PlayerView background and notification handling. Replaced PlaybackStateCompat with new PlaybackState class. Removed currentState field and CheckAndRequestForegroundPermission method. Added static PlaybackState class.

* Remove fonts added for testing

* Refactored media service to inherit player. Behavior previously was MediaManager inherited from service. This refactoring fixes almost every issue.

* Refactor MediaElement and MediaControlsService

Updated MediaElement autoplay properties to False in XAML files.
Refactored MediaControlsService to use public NotificationManager.
Added id parameter to handle unique notifications in various methods.
Ensured proper disposal of resources in Dispose methods.
Updated methods to conditionally stop foreground services based on Android version.
Enhanced notification handling and creation with unique ids.
Improved resource management and connection handling in MediaManager.

* remove unused variable. Added null checks.

* Enhance null safety and refactor notification updates

Improved null safety by adding `[MemberNotNull]` attributes and using `ArgumentNullException.ThrowIfNull` in various methods. Refactored `UpdateNotifications` to streamline null checks and directly assign values. Added `UpdatePlayer` method to ensure `connection` and `PlayerView` are not null and set `PlayerView.DefaultArtwork`. Modified `PlaybackState.StateSkippingToQueueItem` to remove redundant notification updates. Updated `PlatformUpdateSource` to call `UpdateNotifications` when the source is set without errors. Ensured `mediaItem` is not null in `StopService` method.

* Refactor notification ID handling in MediaControlsService

Removed `id` parameter from various methods in `MediaControlsService`
and `MediaManager`. Notifications and channels now use a fixed ID "1".
Updated `OnTaskRemoved` to stop and release the `Player`.

* Update service behavior. If notifications are disabled do not start service. If notifications are renabled on next change of source or upon startup allow notifications.

* Remove unused using directives in MediaControlsService

Removed `System.Runtime.InteropServices` and `Microsoft.Win32.SafeHandles` using directives from `MediaControlsService.android.cs` as they are no longer referenced in the code.

* Updated to address null intent. Added rebind override to add notification back if it is cancelled when playback rersumes. Moved notification into on create.

* Update nugets for media 3
Revert changes to Camera

* Make Bound Service immutable

* Update bound service connection to not use private set.

* Revert unintended changes in package version

* Add sealed modifier to prevent inheriting private classes `BoundServiceConnection` and `MediaControlsService`

* Add sealed modifier to `Metadata` class

* Update request for notifications to ignore android 33 and above as this is handled by OS.

* Remove request for notification permission and leave it to OS to handle. It is not required for android 26 and above.

* - Remove support for Android version less than API 26 as it is no longer supported in our repo for dotnet 9.x This lets us remove uneeded additional code to deal with this.
- Remove unneeded null checks.

* Fix artwork display in player while listening to music and the notification tray.

* fix minor issue with new method `GetBytesFromUrl`

* Use ConfigureAwait(false) and update MediaSession usage

Updated GetBytesFromUrl and CreateMediaItem methods to use ConfigureAwait(false) for async calls to avoid capturing the synchronization context. Replaced MediaSession.Builder class in PlaybackState.StateSkippingToQueueItem with the correct usage.

* Refactor BoundServiceConnection and MediaManager

Refactored BoundServiceConnection to be a partial sealed class and added an IsConnected property. Updated OnServiceConnected to call UpdateSource instead of UpdatePlayer. Removed UpdatePlayer method from MediaManager. Made formatting and consistency improvements.

* Refactor service connection handling in Android code

Removed Activity?.UpdateSource() call in IServiceConnection.OnServiceConnected.
Renamed StartConnection to StartService in MediaManager.android.cs.
Updated PlatformUpdateSource to call StartService if connection is null.

* Remove unused startServiceSourceToken from MediaManager

The startServiceSourceToken field of type CancellationTokenSource has been removed from the MediaManager class. The line that disposes of startServiceSourceToken in the Dispose method has also been removed.

* Enhance notification handling and refactor classes

- Modify `BoundServiceConnection` to update notifications on service connection.
- Change `MediaControlsService` to a partial class and update `Player` property type.
- Refactor `MauiMediaElement` for readability and maintainability.
- Add `UpdateNotifications` method to `MediaManager`.
- Improve `PlatformUpdateSource` method in `MediaManager`.

* Update media 3 to `1.5.0`

* Rename method to better reflect purpose

* Update async await operations to use `CancellationTokenSource`

* Fix method name reversion

* Remove accidental inclusion of batch file

* Resolve transient depedancies for android nuget packages

* Revert `ShouldAutoPlay`

* Remove Unused `using`

* Remove circular dependency between `MediaManager` and `MediaControlsService`

* `dotnet format`

* Fix Windows

* Update Tizen

* Update MediaManager.tizen.cs

* Update MediaManager.tizen.cs

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
Co-authored-by: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
---
 .../Platforms/Android/AndroidManifest.xml     |   3 -
 .../CommunityToolkit.Maui.MediaElement.csproj |  30 +-
 .../AndroidMediaPermissions.android.cs        |  27 -
 .../Primitives/Metadata.macios.cs             |   2 +-
 .../Primitives/Metadata.windows.cs            |   2 +-
 .../PlayerViewChangedEventArgs.android.cs     |   8 +
 .../Services/BoundServiceBinder.android.cs    |   9 +
 .../BoundServiceConnection.android.cs         |  49 ++
 .../Services/MediaControlsService.android.cs  | 342 ++++------
 .../SafeFireAndForgetExtensions.shared.cs     | 136 ++++
 .../Views/MauiMediaElement.android.cs         |  47 +-
 .../Views/MediaManager.android.cs             | 594 ++++++------------
 .../Views/MediaManager.macios.cs              |  11 +-
 .../Views/MediaManager.shared.cs              |  14 +-
 .../Views/MediaManager.tizen.cs               |   9 +-
 .../Views/MediaManager.windows.cs             |   6 +-
 16 files changed, 571 insertions(+), 718 deletions(-)
 delete mode 100644 src/CommunityToolkit.Maui.MediaElement/Primitives/AndroidMediaPermissions.android.cs
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/Primitives/PlayerViewChangedEventArgs.android.cs
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceBinder.android.cs
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceConnection.android.cs
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
index d3a3fb50ae..01854922bb 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
@@ -7,9 +7,6 @@
 
       <service android:name="communityToolkit.maui.media.services" android:stopWithTask="true" android:exported="false" android:enabled="true"
                  android:foregroundServiceType="mediaPlayback">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-            </intent-filter>
             <intent-filter>
                 <action android:name="androidx.media3.session.MediaSessionService"/>
             </intent-filter>
diff --git a/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj b/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
index 7b90fbf6a7..c3c93f8320 100644
--- a/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
+++ b/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
@@ -47,21 +47,35 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
-    <None Include="ReadMe.txt" pack="true" PackagePath="."/>
+    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
+    <None Include="ReadMe.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
-    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="[2.19.1,)"/>
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Transformer" Version="[2.19.1,)"/>
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="[2.19.1,)"/>
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.Common" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.UI" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Rtsp" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Hls" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Dash" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.Session" Version="1.5.0" />
+    
+    <!-- Resolve Transient Dependancies -->
+    <PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.3.1" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.8.7.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" Version="2.8.7.1" />
+    
   </ItemGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/AndroidMediaPermissions.android.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/AndroidMediaPermissions.android.cs
deleted file mode 100644
index 6385ce68b4..0000000000
--- a/src/CommunityToolkit.Maui.MediaElement/Primitives/AndroidMediaPermissions.android.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using static Microsoft.Maui.ApplicationModel.Permissions;
-
-namespace CommunityToolkit.Maui.ApplicationModel.Permissions;
-
-sealed class AndroidMediaPermissions : BasePlatformPermission
-{
-	static readonly Lazy<(string androidPermission, bool isRuntime)[]> permissionsHolder = new(CreatePermissions);
-
-	public override (string androidPermission, bool isRuntime)[] RequiredPermissions => permissionsHolder.Value;
-
-	static (string androidPermission, bool isRuntime)[] CreatePermissions()
-	{
-		List<(string androidPermission, bool isRuntime)> requiredPermissionsList = [];
-
-		if (OperatingSystem.IsAndroidVersionAtLeast(28))
-		{
-			requiredPermissionsList.Add((global::Android.Manifest.Permission.ForegroundService, true));
-		}
-
-		if (OperatingSystem.IsAndroidVersionAtLeast(33))
-		{
-			requiredPermissionsList.Add((global::Android.Manifest.Permission.PostNotifications, true));
-		}
-
-		return [.. requiredPermissionsList];
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs
index 0b7e127730..d0dc3ec0d6 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs
@@ -6,7 +6,7 @@
 
 namespace CommunityToolkit.Maui.Core.Primitives;
 
-class Metadata
+sealed class Metadata
 {
 	static readonly UIImage defaultUIImage = new();
 	static readonly MPNowPlayingInfo nowPlayingInfoDefault = new()
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.windows.cs
index 7a4bfc747a..47180da2e7 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.windows.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.windows.cs
@@ -2,7 +2,7 @@
 
 namespace CommunityToolkit.Maui.Core.Primitives;
 
-class Metadata
+sealed class Metadata
 {
 	readonly IMediaElement? mediaElement;
 	readonly SystemMediaTransportControls? systemMediaControls;
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/PlayerViewChangedEventArgs.android.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/PlayerViewChangedEventArgs.android.cs
new file mode 100644
index 0000000000..ab653e2ac2
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/Primitives/PlayerViewChangedEventArgs.android.cs
@@ -0,0 +1,8 @@
+using AndroidX.Media3.UI;
+
+namespace CommunityToolkit.Maui.Primitives;
+
+public sealed class PlayerViewChangedEventArgs(PlayerView playerView) : EventArgs
+{
+	public PlayerView UpdatedPlayerView { get; } = playerView;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceBinder.android.cs b/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceBinder.android.cs
new file mode 100644
index 0000000000..e095271c31
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceBinder.android.cs
@@ -0,0 +1,9 @@
+using Android.OS;
+using CommunityToolkit.Maui.Media.Services;
+
+namespace CommunityToolkit.Maui.Services;
+
+sealed class BoundServiceBinder(MediaControlsService mediaControlsService) : Binder
+{
+	public MediaControlsService Service { get; } = mediaControlsService;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceConnection.android.cs b/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceConnection.android.cs
new file mode 100644
index 0000000000..229ada44d6
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceConnection.android.cs
@@ -0,0 +1,49 @@
+using Android.Content;
+using Android.OS;
+using CommunityToolkit.Maui.Core.Views;
+
+namespace CommunityToolkit.Maui.Services;
+
+sealed partial class BoundServiceConnection(MediaManager mediaManager) : Java.Lang.Object, IServiceConnection
+{
+	readonly WeakEventManager taskRemovedEventManager = new();
+
+	public event EventHandler MediaControlsServiceTaskRemoved
+	{
+		add => taskRemovedEventManager.AddEventHandler(value);
+		remove => taskRemovedEventManager.RemoveEventHandler(value);
+	}
+
+	public MediaManager? Activity { get; } = mediaManager;
+
+	public bool IsConnected => Binder is not null;
+
+	public BoundServiceBinder? Binder { get; private set; }
+
+	void HandleTaskRemoved(object? sender, EventArgs e)
+	{
+		taskRemovedEventManager.HandleEvent(this, EventArgs.Empty, nameof(MediaControlsServiceTaskRemoved));
+	}
+
+	void IServiceConnection.OnServiceConnected(ComponentName? name, IBinder? service)
+	{
+		Binder = service as BoundServiceBinder;
+
+		if (Binder is not null)
+		{
+			Binder.Service.TaskRemoved += HandleTaskRemoved;
+		}
+
+		// UpdateNotifications needs to be called as it may have been called before the service was connected
+		Activity?.UpdateNotifications();
+	}
+
+	void IServiceConnection.OnServiceDisconnected(ComponentName? name)
+	{
+		if (Binder is not null)
+		{
+			Binder.Service.TaskRemoved -= HandleTaskRemoved;
+			Binder = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
index b1cba43fdd..8e79a99f4c 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
@@ -1,299 +1,177 @@
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Versioning;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
-using Android.Media;
 using Android.OS;
-using Android.Support.V4.Media.Session;
 using AndroidX.Core.App;
-using AndroidX.LocalBroadcastManager.Content;
-using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Win32.SafeHandles;
-using AndroidStream = Android.Media.Stream;
-using Resource = Microsoft.Maui.Resource;
+using AndroidX.Media3.Session;
+using AndroidX.Media3.UI;
+using CommunityToolkit.Maui.Services;
+using Resource = Microsoft.Maui.Controls.Resource;
 
 namespace CommunityToolkit.Maui.Media.Services;
 
 [SupportedOSPlatform("Android26.0")]
 [Service(Exported = false, Enabled = true, Name = "communityToolkit.maui.media.services", ForegroundServiceType = ForegroundService.TypeMediaPlayback)]
-class MediaControlsService : Service
+sealed partial class MediaControlsService : Service
 {
-	public const string ACTION_PLAY = "MediaAction.play";
-	public const string ACTION_PAUSE = "MediaAction.pause";
-	public const string ACTION_UPDATE_UI = "CommunityToolkit.Maui.Services.action.UPDATE_UI";
-	public const string ACTION_UPDATE_PLAYER = "CommunityToolkit.Maui.Services.action.UPDATE_PLAYER";
-	public const string ACTION_REWIND = "MediaAction.rewind";
-	public const string ACTION_FASTFORWARD = "MediaAction.fastForward";
+	readonly WeakEventManager taskRemovedEventManager = new();
 
 	bool isDisposed;
 
-	PendingIntentFlags pendingIntentFlags;
-	SafeHandle? safeHandle = new SafeFileHandle(IntPtr.Zero, true);
-	MediaSessionCompat? mediaSession;
-	AudioManager? audioManager;
+	PlayerNotificationManager? playerNotificationManager;
 	NotificationCompat.Builder? notification;
-	NotificationCompat.Action? actionPlay;
-	NotificationCompat.Action? actionPause;
-	NotificationCompat.Action? actionNext;
-	NotificationCompat.Action? actionPrevious;
-	MediaSessionCompat.Token? token;
-	ReceiveUpdates? receiveUpdates;
 
-	public override IBinder? OnBind(Intent? intent) => null;
-
-	[Obsolete]
-	public override StartCommandResult OnStartCommand([NotNull] Intent? intent, StartCommandFlags flags, int startId)
+	public event EventHandler TaskRemoved
 	{
-		ArgumentNullException.ThrowIfNull(intent);
-
-		if (!string.IsNullOrEmpty(intent.Action) && receiveUpdates is not null)
-		{
-			BroadcastUpdate(ACTION_UPDATE_PLAYER, intent.Action);
-		}
-
-		StartForegroundService(intent).AsTask().ContinueWith(t =>
-		{
-			if (t.Exception is not null)
-			{
-				foreach (var exception in t.Exception.InnerExceptions)
-				{
-					System.Diagnostics.Trace.WriteLine($"[error] {exception}, {exception.Message}");
-				}
-			}
-		}, TaskContinuationOptions.OnlyOnFaulted);
-
-		return StartCommandResult.Sticky;
+		add => taskRemovedEventManager.AddEventHandler(value);
+		remove => taskRemovedEventManager.RemoveEventHandler(value);
 	}
 
-	static void CreateNotificationChannel(NotificationManager notificationMnaManager)
-	{
-		var channel = new NotificationChannel("1", "notification", NotificationImportance.Low);
-		notificationMnaManager.CreateNotificationChannel(channel);
-	}
+	public BoundServiceBinder? Binder { get; private set; }
+	public NotificationManager? NotificationManager { get; private set; }
 
-	[MemberNotNull(nameof(mediaSession))]
-	[MemberNotNull(nameof(token))]
-	[MemberNotNull(nameof(receiveUpdates))]
-	[Obsolete]
-	ValueTask StartForegroundService(Intent mediaManagerIntent, CancellationToken cancellationToken = default)
+	public override IBinder? OnBind(Intent? intent)
 	{
-		ArgumentNullException.ThrowIfNull(mediaManagerIntent);
-		token ??= (MediaSessionCompat.Token)(mediaManagerIntent.GetParcelableExtra("token") ?? throw new InvalidOperationException("Token cannot be null"));
-
-		mediaSession ??= new MediaSessionCompat(Platform.AppContext, "notification")
-		{
-			Active = true,
-		};
-
-		if (receiveUpdates is null)
-		{
-			receiveUpdates = new ReceiveUpdates();
-			receiveUpdates.PropertyChanged += OnReceiveUpdatesPropertyChanged;
-			LocalBroadcastManager.GetInstance(this).RegisterReceiver(receiveUpdates, new IntentFilter(ACTION_UPDATE_UI));
-		}
-
-		OnSetupAudioServices();
-
-		pendingIntentFlags = Build.VERSION.SdkInt >= BuildVersionCodes.S
-			? PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable
-			: PendingIntentFlags.UpdateCurrent;
-
-		return InitializeNotification(mediaSession, mediaManagerIntent, cancellationToken);
+		Binder = new BoundServiceBinder(this);
+		return Binder;
 	}
 
-	async ValueTask InitializeNotification(MediaSessionCompat mediaSession, Intent mediaManagerIntent, CancellationToken cancellationToken)
+	public override void OnCreate()
 	{
-		var notificationManager = GetSystemService(NotificationService) as NotificationManager;
-		var intent = new Intent(this, typeof(MediaControlsService));
-		var pendingIntent = PendingIntent.GetActivity(this, 2, intent, pendingIntentFlags);
-
-		var style = new AndroidX.Media.App.NotificationCompat.MediaStyle();
-		style.SetMediaSession(token);
-
-		if (Build.VERSION.SdkInt >= BuildVersionCodes.S)
-		{
-			style.SetShowActionsInCompactView(0, 1, 2, 3);
-		}
-
-		if (Build.VERSION.SdkInt < BuildVersionCodes.Tiramisu
-			&& notification is null)
-		{
-			notification = new NotificationCompat.Builder(Platform.AppContext, "1");
-			OnSetIntents();
-			await OnSetContent(mediaManagerIntent, cancellationToken).ConfigureAwait(false);
-		}
-
-		notification ??= new NotificationCompat.Builder(Platform.AppContext, "1");
-
-		notification.SetStyle(style);
-		notification.SetSmallIcon(_Microsoft.Android.Resource.Designer.Resource.Drawable.exo_styled_controls_audiotrack);
-		notification.SetAutoCancel(false);
-		notification.SetVisibility(NotificationCompat.VisibilityPublic);
-		mediaSession.SetExtras(intent.Extras);
-		mediaSession.SetPlaybackToLocal(AudioManager.AudioSessionIdGenerate);
-		mediaSession.SetSessionActivity(pendingIntent);
+		base.OnCreate();
+		StartForegroundServices();
+	}
 
-		if (Build.VERSION.SdkInt >= BuildVersionCodes.O && notificationManager is not null)
-		{
-			CreateNotificationChannel(notificationManager);
-		}
+	public override StartCommandResult OnStartCommand(Intent? intent, StartCommandFlags flags, int startId)
+		=> StartCommandResult.NotSticky;
 
-		if (OperatingSystem.IsAndroidVersionAtLeast(29))
-		{
-			StartForeground(1, notification.Build(), ForegroundService.TypeMediaPlayback);
-			return;
-		}
+	public override void OnTaskRemoved(Intent? rootIntent)
+	{
+		base.OnTaskRemoved(rootIntent);
+		taskRemovedEventManager.HandleEvent(this, EventArgs.Empty, nameof(TaskRemoved));
 
-		if (OperatingSystem.IsAndroidVersionAtLeast(26))
-		{
-			StartForeground(1, notification.Build());
-		}
+		playerNotificationManager?.SetPlayer(null);
+		NotificationManager?.CancelAll();
 	}
 
-	void OnReceiveUpdatesPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	public override void OnDestroy()
 	{
-		if (notification is null || string.IsNullOrEmpty(receiveUpdates?.Action))
-		{
-			return;
-		}
-		notification.ClearActions();
-		notification.AddAction(actionPrevious);
-		if (receiveUpdates.Action is ACTION_PLAY)
-		{
-			notification.AddAction(actionPause);
-		}
-		if (receiveUpdates.Action is ACTION_PAUSE)
+		base.OnDestroy();
+
+		playerNotificationManager?.SetPlayer(null);
+		NotificationManager?.CancelAll();
+		if (!OperatingSystem.IsAndroidVersionAtLeast(33))
 		{
-			notification.AddAction(actionPlay);
+			StopForeground(true);
 		}
-		notification.AddAction(actionNext);
-		notification.Build();
-	}
 
-	void OnSetupAudioServices()
-	{
-		audioManager = GetSystemService(Context.AudioService) as AudioManager;
-		ArgumentNullException.ThrowIfNull(audioManager);
-		audioManager.RequestAudioFocus(null, AndroidStream.Music, AudioFocus.Gain);
-		audioManager.SetParameters("Ducking=true");
-		audioManager.SetStreamVolume(AndroidStream.Music, audioManager.GetStreamVolume(AndroidStream.Music), 0);
+		StopSelf();
 	}
 
-	[Obsolete]
-	async Task OnSetContent(Intent mediaManagerIntent, CancellationToken cancellationToken)
+	public override void OnRebind(Intent? intent)
 	{
-		var albumArtUri = mediaManagerIntent.GetStringExtra("albumArtUri") ?? string.Empty;
-		var bitmap = await MediaManager.GetBitmapFromUrl(albumArtUri, cancellationToken).ConfigureAwait(false);
-		var title = mediaManagerIntent.GetStringExtra("title") ?? string.Empty;
-		var artist = mediaManagerIntent.GetStringExtra("artist") ?? string.Empty;
-		notification?.SetContentTitle(title);
-		notification?.SetContentText(artist);
-		notification?.SetLargeIcon(bitmap);
+		base.OnRebind(intent);
+		StartForegroundServices();
 	}
 
-	void OnSetIntents()
+	[MemberNotNull(nameof(NotificationManager), nameof(notification))]
+	public void UpdateNotifications(in MediaSession session, in PlatformMediaElement mediaElement)
 	{
-		var pause = new Intent(this, typeof(MediaControlsService));
-		pause.SetAction("MediaAction.pause");
-		var pPause = PendingIntent.GetService(this, 1, pause, pendingIntentFlags);
-		actionPause ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_pause, ACTION_PAUSE, pPause).Build();
-
-		var play = new Intent(this, typeof(MediaControlsService));
-		play.SetAction("MediaAction.play");
-		var pPlay = PendingIntent.GetService(this, 1, play, pendingIntentFlags);
-		actionPlay ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_play, ACTION_PLAY, pPlay).Build();
-
-		var previous = new Intent(this, typeof(MediaControlsService));
-		previous.SetAction("MediaAction.rewind");
-		var pPrevious = PendingIntent.GetService(this, 1, previous, pendingIntentFlags);
-		actionPrevious ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_rewind, ACTION_REWIND, pPrevious).Build();
+		ArgumentNullException.ThrowIfNull(notification);
+		ArgumentNullException.ThrowIfNull(NotificationManager);
 
-		var next = new Intent(this, typeof(MediaControlsService));
-		next.SetAction("MediaAction.fastForward");
-		var pNext = PendingIntent.GetService(this, 1, next, pendingIntentFlags);
-		actionNext ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_fastforward, ACTION_FASTFORWARD, pNext).Build();
-
-		notification?.AddAction(actionPrevious);
-		notification?.AddAction(actionPause);
-		notification?.AddAction(actionNext);
-	}
+		var style = new MediaStyleNotificationHelper.MediaStyle(session);
+		if (!OperatingSystem.IsAndroidVersionAtLeast(33))
+		{
+			SetLegacyNotifications(session, mediaElement);
+		}
 
-	public override void OnDestroy()
-	{
-		Platform.CurrentActivity?.StopService(new Intent(Platform.AppContext, typeof(MediaControlsService)));
-		base.OnDestroy();
+		notification.SetStyle(style);
+		NotificationManagerCompat.From(Platform.AppContext).Notify(1, notification.Build());
 	}
 
+	[MemberNotNull(nameof(playerNotificationManager))]
 	[Obsolete]
-	static void BroadcastUpdate(string receiver, string action)
+	public void SetLegacyNotifications(in MediaSession session, in PlatformMediaElement mediaElement)
 	{
-		if (Build.VERSION.SdkInt >= BuildVersionCodes.Tiramisu)
-		{
-			return;
-		}
-		var intent = new Intent(receiver);
-		intent.PutExtra("ACTION", action);
-		LocalBroadcastManager.GetInstance(Platform.AppContext).SendBroadcast(intent);
+		ArgumentNullException.ThrowIfNull(session);
+		playerNotificationManager ??= new PlayerNotificationManager.Builder(Platform.AppContext, 1, "1").Build()
+									  ?? throw new InvalidOperationException("PlayerNotificationManager cannot be null");
+
+		playerNotificationManager.SetUseFastForwardAction(true);
+		playerNotificationManager.SetUseFastForwardActionInCompactView(true);
+		playerNotificationManager.SetUseRewindAction(true);
+		playerNotificationManager.SetUseRewindActionInCompactView(true);
+		playerNotificationManager.SetUseNextAction(true);
+		playerNotificationManager.SetUseNextActionInCompactView(true);
+		playerNotificationManager.SetUsePlayPauseActions(true);
+		playerNotificationManager.SetUsePreviousAction(true);
+		playerNotificationManager.SetColor(Resource.Color.abc_primary_text_material_dark);
+		playerNotificationManager.SetUsePreviousActionInCompactView(true);
+		playerNotificationManager.SetVisibility(NotificationCompat.VisibilityPublic);
+		playerNotificationManager.SetMediaSessionToken(session.SessionCompatToken);
+		playerNotificationManager.SetPlayer(mediaElement);
+		playerNotificationManager.SetColorized(true);
+		playerNotificationManager.SetShowPlayButtonIfPlaybackIsSuppressed(true);
+		playerNotificationManager.SetSmallIcon(Resource.Drawable.media3_notification_small_icon);
+		playerNotificationManager.SetPriority(NotificationCompat.PriorityDefault);
+		playerNotificationManager.SetUseChronometer(true);
 	}
 
-	[Obsolete]
 	protected override void Dispose(bool disposing)
 	{
 		if (!isDisposed)
 		{
 			if (disposing)
 			{
-				safeHandle?.Dispose();
-				safeHandle = null;
-			}
-			audioManager?.AbandonAudioFocus(null);
-			audioManager?.SetParameters("Ducking=false");
-			audioManager?.Dispose();
-			mediaSession?.Release();
-			mediaSession?.Dispose();
-			mediaSession = null;
+				NotificationManager?.Dispose();
+				NotificationManager = null;
 
-			if (receiveUpdates is not null)
-			{
-				receiveUpdates.PropertyChanged -= OnReceiveUpdatesPropertyChanged;
-				LocalBroadcastManager.GetInstance(Platform.AppContext).UnregisterReceiver(receiveUpdates);
+				playerNotificationManager?.Dispose();
+				playerNotificationManager = null;
+
+				if (!OperatingSystem.IsAndroidVersionAtLeast(33))
+				{
+					StopForeground(true);
+				}
+
+				StopSelf();
 			}
-			receiveUpdates?.Dispose();
-			receiveUpdates = null;
+
 			isDisposed = true;
 		}
+
 		base.Dispose(disposing);
 	}
-}
-
-/// <summary>
-/// A <see cref="BroadcastReceiver"/> that listens for updates from the <see cref="MediaManager"/>. 
-/// </summary>
-sealed class ReceiveUpdates : BroadcastReceiver
-{
-	readonly WeakEventManager propertyChangedEventManager = new();
 
-	public string Action = string.Empty;
-
-	public event PropertyChangedEventHandler PropertyChanged
+	static void CreateNotificationChannel(in NotificationManager notificationMnaManager)
 	{
-		add => propertyChangedEventManager.AddEventHandler(value);
-		remove => propertyChangedEventManager.RemoveEventHandler(value);
+		var channel = new NotificationChannel("1", "1", NotificationImportance.Low);
+		notificationMnaManager.CreateNotificationChannel(channel);
 	}
 
-	/// <summary>
-	/// Method that is called when a broadcast is received.
-	/// </summary>
-	/// <param name="context"></param>
-	/// <param name="intent"></param>
-	public override void OnReceive(Context? context, Intent? intent)
+	[MemberNotNull(nameof(notification), nameof(NotificationManager))]
+	void StartForegroundServices()
 	{
-		ArgumentNullException.ThrowIfNull(intent);
-		ArgumentNullException.ThrowIfNull(intent.Action);
-		Action = intent.GetStringExtra("ACTION") ?? string.Empty;
-		propertyChangedEventManager.HandleEvent(this, new PropertyChangedEventArgs(nameof(Action)), nameof(PropertyChanged));
+		NotificationManager ??= GetSystemService(NotificationService) as NotificationManager ?? throw new InvalidOperationException($"{nameof(NotificationManager)} cannot be null");
+		notification ??= new NotificationCompat.Builder(Platform.AppContext, "1");
+
+		notification.SetSmallIcon(Resource.Drawable.media3_notification_small_icon);
+		notification.SetAutoCancel(false);
+		notification.SetForegroundServiceBehavior(NotificationCompat.ForegroundServiceImmediate);
+		notification.SetVisibility(NotificationCompat.VisibilityPublic);
+
+		CreateNotificationChannel(NotificationManager);
+
+		if (OperatingSystem.IsAndroidVersionAtLeast(29))
+		{
+			StartForeground(1, notification.Build(), ForegroundService.TypeMediaPlayback);
+		}
+		else
+		{
+			StartForeground(1, notification.Build());
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs b/src/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs
new file mode 100644
index 0000000000..6e538d8e71
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs
@@ -0,0 +1,136 @@
+namespace CommunityToolkit.Maui.Media.Services;
+
+/// <summary>
+/// Extension methods for System.Threading.Tasks.Task and System.Threading.Tasks.ValueTask
+/// </summary> 
+static partial class SafeFireAndForgetExtensions
+{
+	/// <summary>
+	/// Safely execute the ValueTask without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">ValueTask.</param>
+	/// <param name="onException">If an exception is thrown in the ValueTask, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	public static void SafeFireAndForget(this ValueTask task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false) => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+	/// <summary>
+	/// Safely execute the ValueTask without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">ValueTask.</param>
+	/// <param name="onException">If an exception is thrown in the ValueTask, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	/// <typeparam name="T">The return value of the ValueTask.</typeparam>
+	public static void SafeFireAndForget<T>(this ValueTask<T> task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false) => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+	/// <summary>
+	/// Safely execute the ValueTask without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">ValueTask.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
+	public static void SafeFireAndForget<TException>(this ValueTask task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+	/// <summary>
+	/// Safely execute the ValueTask without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">ValueTask.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	/// <typeparam name="T">The return value of the ValueTask.</typeparam>
+	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
+	public static void SafeFireAndForget<T, TException>(this ValueTask<T> task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+#if NET8_0_OR_GREATER
+	/// <summary>
+	/// Safely execute the Task without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">Task.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="configureAwaitOptions">Options to control behavior when awaiting</param>
+	public static void SafeFireAndForget(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<Exception>? onException = null) => HandleSafeFireAndForget(task, configureAwaitOptions, onException);
+
+	/// <summary>
+	/// Safely execute the Task without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">Task.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="configureAwaitOptions">Options to control behavior when awaiting</param>
+	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
+	public static void SafeFireAndForget<TException>(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<TException>? onException = null) where TException : Exception => HandleSafeFireAndForget(task, configureAwaitOptions, onException);
+#endif
+
+	/// <summary>
+	/// Safely execute the Task without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">Task.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	public static void SafeFireAndForget(this Task task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false) => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+	/// <summary>
+	/// Safely execute the Task without waiting for it to complete before moving to the next line of code; commonly known as "Fire And Forget". Inspired by John Thiriet's blog post, "Removing Async Void": https://johnthiriet.com/removing-async-void/.
+	/// </summary>
+	/// <param name="task">Task.</param>
+	/// <param name="onException">If an exception is thrown in the Task, <c>onException</c> will execute. If onException is null, the exception will be re-thrown</param>
+	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
+	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
+	public static void SafeFireAndForget<TException>(this Task task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception => HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+
+	static async void HandleSafeFireAndForget<TException>(ValueTask valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
+	{
+		try
+		{
+			await valueTask.ConfigureAwait(continueOnCapturedContext);
+		}
+		catch (TException ex) when (onException is not null)
+		{
+			HandleException(ex, onException);
+		}
+	}
+
+	static async void HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
+	{
+		try
+		{
+			await valueTask.ConfigureAwait(continueOnCapturedContext);
+		}
+		catch (TException ex) when (onException is not null)
+		{
+			HandleException(ex, onException);
+		}
+	}
+
+	static async void HandleSafeFireAndForget<TException>(Task task,
+															bool continueOnCapturedContext,
+															Action<TException>? onException) where TException : Exception
+	{
+		try
+		{
+			await task.ConfigureAwait(continueOnCapturedContext);
+		}
+		catch (TException ex) when (onException is not null)
+		{
+			HandleException(ex, onException);
+		}
+	}
+
+#if NET8_0_OR_GREATER
+	static async void HandleSafeFireAndForget<TException>(Task task, ConfigureAwaitOptions configureAwaitOptions, Action<TException>? onException) where TException : Exception
+	{
+		try
+		{
+			await task.ConfigureAwait(configureAwaitOptions);
+		}
+		catch (TException ex) when (onException is not null)
+		{
+			HandleException(ex, onException);
+		}
+	}
+#endif
+
+	static void HandleException<TException>(in TException exception, in Action<TException>? onException) where TException : Exception
+	{
+		onException?.Invoke(exception);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
index 7462466eaf..6e6092fa4b 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
@@ -5,7 +5,7 @@
 using Android.Widget;
 using AndroidX.CoordinatorLayout.Widget;
 using AndroidX.Core.View;
-using Com.Google.Android.Exoplayer2.UI;
+using AndroidX.Media3.UI;
 using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Core.Views;
@@ -15,12 +15,12 @@ namespace CommunityToolkit.Maui.Core.Views;
 /// </summary>
 public class MauiMediaElement : CoordinatorLayout
 {
-	[Obsolete]
-	readonly StyledPlayerView playerView;
+	readonly RelativeLayout relativeLayout;
+	readonly PlayerView playerView;
+
 	int defaultSystemUiVisibility;
 	bool isSystemBarVisible;
 	bool isFullScreen;
-	readonly RelativeLayout relativeLayout;
 
 #pragma warning disable CS8618 // Non-nullable field is uninitialized. Consider declaring as nullable.
 #pragma warning disable IDE0060 // Remove unused parameter
@@ -35,15 +35,12 @@ public MauiMediaElement(nint ptr, JniHandleOwnership jni) : base(Platform.AppCon
 	/// Initializes a new instance of the <see cref="MauiMediaElement"/> class.
 	/// </summary>
 	/// <param name="context">The application's <see cref="Context"/>.</param>
-	/// <param name="playerView">The <see cref="StyledPlayerView"/> that acts as the platform media player.</param>
-	[Obsolete]
-	public MauiMediaElement(Context context, StyledPlayerView playerView) : base(context)
+	/// <param name="playerView">The <see cref="PlayerView"/> that acts as the platform media player.</param>
+	public MauiMediaElement(Context context, PlayerView playerView) : base(context)
 	{
 		this.playerView = playerView;
-
-		playerView.FullscreenButtonClick += OnFullscreenButtonClick;
 		this.playerView.SetBackgroundColor(Android.Graphics.Color.Black);
-
+		playerView.FullscreenButtonClick += OnFullscreenButtonClick;
 		var layout = new RelativeLayout.LayoutParams(LayoutParams.WrapContent, LayoutParams.WrapContent);
 		layout.AddRule(LayoutRules.CenterInParent);
 		layout.AddRule(LayoutRules.CenterVertical);
@@ -57,12 +54,11 @@ public MauiMediaElement(Context context, StyledPlayerView playerView) : base(con
 		AddView(relativeLayout);
 	}
 
-	[Obsolete]
 	public override void OnDetachedFromWindow()
 	{
 		if (isFullScreen)
 		{
-			OnFullscreenButtonClick(this, new StyledPlayerView.FullscreenButtonClickEventArgs(!isFullScreen));
+			OnFullscreenButtonClick(this, new PlayerView.FullscreenButtonClickEventArgs(!isFullScreen));
 		}
 		base.OnDetachedFromWindow();
 	}
@@ -92,6 +88,10 @@ protected override void Dispose(bool disposing)
 		{
 			try
 			{
+				if (playerView.Player is not null)
+				{
+					playerView.Player.PlayWhenReady = false;
+				}
 				// https://github.com/google/ExoPlayer/issues/1855#issuecomment-251041500
 				playerView.Player?.Release();
 				playerView.Player?.Dispose();
@@ -106,17 +106,17 @@ protected override void Dispose(bool disposing)
 		base.Dispose(disposing);
 	}
 
-	[Obsolete]
-	void OnFullscreenButtonClick(object? sender, StyledPlayerView.FullscreenButtonClickEventArgs e)
+	void OnFullscreenButtonClick(object? sender, PlayerView.FullscreenButtonClickEventArgs e)
 	{
 		// Ensure there is a player view
 		if (playerView is null)
 		{
-			throw new InvalidOperationException("PlayerView cannot be null when the FullScreen button is tapped");
+			throw new InvalidOperationException("UpdatedPlayerView cannot be null when the FullScreen button is tapped");
 		}
 		var layout = CurrentPlatformContext.CurrentWindow.DecorView as ViewGroup;
-
-		if (e.IsFullScreen)
+		// `p0` is the boolean value of isFullScreen being passed into the method. 
+		// This is a binding issue that will not be fixed as it is now part of shipped API.
+		if (e.P0)
 		{
 			isFullScreen = true;
 			RemoveView(relativeLayout);
@@ -221,18 +221,5 @@ public static Android.Views.Window CurrentWindow
 				return CurrentActivity.Window;
 			}
 		}
-
-		public static ViewGroup CurrentViewGroup
-		{
-			get
-			{
-				if (CurrentWindow.DecorView is not ViewGroup viewGroup)
-				{
-					throw new InvalidOperationException("DecorView cannot be null");
-				}
-
-				return viewGroup;
-			}
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs
index b07d6c9ab7..e34ef498cb 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs
@@ -1,98 +1,55 @@
 using System.Diagnostics.CodeAnalysis;
 using Android.Content;
-using Android.Graphics;
-using Android.Graphics.Drawables;
-using Android.OS;
-using Android.Support.V4.Media;
-using Android.Support.V4.Media.Session;
 using Android.Views;
 using Android.Widget;
-using AndroidX.LocalBroadcastManager.Content;
-using Com.Google.Android.Exoplayer2;
-using Com.Google.Android.Exoplayer2.Audio;
-using Com.Google.Android.Exoplayer2.Ext.Mediasession;
-using Com.Google.Android.Exoplayer2.Metadata;
-using Com.Google.Android.Exoplayer2.Text;
-using Com.Google.Android.Exoplayer2.Trackselection;
-using Com.Google.Android.Exoplayer2.UI;
-using Com.Google.Android.Exoplayer2.Video;
-using CommunityToolkit.Maui.ApplicationModel.Permissions;
+using AndroidX.Media3.Common;
+using AndroidX.Media3.Common.Text;
+using AndroidX.Media3.Common.Util;
+using AndroidX.Media3.ExoPlayer;
+using AndroidX.Media3.Session;
+using AndroidX.Media3.UI;
 using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Media.Services;
+using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.Views;
 using Microsoft.Extensions.Logging;
+using AudioAttributes = AndroidX.Media3.Common.AudioAttributes;
+using DeviceInfo = AndroidX.Media3.Common.DeviceInfo;
+using MediaMetadata = AndroidX.Media3.Common.MediaMetadata;
 
 namespace CommunityToolkit.Maui.Core.Views;
 
-[Obsolete]
-public partial class MediaManager : Java.Lang.Object, IPlayer.IListener
+public partial class MediaManager : Java.Lang.Object, IPlayerListener
 {
-	static readonly HttpClient client = new();
+	const int bufferState = 2;
+	const int readyState = 3;
+	const int endedState = 4;
 
+	static readonly HttpClient client = new();
 	readonly SemaphoreSlim seekToSemaphoreSlim = new(1, 1);
 
-	Task? checkPermissionsTask;
-	CancellationTokenSource checkPermissionSourceToken = new();
-	CancellationTokenSource startServiceSourceToken = new();
 	double? previousSpeed;
 	float volumeBeforeMute = 1;
-	MediaControllerCompat? mediaControllerCompat;
+
 	TaskCompletionSource? seekToTaskCompletionSource;
-	[Obsolete]
-	MediaSessionConnector? mediaSessionConnector;
-	MediaSessionCompat? mediaSession;
-	UIUpdateReceiver? uiUpdateReceiver;
-	MediaElementState currentState;
+	CancellationTokenSource? cancellationTokenSource;
+	MediaSession? session;
+	MediaItem.Builder? mediaItem;
+	BoundServiceConnection? connection;
 
 	/// <summary>
 	/// The platform native counterpart of <see cref="MediaElement"/>.
 	/// </summary>
-	[Obsolete]
-	protected StyledPlayerView? PlayerView { get; set; }
-
-	/// <summary>
-	/// Retrieves bitmap for the given url
-	/// </summary>
-	/// <param name="url"></param>
-	/// <param name="cancellationToken"></param>
-	/// <returns></returns>
-	/// <exception cref="InvalidOperationException"></exception>
-	public static async Task<Bitmap?> GetBitmapFromUrl(string? url, CancellationToken cancellationToken = default)
-	{
-		var bitmapConfig = Bitmap.Config.Argb8888 ?? throw new InvalidOperationException("Bitmap config cannot be null");
-		var bitmap = Bitmap.CreateBitmap(1024, 768, bitmapConfig, true);
-
-		Canvas canvas = new();
-		canvas.SetBitmap(bitmap);
-		canvas.DrawColor(Android.Graphics.Color.White);
-		canvas.Save();
-
-		try
-		{
-			var response = await client.GetAsync(url, cancellationToken).ConfigureAwait(false);
-			var stream = response.IsSuccessStatusCode ? await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false) : null;
-
-			return stream switch
-			{
-				null => bitmap,
-				_ => await BitmapFactory.DecodeStreamAsync(stream)
-			};
-		}
-		catch
-		{
-			return bitmap;
-		}
-	}
+	protected PlayerView? PlayerView { get; set; }
 
 	/// <summary>
 	/// Occurs when ExoPlayer changes the playback parameters.
 	/// </summary>
 	/// <paramref name="playbackParameters">Object containing the new playback parameter values.</paramref>
 	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
+	/// This is part of the <see cref="IPlayerListener"/> implementation.
 	/// While this method does not seem to have any references, it's invoked at runtime.
 	/// </remarks>
-	[Obsolete]
 	public void OnPlaybackParametersChanged(PlaybackParameters? playbackParameters)
 	{
 		if (playbackParameters is null || AreFloatingPointNumbersEqual(playbackParameters.Speed, MediaElement.Speed))
@@ -103,17 +60,30 @@ public void OnPlaybackParametersChanged(PlaybackParameters? playbackParameters)
 		MediaElement.Speed = playbackParameters.Speed;
 	}
 
+	public void UpdateNotifications()
+	{
+		if (connection?.Binder?.Service is null)
+		{
+			System.Diagnostics.Trace.TraceInformation("Notification Service not running.");
+			return;
+		}
+
+		if (session is not null && Player is not null)
+		{
+			connection.Binder.Service.UpdateNotifications(session, Player);
+		}
+	}
+
 	/// <summary>
 	/// Occurs when ExoPlayer changes the player state.
 	/// </summary>
 	/// <paramref name="playWhenReady">Indicates whether the player should start playing the media whenever the media is ready.</paramref>
 	/// <paramref name="playbackState">The state that the player has transitioned to.</paramref>
 	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
+	/// This is part of the <see cref="IPlayerListener"/> implementation.
 	/// While this method does not seem to have any references, it's invoked at runtime.
 	/// </remarks>
-	[Obsolete]
-	public async void OnPlayerStateChanged(bool playWhenReady, int playbackState)
+	public void OnPlayerStateChanged(bool playWhenReady, int playbackState)
 	{
 		if (Player is null || MediaElement.Source is null)
 		{
@@ -122,91 +92,61 @@ public async void OnPlayerStateChanged(bool playWhenReady, int playbackState)
 
 		var newState = playbackState switch
 		{
-			PlaybackStateCompat.StateFastForwarding
-				or PlaybackStateCompat.StateRewinding
-				or PlaybackStateCompat.StateSkippingToNext
-				or PlaybackStateCompat.StateSkippingToPrevious
-				or PlaybackStateCompat.StateSkippingToQueueItem
-				or PlaybackStateCompat.StatePlaying => playWhenReady
+			PlaybackState.StateFastForwarding
+				or PlaybackState.StateRewinding
+				or PlaybackState.StateSkippingToNext
+				or PlaybackState.StateSkippingToPrevious
+				or PlaybackState.StateSkippingToQueueItem
+				or PlaybackState.StatePlaying => playWhenReady
 					? MediaElementState.Playing
 					: MediaElementState.Paused,
 
-			PlaybackStateCompat.StatePaused => MediaElementState.Paused,
+			PlaybackState.StatePaused => MediaElementState.Paused,
 
-			PlaybackStateCompat.StateConnecting
-				or PlaybackStateCompat.StateBuffering => MediaElementState.Buffering,
+			PlaybackState.StateConnecting
+				or PlaybackState.StateBuffering => MediaElementState.Buffering,
 
-			PlaybackStateCompat.StateNone => MediaElementState.None,
-			PlaybackStateCompat.StateStopped => MediaElement.CurrentState is not MediaElementState.Failed
+			PlaybackState.StateNone => MediaElementState.None,
+			PlaybackState.StateStopped => MediaElement.CurrentState is not MediaElementState.Failed
 				? MediaElementState.Stopped
 				: MediaElementState.Failed,
 
-			PlaybackStateCompat.StateError => MediaElementState.Failed,
+			PlaybackState.StateError => MediaElementState.Failed,
 
 			_ => MediaElementState.None,
 		};
 
 		MediaElement.CurrentStateChanged(newState);
-
-		if (playbackState is IPlayer.StateReady)
+		if (playbackState is readyState)
 		{
 			MediaElement.Duration = TimeSpan.FromMilliseconds(Player.Duration < 0 ? 0 : Player.Duration);
 			MediaElement.Position = TimeSpan.FromMilliseconds(Player.CurrentPosition < 0 ? 0 : Player.CurrentPosition);
-			if (mediaSession is not null)
-			{
-				mediaSession.Active = true;
-			}
-
-			try
-			{
-				await StartService(startServiceSourceToken.Token);
-			}
-			catch (Exception e)
-			{
-				System.Diagnostics.Trace.WriteLine($"[error] {e}, {e.Message}");
-			}
 		}
-
-		if (MediaElement.CurrentState == currentState)
-		{
-			return;
-		}
-
-		currentState = MediaElement.CurrentState;
-
-		BroadcastUpdate(newState is MediaElementState.Playing
-			? MediaControlsService.ACTION_PLAY
-			: MediaControlsService.ACTION_PAUSE);
-
 	}
 
 	/// <summary>
 	/// Creates the corresponding platform view of <see cref="MediaElement"/> on Android.
 	/// </summary>
 	/// <returns>The platform native counterpart of <see cref="MediaElement"/>.</returns>
-	/// <exception cref="NullReferenceException">Thrown when <see cref="Android.Content.Context"/> is <see langword="null"/> or when the platform view could not be created.</exception>
-	[MemberNotNull(nameof(PlayerView))]
-	[MemberNotNull(nameof(uiUpdateReceiver))]
-	[MemberNotNull(nameof(checkPermissionsTask))]
-	[MemberNotNull(nameof(mediaSessionConnector))]
-	[MemberNotNull(nameof(mediaControllerCompat))]
-	[Obsolete]
-	public (PlatformMediaElement platformView, StyledPlayerView PlayerView) CreatePlatformView()
+	/// <exception cref="NullReferenceException">Thrown when <see cref="Context"/> is <see langword="null"/> or when the platform view could not be created.</exception>
+	[MemberNotNull(nameof(Player), nameof(PlayerView), nameof(session))]
+	public (PlatformMediaElement platformView, PlayerView PlayerView) CreatePlatformView()
 	{
-		ArgumentNullException.ThrowIfNull(MauiContext.Context);
-		Player = new IExoPlayer.Builder(MauiContext.Context).Build() ?? throw new NullReferenceException();
+		Player = new ExoPlayerBuilder(MauiContext.Context).Build() ?? throw new InvalidOperationException("Player cannot be null");
 		Player.AddListener(this);
-		InitializeMediaSession();
-
-		PlayerView = new StyledPlayerView(MauiContext.Context)
+		PlayerView = new PlayerView(MauiContext.Context)
 		{
 			Player = Player,
 			UseController = false,
 			ControllerAutoShow = false,
 			LayoutParameters = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.MatchParent)
 		};
+		string randomId = Convert.ToBase64String(Guid.NewGuid().ToByteArray())[..8];
+		var mediaSessionWRandomId = new MediaSession.Builder(Platform.AppContext, Player);
+		mediaSessionWRandomId.SetId(randomId);
+		session ??= mediaSessionWRandomId.Build() ?? throw new InvalidOperationException("Session cannot be null");
+		ArgumentNullException.ThrowIfNull(session.Id);
 
-		checkPermissionsTask = CheckAndRequestForegroundPermission(checkPermissionSourceToken.Token);
 		return (Player, PlayerView);
 	}
 
@@ -215,10 +155,9 @@ or PlaybackStateCompat.StateSkippingToQueueItem
 	/// </summary>
 	/// <paramref name="playbackState">The state that the player has transitioned to.</paramref>
 	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
+	/// This is part of the <see cref="IPlayerListener"/> implementation.
 	/// While this method does not seem to have any references, it's invoked at runtime.
 	/// </remarks>
-	[Obsolete]
 	public void OnPlaybackStateChanged(int playbackState)
 	{
 		if (MediaElement.Source is null)
@@ -227,17 +166,16 @@ public void OnPlaybackStateChanged(int playbackState)
 		}
 
 		MediaElementState newState = MediaElement.CurrentState;
-
 		switch (playbackState)
 		{
-			case IPlayer.StateBuffering:
+			case bufferState:
 				newState = MediaElementState.Buffering;
 				break;
-			case IPlayer.StateEnded:
+			case endedState:
 				newState = MediaElementState.Stopped;
 				MediaElement.MediaEnded();
 				break;
-			case IPlayer.StateReady:
+			case readyState:
 				seekToTaskCompletionSource?.TrySetResult();
 				break;
 		}
@@ -250,10 +188,9 @@ public void OnPlaybackStateChanged(int playbackState)
 	/// </summary>
 	/// <paramref name="error">An instance of <seealso cref="PlaybackException"/> containing details of the error.</paramref>
 	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
+	/// This is part of the <see cref="IPlayerListener"/> implementation.
 	/// While this method does not seem to have any references, it's invoked at runtime.
 	/// </remarks>
-	[Obsolete]
 	public void OnPlayerError(PlaybackException? error)
 	{
 		var errorMessage = string.Empty;
@@ -284,20 +221,13 @@ public void OnPlayerError(PlaybackException? error)
 
 		MediaElement.MediaFailed(new MediaFailedEventArgs(message));
 
-		Logger.LogError("{logMessage}", message);
+		Logger.LogError("{LogMessage}", message);
 	}
 
-	/// <summary>
-	/// Invoked when a seek operation has been processed.
-	/// </summary>
-	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
-	/// While this method does not seem to have any references, it's invoked at runtime.
-	/// </remarks>
-	public void OnSeekProcessed()
+	public void OnVideoSizeChanged(VideoSize? videoSize)
 	{
-		// Deprecated in ExoPlayer v2.12.0
-		// Use OnPlaybackStateChanged with STATE_READY instead: https://stackoverflow.com/a/65745607/5953643
+		MediaElement.MediaWidth = videoSize?.Width ?? 0;
+		MediaElement.MediaHeight = videoSize?.Height ?? 0;
 	}
 
 	/// <summary>
@@ -305,7 +235,7 @@ public void OnSeekProcessed()
 	/// </summary>
 	/// <param name="volume">The new value for volume.</param>
 	/// <remarks>
-	/// This is part of the <see cref="IPlayer.IListener"/> implementation.
+	/// This is part of the <see cref="IPlayerListener"/> implementation.
 	/// While this method does not seem to have any references, it's invoked at runtime.
 	/// </remarks>
 	public void OnVolumeChanged(float volume)
@@ -333,7 +263,6 @@ protected virtual partial void PlatformPlay()
 
 		Player.Prepare();
 		Player.Play();
-		BroadcastUpdate(MediaControlsService.ACTION_PLAY);
 	}
 
 	protected virtual partial void PlatformPause()
@@ -344,10 +273,9 @@ protected virtual partial void PlatformPause()
 		}
 
 		Player.Pause();
-		BroadcastUpdate(MediaControlsService.ACTION_PAUSE);
 	}
 
-	[Obsolete]
+	[MemberNotNull(nameof(Player))]
 	protected virtual async partial Task PlatformSeek(TimeSpan position, CancellationToken token)
 	{
 		if (Player is null)
@@ -358,7 +286,6 @@ protected virtual async partial Task PlatformSeek(TimeSpan position, Cancellatio
 		await seekToSemaphoreSlim.WaitAsync(token);
 
 		seekToTaskCompletionSource = new();
-
 		try
 		{
 			Player.SeekTo((long)position.TotalMilliseconds);
@@ -382,14 +309,12 @@ protected virtual partial void PlatformStop()
 			return;
 		}
 
-		// Stops and resets the media player
 		Player.SeekTo(0);
 		Player.Stop();
 		MediaElement.Position = TimeSpan.Zero;
 	}
 
-	[Obsolete]
-	protected virtual partial void PlatformUpdateSource()
+	protected virtual async partial ValueTask PlatformUpdateSource()
 	{
 		var hasSetSource = false;
 
@@ -398,10 +323,11 @@ protected virtual partial void PlatformUpdateSource()
 			return;
 		}
 
-		if (mediaSession is not null)
+		if (connection is null)
 		{
-			mediaSession.Active = false;
+			StartService();
 		}
+
 		if (MediaElement.Source is null)
 		{
 			Player.ClearMediaItems();
@@ -412,53 +338,26 @@ protected virtual partial void PlatformUpdateSource()
 		}
 
 		MediaElement.CurrentStateChanged(MediaElementState.Opening);
-
 		Player.PlayWhenReady = MediaElement.ShouldAutoPlay;
+		cancellationTokenSource ??= new();
+		// ConfigureAwait(true) is required to prevent crash on startup
+		var result = await SetPlayerData(cancellationTokenSource.Token).ConfigureAwait(true);
+		var item = result?.Build();
 
-		if (MediaElement.Source is UriMediaSource uriMediaSource)
-		{
-			var uri = uriMediaSource.Uri;
-			if (!string.IsNullOrWhiteSpace(uri?.AbsoluteUri))
-			{
-				Player.SetMediaItem(MediaItem.FromUri(uri.AbsoluteUri));
-				Player.Prepare();
-
-				hasSetSource = true;
-			}
-		}
-		else if (MediaElement.Source is FileMediaSource fileMediaSource)
-		{
-			var filePath = fileMediaSource.Path;
-			if (!string.IsNullOrWhiteSpace(filePath))
-			{
-				Player.SetMediaItem(MediaItem.FromUri(filePath));
-				Player.Prepare();
-
-				hasSetSource = true;
-			}
-		}
-		else if (MediaElement.Source is ResourceMediaSource resourceMediaSource)
+		if (item?.MediaMetadata is not null)
 		{
-			var package = PlayerView?.Context?.PackageName ?? "";
-			var path = resourceMediaSource.Path;
-			if (!string.IsNullOrWhiteSpace(path))
-			{
-				var assetFilePath = $"asset://{package}{System.IO.Path.PathSeparator}{path}";
-
-				Player.SetMediaItem(MediaItem.FromUri(assetFilePath));
-				Player.Prepare();
-
-				hasSetSource = true;
-			}
+			Player.SetMediaItem(item);
+			Player.Prepare();
+			hasSetSource = true;
 		}
 
 		if (hasSetSource && Player.PlayerError is null)
 		{
 			MediaElement.MediaOpened();
+			UpdateNotifications();
 		}
 	}
 
-	[Obsolete]
 	protected virtual partial void PlatformUpdateAspect()
 	{
 		if (PlayerView is null)
@@ -489,7 +388,7 @@ protected virtual partial void PlatformUpdateSpeed()
 		{
 			Player.SetPlaybackSpeed((float)MediaElement.Speed);
 
-			if (previousSpeed == 0)
+			if (previousSpeed is 0)
 			{
 				Player.Play();
 			}
@@ -561,8 +460,7 @@ protected virtual partial void PlatformUpdateShouldMute()
 			return;
 		}
 
-		// We're going to muted state, capture current volume first
-		// so we can restore later
+		// We're going to mute state. Capture current volume first so we can restore later.
 		if (MediaElement.ShouldMute)
 		{
 			volumeBeforeMute = Player.Volume;
@@ -575,7 +473,6 @@ protected virtual partial void PlatformUpdateShouldMute()
 		Player.Volume = MediaElement.ShouldMute ? 0 : volumeBeforeMute;
 	}
 
-	[Obsolete]
 	protected virtual partial void PlatformUpdateShouldLoopPlayback()
 	{
 		if (Player is null)
@@ -583,254 +480,157 @@ protected virtual partial void PlatformUpdateShouldLoopPlayback()
 			return;
 		}
 
-		Player.RepeatMode = MediaElement.ShouldLoopPlayback ? IPlayer.RepeatModeOne : IPlayer.RepeatModeOff;
+		Player.RepeatMode = MediaElement.ShouldLoopPlayback ? RepeatModeUtil.RepeatToggleModeOne : RepeatModeUtil.RepeatToggleModeNone;
 	}
 
-	[Obsolete]
 	protected override void Dispose(bool disposing)
 	{
 		base.Dispose(disposing);
 
 		if (disposing)
 		{
-			StopService();
+			session?.Release();
+			session?.Dispose();
+			session = null;
 
-			mediaSessionConnector?.SetPlayer(null);
-			mediaSessionConnector?.Dispose();
-			mediaSessionConnector = null;
+			cancellationTokenSource?.Dispose();
+			cancellationTokenSource = null;
 
-			mediaSession?.Release();
-			mediaSession?.Dispose();
-			mediaSession = null;
-
-			if (uiUpdateReceiver is not null)
+			if (connection is not null)
 			{
-				LocalBroadcastManager.GetInstance(Platform.AppContext).UnregisterReceiver(uiUpdateReceiver);
+				StopService(connection);
+				connection.Dispose();
+				connection = null;
 			}
 
-			uiUpdateReceiver?.Dispose();
-			uiUpdateReceiver = null;
-
-			checkPermissionSourceToken.Dispose();
-			startServiceSourceToken.Dispose();
-
 			client.Dispose();
 		}
 	}
 
-	static void StopService()
+	static async Task<byte[]> GetBytesFromMetadataArtworkUrl(string? url, CancellationToken cancellationToken = default)
 	{
-		var serviceIntent = new Intent(Platform.AppContext, typeof(MediaControlsService));
-		Android.App.Application.Context.StopService(serviceIntent);
-	}
+		byte[] artworkData = [];
+		try
+		{
+			var response = await client.GetAsync(url, cancellationToken).ConfigureAwait(false);
+			var stream = response.IsSuccessStatusCode ? await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false) : null;
 
-	static async Task CheckAndRequestForegroundPermission(CancellationToken cancellationToken = default)
-	{
-		var status = await Permissions.CheckStatusAsync<AndroidMediaPermissions>().WaitAsync(cancellationToken);
-		if (status is PermissionStatus.Granted)
+			if (stream is null)
+			{
+				return artworkData;
+			}
+
+			using var memoryStream = new MemoryStream();
+			await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+			var bytes = memoryStream.ToArray();
+			return bytes;
+		}
+		catch
 		{
-			return;
+			return artworkData;
 		}
-
-		await Permissions.RequestAsync<AndroidMediaPermissions>().WaitAsync(cancellationToken).ConfigureAwait(false);
 	}
 
-	[MemberNotNull(nameof(uiUpdateReceiver))]
-	[MemberNotNull(nameof(mediaSessionConnector))]
-	[MemberNotNull(nameof(mediaControllerCompat))]
-	[Obsolete]
-	void InitializeMediaSession()
+	[MemberNotNull(nameof(connection))]
+	void StartService()
 	{
-		ArgumentNullException.ThrowIfNull(Player);
-		mediaSession ??= new MediaSessionCompat(Platform.AppContext, "notification");
-		mediaSession.Active = true;
-
-		mediaSessionConnector ??= new MediaSessionConnector(mediaSession);
-		mediaSessionConnector.SetEnabledPlaybackActions(PlaybackStateCompat.ActionRewind | PlaybackStateCompat.ActionPlayPause | PlaybackStateCompat.ActionFastForward | PlaybackStateCompat.ActionSeekTo);
-		mediaSessionConnector.SetDispatchUnsupportedActionsEnabled(true);
-		mediaSessionConnector.SetPlayer(Player);
-
-		uiUpdateReceiver ??= new UIUpdateReceiver(Player);
-		LocalBroadcastManager.GetInstance(Platform.AppContext).RegisterReceiver(uiUpdateReceiver, new IntentFilter(MediaControlsService.ACTION_UPDATE_PLAYER));
-
-		ArgumentNullException.ThrowIfNull(mediaSessionConnector);
-		ArgumentNullException.ThrowIfNull(Platform.CurrentActivity);
-		ArgumentNullException.ThrowIfNull(mediaSession.SessionToken);
-
-		mediaControllerCompat ??= new MediaControllerCompat(Platform.CurrentActivity, mediaSession.SessionToken);
-		ArgumentNullException.ThrowIfNull(mediaControllerCompat);
-
-		var stateBuilder = new PlaybackStateCompat.Builder();
-		stateBuilder.SetActions(PlaybackStateCompat.ActionRewind | PlaybackStateCompat.ActionPlayPause | PlaybackStateCompat.ActionFastForward | PlaybackStateCompat.ActionSeekTo);
-		stateBuilder.SetState(PlaybackStateCompat.StateNone, 0, 1.0f, SystemClock.ElapsedRealtime());
-		mediaSession.SetPlaybackState(stateBuilder.Build());
-		mediaSession.SetFlags(MediaSessionCompat.FlagHandlesMediaButtons | MediaSessionCompat.FlagHandlesTransportControls);
+		var intent = new Intent(Android.App.Application.Context, typeof(MediaControlsService));
+		connection = new BoundServiceConnection(this);
+		connection.MediaControlsServiceTaskRemoved += HandleMediaControlsServiceTaskRemoved;
+
+		Android.App.Application.Context.StartForegroundService(intent);
+		Android.App.Application.Context.ApplicationContext?.BindService(intent, connection, Bind.AutoCreate);
 	}
 
-	[Obsolete]
-	async Task StartService(CancellationToken cancellationToken = default)
+	void StopService(in BoundServiceConnection boundServiceConnection)
 	{
-		if (checkPermissionsTask is not null)
-		{
-			await checkPermissionsTask.WaitAsync(cancellationToken);
-		}
-
-		ArgumentNullException.ThrowIfNull(PlayerView);
-		PlayerView.ArtworkDisplayMode = StyledPlayerView.ArtworkDisplayModeFit;
-		Android.Content.Context? context = Platform.AppContext;
-		Android.Content.Res.Resources? resources = context.Resources;
-
-		var bitmap = await GetBitmapFromUrl(MediaElement.MetadataArtworkUrl, cancellationToken);
-		PlayerView.DefaultArtwork = new BitmapDrawable(resources, bitmap);
+		boundServiceConnection.MediaControlsServiceTaskRemoved -= HandleMediaControlsServiceTaskRemoved;
 
-		var mediaMetadata = new MediaMetadataCompat.Builder();
-		mediaMetadata.PutString(MediaMetadataCompat.MetadataKeyArtist, MediaElement.MetadataArtist);
-		mediaMetadata.PutString(MediaMetadataCompat.MetadataKeyTitle, MediaElement.MetadataTitle);
-		mediaMetadata.PutBitmap(MediaMetadataCompat.MetadataKeyAlbumArt, bitmap);
-		mediaMetadata.PutLong(MediaMetadataCompat.MetadataKeyDuration, Player?.Duration ?? 0);
-		mediaMetadata.Build();
+		var serviceIntent = new Intent(Platform.AppContext, typeof(MediaControlsService));
+		Android.App.Application.Context.StopService(serviceIntent);
+		Platform.AppContext.UnbindService(boundServiceConnection);
+	}
 
-		mediaSession?.SetMetadata(mediaMetadata.Build());
-		var intent = new Intent(Android.App.Application.Context, typeof(MediaControlsService));
+	void HandleMediaControlsServiceTaskRemoved(object? sender, EventArgs e) => Player?.Stop();
 
-		if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+	async Task<MediaItem.Builder?> SetPlayerData(CancellationToken cancellationToken = default)
+	{
+		if (MediaElement.Source is null)
 		{
-			intent.PutExtra("title", MediaElement.MetadataTitle);
-			intent.PutExtra("artist", MediaElement.MetadataArtist);
-			intent.PutExtra("albumArtUri", MediaElement.MetadataArtworkUrl);
-			intent.PutExtra("position", ((long)MediaElement.Position.TotalSeconds));
-			intent.PutExtra("currentTime", SystemClock.ElapsedRealtime());
-			intent.PutExtra("duration", ((long)MediaElement.Duration.TotalSeconds));
+			return null;
 		}
 
-		intent.PutExtra("token", mediaSession?.SessionToken);
-		if (OperatingSystem.IsAndroidVersionAtLeast(26))
+		switch (MediaElement.Source)
 		{
-			Android.App.Application.Context.StartForegroundService(intent);
-		}
-		else
-		{
-			Android.App.Application.Context.StartService(intent);
-		}
-	}
+			case UriMediaSource uriMediaSource:
+				{
+					var uri = uriMediaSource.Uri;
+					if (!string.IsNullOrWhiteSpace(uri?.AbsoluteUri))
+					{
+						return await CreateMediaItem(uri.AbsoluteUri, cancellationToken).ConfigureAwait(false);
+					}
 
-	[Obsolete]
-	void BroadcastUpdate(string action)
-	{
-		if (Build.VERSION.SdkInt >= BuildVersionCodes.Tiramisu)
-		{
-			return;
+					break;
+				}
+			case FileMediaSource fileMediaSource:
+				{
+					var filePath = fileMediaSource.Path;
+					if (!string.IsNullOrWhiteSpace(filePath))
+					{
+						return await CreateMediaItem(filePath, cancellationToken).ConfigureAwait(false);
+					}
+
+					break;
+				}
+			case ResourceMediaSource resourceMediaSource:
+				{
+					var package = PlayerView?.Context?.PackageName ?? "";
+					var path = resourceMediaSource.Path;
+					if (!string.IsNullOrWhiteSpace(path))
+					{
+						var assetFilePath = $"asset://{package}{Path.PathSeparator}{path}";
+						return await CreateMediaItem(assetFilePath, cancellationToken).ConfigureAwait(false);
+					}
+
+					break;
+				}
+			default:
+				throw new NotSupportedException($"{MediaElement.Source.GetType().FullName} is not yet supported for {nameof(MediaElement.Source)}");
 		}
-		Intent intent = new(MediaControlsService.ACTION_UPDATE_UI);
-		intent.PutExtra("ACTION", action);
-		LocalBroadcastManager.GetInstance(Platform.AppContext).SendBroadcast(intent);
+
+		return mediaItem;
 	}
 
-	[Obsolete]
-	public void OnVideoSizeChanged(VideoSize? videoSize)
+	async Task<MediaItem.Builder> CreateMediaItem(string url, CancellationToken cancellationToken = default)
 	{
-		MediaElement.MediaWidth = videoSize?.Width ?? 0;
-		MediaElement.MediaHeight = videoSize?.Height ?? 0;
+		MediaMetadata.Builder mediaMetaData = new();
+		mediaMetaData.SetArtist(MediaElement.MetadataArtist);
+		mediaMetaData.SetTitle(MediaElement.MetadataTitle);
+		var data = await GetBytesFromMetadataArtworkUrl(MediaElement.MetadataArtworkUrl, cancellationToken).ConfigureAwait(true);
+		mediaMetaData.SetArtworkData(data, (Java.Lang.Integer)MediaMetadata.PictureTypeFrontCover);
+
+		mediaItem = new MediaItem.Builder();
+		mediaItem.SetUri(url);
+		mediaItem.SetMediaId(url);
+		mediaItem.SetMediaMetadata(mediaMetaData.Build());
+
+		return mediaItem;
 	}
 
-	#region IPlayer.IListener implementation method stubs
-
-	[Obsolete]
-	public void OnAudioAttributesChanged(AudioAttributes? audioAttributes) { }
-	public void OnAudioSessionIdChanged(int audioSessionId) { }
-
-	[Obsolete]
-	public void OnAvailableCommandsChanged(IPlayer.Commands? availableCommands) { }
-
-	[Obsolete]
-	public void OnCues(CueGroup? cueGroup) { }
-
-	[Obsolete]
-	public void OnCues(List<Cue> cues) { }
-
-	[Obsolete]
-	public void OnDeviceInfoChanged(Com.Google.Android.Exoplayer2.DeviceInfo? deviceInfo) { }
-	public void OnDeviceVolumeChanged(int volume, bool muted) { }
-
-	[Obsolete]
-	public void OnEvents(IPlayer? player, IPlayer.Events? events) { }
-	public void OnIsLoadingChanged(bool isLoading) { }
-	public void OnIsPlayingChanged(bool isPlaying) { }
-	public void OnLoadingChanged(bool isLoading) { }
-	public void OnMaxSeekToPreviousPositionChanged(long maxSeekToPreviousPositionMs) { }
-
-	[Obsolete]
-	public void OnMediaItemTransition(MediaItem? mediaItem, int transition) { }
-
-	[Obsolete]
-	public void OnMediaMetadataChanged(MediaMetadata? mediaMetadata) { }
-
-	[Obsolete]
-	public void OnMetadata(Metadata? metadata) { }
-	public void OnPlaybackSuppressionReasonChanged(int playbackSuppressionReason) { }
-
-	[Obsolete]
-	public void OnPlayerErrorChanged(PlaybackException? error) { }
-
-	[Obsolete]
-	public void OnPlaylistMetadataChanged(MediaMetadata? mediaMetadata) { }
-	public void OnPlayWhenReadyChanged(bool playWhenReady, int reason) { }
-	public void OnPositionDiscontinuity(int reason) { }
-
-	[Obsolete]
-	public void OnPositionDiscontinuity(IPlayer.PositionInfo oldPosition, IPlayer.PositionInfo newPosition, int reason) { }
-	public void OnRenderedFirstFrame() { }
-	public void OnRepeatModeChanged(int repeatMode) { }
-	public void OnSeekBackIncrementChanged(long seekBackIncrementMs) { }
-	public void OnSeekForwardIncrementChanged(long seekForwardIncrementMs) { }
-	public void OnShuffleModeEnabledChanged(bool shuffleModeEnabled) { }
-	public void OnSkipSilenceEnabledChanged(bool skipSilenceEnabled) { }
-	public void OnSurfaceSizeChanged(int width, int height) { }
-
-	[Obsolete]
-	public void OnTimelineChanged(Timeline? timeline, int reason) { }
-
-	[Obsolete]
-	public void OnTracksChanged(Tracks? tracks) { }
-
-	[Obsolete]
-	public void OnTrackSelectionParametersChanged(TrackSelectionParameters? trackSelectionParameters) { }
-
-	#endregion
-
-	/// <summary>
-	/// A <see cref="BroadcastReceiver"/> that listens for updates from the <see cref="MediaControlsService"/>.
-	/// </summary>
-	[Obsolete]
-	sealed class UIUpdateReceiver(IExoPlayer player) : BroadcastReceiver
+	static class PlaybackState
 	{
-		public override void OnReceive(Context? context, Intent? intent)
-		{
-			ArgumentNullException.ThrowIfNull(intent);
-			ArgumentNullException.ThrowIfNull(intent.Action);
-			ArgumentNullException.ThrowIfNull(player);
-
-			if (intent.Action is MediaControlsService.ACTION_UPDATE_PLAYER)
-			{
-				var action = intent.GetStringExtra("ACTION") ?? string.Empty;
-				switch (action)
-				{
-					case MediaControlsService.ACTION_PLAY:
-						player.Play();
-						break;
-					case MediaControlsService.ACTION_PAUSE:
-						player.Pause();
-						break;
-					case MediaControlsService.ACTION_FASTFORWARD:
-						player.SeekTo(player.CurrentPosition + 30_000);
-						player.Play();
-						break;
-					case MediaControlsService.ACTION_REWIND:
-						player.SeekTo(player.CurrentPosition - 10_000);
-						player.Play();
-						break;
-				}
-			}
-		}
+		public const int StateBuffering = 6;
+		public const int StateConnecting = 8;
+		public const int StateFailed = 7;
+		public const int StateFastForwarding = 4;
+		public const int StateNone = 0;
+		public const int StatePaused = 2;
+		public const int StatePlaying = 3;
+		public const int StateRewinding = 5;
+		public const int StateSkippingToNext = 10;
+		public const int StateSkippingToPrevious = 9;
+		public const int StateSkippingToQueueItem = 11;
+		public const int StateStopped = 1;
+		public const int StateError = 7;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
index 28796829da..0029bef199 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
@@ -216,20 +216,19 @@ protected virtual partial void PlatformUpdateAspect()
 		};
 	}
 
-	[Obsolete]
-	protected virtual partial void PlatformUpdateSource()
+	protected virtual partial ValueTask PlatformUpdateSource()
 	{
 		MediaElement.CurrentStateChanged(MediaElementState.Opening);
 
 		AVAsset? asset = null;
 		if (Player is null)
 		{
-			return;
+			return ValueTask.CompletedTask;
 		}
 
 		metaData ??= new(Player);
 		Metadata.ClearNowPlaying();
-		PlayerViewController?.ContentOverlayView?.Subviews?.FirstOrDefault()?.RemoveFromSuperview();
+		PlayerViewController?.ContentOverlayView?.Subviews.FirstOrDefault()?.RemoveFromSuperview();
 
 		if (MediaElement.Source is UriMediaSource uriMediaSource)
 		{
@@ -312,10 +311,12 @@ protected virtual partial void PlatformUpdateSource()
 
 			MediaElement.CurrentStateChanged(MediaElementState.None);
 		}
+
+		return ValueTask.CompletedTask;
 	}
+
 	void SetPoster()
 	{
-
 		if (PlayerItem is null || metaData is null)
 		{
 			return;
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.shared.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.shared.cs
index 7aac7b2138..195537fb62 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.shared.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.shared.cs
@@ -1,7 +1,7 @@
 #if !(ANDROID || IOS || WINDOWS || MACCATALYST || TIZEN)
 global using PlatformMediaElement = System.Object;
 #elif ANDROID
-global using PlatformMediaElement = Com.Google.Android.Exoplayer2.IExoPlayer;
+global using PlatformMediaElement = AndroidX.Media3.ExoPlayer.IExoPlayer;
 #elif IOS || MACCATALYST
 global using PlatformMediaElement = AVFoundation.AVPlayer;
 #elif WINDOWS
@@ -63,7 +63,6 @@ public MediaManager(IMauiContext context, IMediaElement mediaElement, IDispatche
 	/// <summary>
 	/// The platform-specific media player.
 	/// </summary>
-	[Obsolete]
 	protected PlatformMediaElement? Player { get; set; }
 #endif
 
@@ -121,10 +120,7 @@ public void UpdateAspect()
 	/// <summary>
 	/// Update the media source.
 	/// </summary>
-	public void UpdateSource()
-	{
-		PlatformUpdateSource();
-	}
+	public ValueTask UpdateSource() => PlatformUpdateSource();
 
 	/// <summary>
 	/// Update the media playback speed.
@@ -151,7 +147,7 @@ public void UpdateShouldMute()
 	}
 
 	/// <summary>
-	/// Update whether or not the media should start playing from the beginning
+	/// Update whether the media should start playing from the beginning
 	/// when it reached the end.
 	/// </summary>
 	public void UpdateShouldLoopPlayback()
@@ -213,7 +209,7 @@ public void UpdateVolume()
 	/// <summary>
 	/// Invokes the platform functionality to update the media source.
 	/// </summary>
-	protected virtual partial void PlatformUpdateSource();
+	protected virtual partial ValueTask PlatformUpdateSource();
 
 	/// <summary>
 	/// Invokes the platform functionality to update the media playback speed.
@@ -264,7 +260,7 @@ protected virtual partial void PlatformPlay() { }
 	protected virtual partial void PlatformPause() { }
 	protected virtual partial void PlatformStop() { }
 	protected virtual partial void PlatformUpdateAspect() { }
-	protected virtual partial void PlatformUpdateSource() { }
+	protected virtual partial ValueTask PlatformUpdateSource() => ValueTask.CompletedTask;
 	protected virtual partial void PlatformUpdateSpeed() { }
 	protected virtual partial void PlatformUpdateShouldShowPlaybackControls() { }
 	protected virtual partial void PlatformUpdatePosition() { }
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
index c0adb19ab4..5182bf0971 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
@@ -133,11 +133,11 @@ protected virtual partial void PlatformUpdateAspect()
 		};
 	}
 
-	protected virtual partial void PlatformUpdateSource()
+	protected virtual partial ValueTask PlatformUpdateSource()
 	{
 		if (Player is null)
 		{
-			return;
+			return ValueTask.CompletedTask;
 		}
 
 		if (Player.State is not PlayerState.Idle)
@@ -153,7 +153,8 @@ protected virtual partial void PlatformUpdateSource()
 			MediaElement.MediaWidth = MediaElement.MediaHeight = 0;
 
 			MediaElement.CurrentStateChanged(MediaElementState.None);
-			return;
+			
+			return ValueTask.CompletedTask;
 		}
 
 		MediaElement.CurrentStateChanged(MediaElementState.Opening);
@@ -191,6 +192,8 @@ protected virtual partial void PlatformUpdateSource()
 			PreparePlayer();
 			MediaElement.MediaOpened();
 		}
+
+		return ValueTask.CompletedTask;
 	}
 
 	protected virtual partial void PlatformUpdateSpeed()
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
index aa63f85a37..485314cec3 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
@@ -258,13 +258,15 @@ protected virtual partial void PlatformUpdateShouldMute()
 		Player.MediaPlayer.IsMuted = MediaElement.ShouldMute;
 	}
 
-	protected virtual async partial void PlatformUpdateSource()
+	protected virtual async partial ValueTask PlatformUpdateSource()
 	{
 		if (Player is null)
 		{
 			return;
 		}
-		Dispatcher.Dispatch(() => Player.PosterSource = new BitmapImage());
+
+		await Dispatcher.DispatchAsync(() => Player.PosterSource = new BitmapImage());
+
 		if (MediaElement.Source is null)
 		{
 			Player.Source = null;

From ffec96ae0e2ca36daffc57fdd164f02250208109 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:39:11 -0800
Subject: [PATCH 19/39] `dotnet format`

---
 .../Essentials/OfflineSpeechToTextViewModel.cs         | 10 +++++-----
 .../SpeechToText/SpeechToTextImplementation.windows.cs |  2 +-
 .../DrawingView/Service/DrawingViewService.windows.cs  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
index e4d2b90f4d..e02718a8cc 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
@@ -10,11 +10,6 @@ public partial class OfflineSpeechToTextViewModel : BaseViewModel
 {
 	readonly ISpeechToText speechToText;
 
-	public SpeechToTextState? State => speechToText.CurrentState;
-
-	[ObservableProperty]
-	string? recognitionText = "Welcome to .NET MAUI Community Toolkit!";
-
 	public OfflineSpeechToTextViewModel()
 	{
 		// For demo purposes. You can resolve dependency from the DI container,
@@ -24,6 +19,11 @@ public OfflineSpeechToTextViewModel()
 		speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
 	}
 
+	public SpeechToTextState? State => speechToText.CurrentState;
+
+	[ObservableProperty]
+	public partial string? RecognitionText { get; set; } = "Welcome to .NET MAUI Community Toolkit!";
+
 	[RelayCommand]
 	async Task StartListen()
 	{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
index 694eae374b..26477c60ed 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
@@ -83,7 +83,7 @@ void ResultGenerated(SpeechContinuousRecognitionSession sender, SpeechContinuous
 	}
 
 	Task InternalStopListeningAsync(CancellationToken cancellationToken) => StopRecording(cancellationToken);
-	
+
 	async Task StopRecording(CancellationToken cancellationToken)
 	{
 		try
diff --git a/src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.windows.cs b/src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.windows.cs
index 3c17ce07de..560fe67eb5 100644
--- a/src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.windows.cs
@@ -133,7 +133,7 @@ static void DrawStrokes(CanvasDrawingSession session,
 	static CanvasRenderTarget? GetImageInternal(IList<IDrawingLine> lines, Size size, Paint? background, bool scale = false)
 	{
 		var points = lines.SelectMany(x => x.Points).ToList();
-		if(points.Count is 0)
+		if (points.Count is 0)
 		{
 			return null;
 		}

From e3c521b5c5a277bb729cfb306f23aeb8d3ac4175 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:08:21 -0800
Subject: [PATCH 20/39] Support Microsoft.Maui.Controls v9.0.30 and .NET SDK
 v9.0.102 (#2444)

* Increase `MauiPackageVersion`

* Remove `WindowsSdkPackageVersion`

* Update `TOOLKIT_NET_VERSION`
---
 Directory.Build.props                                           | 2 +-
 azure-pipelines.yml                                             | 2 +-
 global.json                                                     | 2 +-
 .../CommunityToolkit.Maui.Sample.csproj                         | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0c943b5fb4..1685894f51 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <NuGetAuditMode>all</NuGetAuditMode>
 
     <!-- MAUI Specific -->
-    <MauiPackageVersion>9.0.21</MauiPackageVersion>
+    <MauiPackageVersion>9.0.30</MauiPackageVersion>
     <NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d0b7e1583a..4bd5000e1f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ variables:
   NugetPackageVersionCamera: '$(CurrentSemanticVersion)'
   NugetPackageVersionMediaElement: '$(CurrentSemanticVersion)'
   NugetPackageVersionMaps: '$(CurrentSemanticVersion)'
-  TOOLKIT_NET_VERSION: '9.0.101'
+  TOOLKIT_NET_VERSION: '9.0.102'
   LATEST_NET_VERSION: '9.0.x'
   PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
   PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
diff --git a/global.json b/global.json
index 9455c4195b..13ac5fc149 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.101",
+    "version": "9.0.102",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }
diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index e42add8cf5..158731f022 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -29,7 +29,6 @@
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>-->
 
-    <WindowsSdkPackageVersion>10.0.19041.53</WindowsSdkPackageVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     
     <!-- Remove this NoWarn once XamlTypeInfo Generator (owned by .NET MAUI Engineering Team) implements a partial class-->

From 1935da58912e7c55acf789ab99e8154c90f4e3d0 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 15 Jan 2025 13:31:29 -0800
Subject: [PATCH 21/39] Add missing finalizer

---
 .../Views/MediaManager.tizen.cs                                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
index 5182bf0971..319e364e62 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.tizen.cs
@@ -36,6 +36,7 @@ public partial class MediaManager : IDisposable
 	public void Dispose()
 	{
 		Dispose(true);
+		GC.SuppressFinalize(this);
 	}
 
 	/// <summary>

From 9a11a1f148d56ff593a316dcec063d55d99834e1 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 10:17:19 -0800
Subject: [PATCH 22/39] [Housekeeping] Remove Null Forgiving Operator (#2446)

* Remove `!.`

* Update AppShell.xaml.cs
---
 samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs     | 8 +++++---
 .../Essentials/FileFolderDialog.tizen.cs                  | 7 ++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index 5010fa1b96..6177c52ef2 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -191,9 +191,11 @@ void SetupNavigationView()
 #if WINDOWS
 		Loaded += delegate
 		{
-			var navigationView = (Microsoft.UI.Xaml.Controls.NavigationView)flyout.Handler!.PlatformView!;
-			navigationView.IsPaneToggleButtonVisible = true;
-			navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.Auto;
+			if(flyout.Handler?.PlatformView is Microsoft.UI.Xaml.Controls.NavigationView navigationView)
+			{
+				navigationView.IsPaneToggleButtonVisible = true;
+				navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.Auto;
+			}
 		};
 #endif
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/FileFolderDialog.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/FileFolderDialog.tizen.cs
index 4bd1852ff7..940906a2fd 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/FileFolderDialog.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/FileFolderDialog.tizen.cs
@@ -336,7 +336,12 @@ void ProcessSelect(string selectedItem)
 		}
 		else if (isFileSelectionMode)
 		{
-			fileNameEntry!.Text = selectedItem;
+			if(fileNameEntry is null)
+			{
+				throw new InvalidOperationException($"{nameof(fileNameEntry)} cannot be null");
+			}
+
+			fileNameEntry.Text = selectedItem;
 		}
 	}
 

From bf60a955835a9a5a158d97a3adb24dd824f64f72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:01:46 -0800
Subject: [PATCH 23/39] Bump System.Formats.Asn1 from 9.0.0 to 9.0.1 in
 /samples (#2442)

Bumps [System.Formats.Asn1](https://github.com/dotnet/runtime) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.1)

---
updated-dependencies:
- dependency-name: System.Formats.Asn1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index 0051a0d06d..f85e0db347 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <!--Fix vulnerabilities-->
-    <PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
+    <PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
   </ItemGroup>
 
   <ItemGroup>

From 26a7f45e3541c47143218740602bc92dd6aa671e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:17:38 -0800
Subject: [PATCH 24/39] Bump FluentAssertions from 7.0.0 to 8.0.0 in /samples
 (#2441)

Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/fluentassertions/fluentassertions/releases)
- [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1)
- [Commits](https://github.com/fluentassertions/fluentassertions/compare/7.0.0...8.0.0)

---
updated-dependencies:
- dependency-name: FluentAssertions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index f85e0db347..da1623e571 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.0.0" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index 3bfe9b4720..c819ff3307 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.0.0" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

From 9f3403e3978e5b759c0c6febf8a7148e33cb897d Mon Sep 17 00:00:00 2001
From: Stephen Quan <squan@esri.com>
Date: Fri, 17 Jan 2025 06:37:08 +1100
Subject: [PATCH 25/39] Migrate to PEG parser. Introduce boolean operators and
 constants. (#2182)

* Migrate to PEG parser. Introduce boolean operators and constants.

* Update UnitTest. Added conditional sample.

* Improve null handling and added extra boolean/null unit tests

* Additional boolean tests

* Allow nulls if operator is ? : && || == !=

* __bool and MathToken record refactor

* First attempt to block null reference return

* Second attempt to block null reference return

* Addessed CS8603 possible null reference return issues

* Use correct C# property name pattern. Log invalid math expressions instead of raising exceptions.

* Null Forgiving Operator removed. Adjust null checks in MultiMathExpressionConverter and corresponding unit tests.

* Add more logical and/or unit tests. Add XAML friendly comparator operators.

* Improve unit test coverage on alternate operators.

* Improve null handling for logical operators && || and cover these cases in unit tests.

* Miscellaneous fixes for Copilot review

* Update to .NET 9

* Use Primary Constructor

* Remove redundant CodeAnalysis

* Update Regex naming

* Use Index Operator

* Update namings

* Refactor

* Revert naming, Use `in` + `IReadOnlyList<T>` to protect `MathExpression` inputs

---------

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 .../MultiMathExpressionConverterPage.xaml     | 125 ++--
 .../Primitives/MathOperator.shared.cs         |  38 +-
 .../MathExpressionConverterTests.cs           | 188 +++++-
 .../MathExpression.shared.cs                  | 537 ++++++++++++------
 .../MathExpressionConverter.shared.cs         |  11 +-
 .../MultiMathExpressionConverter.shared.cs    |  20 +-
 6 files changed, 649 insertions(+), 270 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/MultiMathExpressionConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/MultiMathExpressionConverterPage.xaml
index 3d5b64b484..63a6353420 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/MultiMathExpressionConverterPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/MultiMathExpressionConverterPage.xaml
@@ -15,63 +15,86 @@
         </ResourceDictionary>
     </pages:BasePage.Resources>
 
-    <Grid Padding="20"
-          RowSpacing="20"
-          ColumnSpacing="12"
-          ColumnDefinitions="*,*,*,*,*,*,*"
-          RowDefinitions="100, *">
-        <Label Grid.ColumnSpan="7"
-               Grid.Row="0"
-               Text="This sample demonstrates the use of the MultiMathExpressionConverter. It utilizes the converter to perform various math operations of multiple variables."/>
+    <VerticalStackLayout Padding="20" Spacing="40">
 
-        <Entry Grid.Column="0"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="{Binding X0}"/>
+        <Grid RowSpacing="20"
+              ColumnSpacing="12"
+              ColumnDefinitions="*,*,*,*,*,*,*"
+              RowDefinitions="100, *">
+            <Label Grid.ColumnSpan="7"
+                   Grid.Row="0"
+                   Text="This sample demonstrates the use of the MultiMathExpressionConverter. It utilizes the converter to perform various math operations of multiple variables."/>
 
-        <Label Grid.Column="1"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="+" />
+            <Entry Grid.Column="0"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="{Binding X0}"/>
 
-        <Entry Grid.Column="2"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="{Binding X1}"/>
+            <Label Grid.Column="1"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="+" />
 
-        <Label Grid.Column="3"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="+" />
+            <Entry Grid.Column="2"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="{Binding X1}"/>
 
-        <Entry Grid.Column="4"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="{Binding X2}"/>
+            <Label Grid.Column="3"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="+" />
 
-        <Label Grid.Column="5"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center"
-               Text="=" />
+            <Entry Grid.Column="4"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="{Binding X2}"/>
 
-        <Label Grid.Column="6"
-               Grid.Row="1"
-               VerticalTextAlignment="Center"
-               VerticalOptions="Center">
-             <Label.Text>
-                <MultiBinding Converter="{StaticResource MultiMathExpressionConverter}"
-                              ConverterParameter="x0 + x1 + x2">
-                    <Binding Path="X0" Mode="OneWay"/>
-                    <Binding Path="X1" Mode="OneWay"/>
-                    <Binding Path="X2" Mode="OneWay"/>
-                </MultiBinding>
-            </Label.Text>           
+            <Label Grid.Column="5"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center"
+                   Text="=" />
+
+            <Label Grid.Column="6"
+                   Grid.Row="1"
+                   VerticalTextAlignment="Center"
+                   VerticalOptions="Center">
+                 <Label.Text>
+                    <MultiBinding Converter="{StaticResource MultiMathExpressionConverter}"
+                                  ConverterParameter="x0 + x1 + x2">
+                        <Binding Path="X0" Mode="OneWay"/>
+                        <Binding Path="X1" Mode="OneWay"/>
+                        <Binding Path="X2" Mode="OneWay"/>
+                    </MultiBinding>
+                </Label.Text>           
+            </Label>
+        </Grid>
+
+        <Label HorizontalOptions="Center"
+               Text="Valid: Value greater than or equal to 60"
+               TextColor="Green">
+            <Label.Triggers>
+                <DataTrigger TargetType="Label" Value="False">
+                    <DataTrigger.Binding>
+                        <MultiBinding Converter="{StaticResource MultiMathExpressionConverter}"
+                                      ConverterParameter="x0 + x1 + x2 &gt;= 60">
+                            <Binding Path="X0" Mode="OneWay"/>
+                            <Binding Path="X1" Mode="OneWay"/>
+                            <Binding Path="X2" Mode="OneWay"/>
+                       </MultiBinding>
+                    </DataTrigger.Binding>
+                    <Setter Property="Text" Value="Error: Value not greater than or equal to 60"/>
+                    <Setter Property="TextColor" Value="Red"/>
+                </DataTrigger>
+            </Label.Triggers>
         </Label>
-    </Grid>
+
+    </VerticalStackLayout>
+
 </pages:BasePage>
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs b/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
index 22d0f1de97..f2989fe5d7 100644
--- a/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
@@ -14,7 +14,7 @@ public enum MathOperatorPrecedence
 	/// <summary>High</summary>
 	High,
 	/// <summary>Constant</summary>
-	Constant,
+	Constant
 }
 
 /// <summary>
@@ -25,31 +25,25 @@ public enum MathOperatorPrecedence
 /// </remarks>
 /// <param name="name">Name</param>
 /// <param name="numericCount">Number of Numerals</param>
-/// <param name="precedence">Math Operator Preference</param>
 /// <param name="calculateFunc">Calculation Function</param>
 public sealed class MathOperator(
-	string name,
-	int numericCount,
-	MathOperatorPrecedence precedence,
-	Func<double[], double> calculateFunc)
+    string name,
+    int numericCount,
+    Func<object?[], object?> calculateFunc)
 {
-	/// <summary>
-	/// Name
-	/// </summary>
-	public string Name { get; } = name;
 
-	/// <summary>
-	/// Number of Numerals
-	/// </summary>
-	public int NumericCount { get; } = numericCount;
+    /// <summary>
+    /// Name
+    /// </summary>
+    public string Name { get; } = name;
 
-	/// <summary>
-	/// Math Operator Precedence
-	/// </summary>
-	public MathOperatorPrecedence Precedence { get; } = precedence;
+    /// <summary>
+    /// Number of Numerals
+    /// </summary>
+    public int NumericCount { get; } = numericCount;
 
-	/// <summary>
-	/// Calculation Function
-	/// </summary>
-	public Func<double[], double> CalculateFunc { get; } = calculateFunc;
+    /// <summary>
+    /// Calculation Function
+    /// </summary>
+    public Func<object?[], object?> CalculateFunc { get; } = calculateFunc;
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
index 771c9231ff..e46273ddb5 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
@@ -29,8 +29,33 @@ public void MathExpressionConverter_ReturnsCorrectResult(string expression, doub
 		var convertResult = ((ICommunityToolkitValueConverter)mathExpressionConverter).Convert(x, mathExpressionTargetType, expression, cultureInfo) ?? throw new NullReferenceException();
 		var convertFromResult = mathExpressionConverter.ConvertFrom(x, expression);
 
+		Assert.True(convertFromResult is not null);
 		Assert.True(Math.Abs((double)convertResult - expectedResult) < tolerance);
-		Assert.True(Math.Abs(convertFromResult - expectedResult) < tolerance);
+		Assert.True(Math.Abs((double)convertFromResult - expectedResult) < tolerance);
+	}
+
+	[Theory]
+	[InlineData("3 < x", 2d, false)]
+	[InlineData("x > 3", 2d, false)]
+	[InlineData("3 < x == x > 3", 2d, true)]
+	[InlineData("3 <= x != 3 >= x", 2d, true)]
+	[InlineData("x >= 1", 2d, true)]
+	[InlineData("x <= 3", 2d, true)]
+	[InlineData("x >= 1 && (x <= 3 || x >= 0)", 2d, true)]
+	[InlineData("true", 2d, true)]
+	[InlineData("false", 2d, false)]
+	[InlineData("-x > 2", 3d, false)]
+	[InlineData("!!! (---x > 2)", 3d, true)]
+	public void MathExpressionConverter_WithComparisonOperator_ReturnsCorrectBooleanResult(string expression, double x, bool expectedResult)
+	{
+		var mathExpressionConverter = new MathExpressionConverter();
+
+		var convertResult = ((ICommunityToolkitValueConverter)mathExpressionConverter).Convert(x, mathExpressionTargetType, expression, cultureInfo) ?? throw new NullReferenceException();
+		var convertFromResult = mathExpressionConverter.ConvertFrom(x, expression);
+
+		Assert.True(convertFromResult is not null);
+		Assert.True((bool)convertResult == expectedResult);
+		Assert.True((bool)convertFromResult == expectedResult);
 	}
 
 	[Theory]
@@ -38,31 +63,166 @@ public void MathExpressionConverter_ReturnsCorrectResult(string expression, doub
 	[InlineData("(x1 + x) * x1", new object[] { 2d, 3d }, 15d)]
 	[InlineData("3 + x * x1 / (1 - 5)^x1", new object[] { 4d, 2d }, 3.5d)]
 	[InlineData("3 + 4 * 2 + cos(100 + x) / (x1 - 5)^2 + pow(x0, 2)", new object[] { 20d, 1d }, 411.05088631065792d)]
-	public void MathExpressionConverter_WithMultiplyVariable_ReturnsCorrectResult(string expression, object[] variables, double expectedResult)
+	public void MathExpressionConverter_WithMultipleVariable_ReturnsCorrectResult(string expression, object[] values, double expectedResult)
 	{
 		var mathExpressionConverter = new MultiMathExpressionConverter();
 
-		var result = mathExpressionConverter.Convert(variables, mathExpressionTargetType, expression);
+		var result = mathExpressionConverter.Convert(values, mathExpressionTargetType, expression);
 
+		Assert.NotNull(result);
 		Assert.True(Math.Abs((double)result - expectedResult) < tolerance);
 	}
 
 	[Theory]
-	[InlineData("1 + 3 + 5 + (3 - 2))")]
-	[InlineData("1 + 2) + (9")]
-	[InlineData("100 + pow(2)")]
-	public void MathExpressionConverterThrowsArgumentException(string expression)
+	[InlineData("x && x1", new object?[] { true, true }, true)]
+	[InlineData("x && x1", new object?[] { true, false }, false)]
+	[InlineData("x && x1", new object?[] { false, true }, false)]
+	[InlineData("x && 3 == 4", new object?[] { false }, false)]
+	[InlineData("x && x1", new object?[] { "Cat", "Dog" }, "Dog")]
+	[InlineData("x && x1", new object?[] { false, "Cat" }, false)]
+	[InlineData("x && x1", new object?[] { "Cat", false }, false)]
+	[InlineData("x && x1", new object?[] { "", false }, "")]
+	[InlineData("x && x1", new object?[] { false, "" }, false)]
+	[InlineData("x && x1", new object?[] { null, "Cat" }, null)]
+	[InlineData("x && x1", new object?[] { "Cat", null }, null)]
+	[InlineData("x && x1", new object?[] { "", null }, "")]
+	[InlineData("x && x1", new object?[] { null, "" }, null)]
+	[InlineData("x || x1", new object?[] { true, true }, true)]
+	[InlineData("x || x1", new object?[] { false, true }, true)]
+	[InlineData("x || x1", new object?[] { true, false }, true)]
+	[InlineData("x || 3 == 4", new object?[] { false }, false)]
+	[InlineData("x || x1", new object?[] { "Cat", "Dog" }, "Cat")]
+	[InlineData("x || x1", new object?[] { false, "Cat" }, "Cat")]
+	[InlineData("x || x1", new object?[] { "Cat", false }, "Cat")]
+	[InlineData("x || x1", new object?[] { "", false }, false)]
+	[InlineData("x || x1", new object?[] { false, "" }, "")]
+	[InlineData("x || x1", new object?[] { null, "Cat" }, "Cat")]
+	[InlineData("x || x1", new object?[] { "Cat", null }, "Cat")]
+	[InlineData("x || x1", new object?[] { "", null }, null)]
+	[InlineData("x || x1", new object?[] { null, "" }, "")]
+	[InlineData("x || x1", new object?[] { false, new int[] { 1, 2, 3 } }, new int[] { 1, 2, 3 })]
+	public void MultiMathExpressionConverter_WithMultipleVariable_ReturnsCorrectLogicalResult(string expression, object?[] variables, object? expectedResult)
 	{
-		var mathExpressionConverter = new MathExpressionConverter();
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+		var result = mathExpressionConverter.Convert(variables, typeof(object), expression);
+		Assert.Equal(expectedResult, result);
+	}
+
+	[Theory]
+	[InlineData(true, true, true, true)]
+	[InlineData(true, false, false, true)]
+	[InlineData(false, true, false, true)]
+	[InlineData(false, false, false, false)]
+	[InlineData("Cat", "Dog", "Dog", "Cat")]
+	[InlineData(false, "Cat", false, "Cat")]
+	[InlineData("Cat", false, false, "Cat")]
+	[InlineData("", false, "", false)]
+	[InlineData(false, "", false, "")]
+	[InlineData(null, "Cat", null, "Cat")]
+	[InlineData("Cat", null, null, "Cat")]
+	[InlineData("", null, "", null)]
+	[InlineData(null, "", null, "")]
+	public void MultiMathExpressionConverter_WithAlternateLogicalOperators_ReturnsSameEvaluation(object? x, object? x1, object? expectedAndResult, object? expectedOrResult)
+	{
+		var variables = new object?[] { x, x1 };
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+		var andResult = mathExpressionConverter.Convert(variables, typeof(object), "x && x1");
+		var alternateAndResult = mathExpressionConverter.Convert(variables, typeof(object), "x and x1");
+		Assert.Equal(andResult, expectedAndResult);
+		Assert.Equal(alternateAndResult, expectedAndResult);
+		var orResult = mathExpressionConverter.Convert(variables, typeof(object), "x || x1");
+		var alternateOrResult = mathExpressionConverter.Convert(variables, typeof(object), "x or x1");
+		Assert.Equal(orResult, expectedOrResult);
+		Assert.Equal(alternateOrResult, expectedOrResult);
+	}
+
+	[Theory]
+	[InlineData("x >= x1", "x ge x1")]
+	[InlineData("x > x1", "x gt x1")]
+	[InlineData("x <= x1", "x le x1")]
+	[InlineData("x < x1", "x lt x1")]
+	public void MultiMathExpressionConverter_WithAlternateCompareOperators_ReturnsSameEvaluation(string expression, string alternateExpression)
+	{
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+		for (var i = 0; i <= 2; i++)
+		{
+			for (var j = 0; j <= 2; j++)
+			{
+				var variables = new object?[] { i, j };
+				var result = mathExpressionConverter.Convert(variables, typeof(object), expression);
+				var alternateResult = mathExpressionConverter.Convert(variables, typeof(object), alternateExpression);
+				Assert.NotNull(result);
+				Assert.NotNull(alternateResult);
+				Assert.Equal(result, alternateResult);
+			}
+		}
+	}
+
+	[Theory]
+	[InlineData("x == 3 && x1", new object?[] { 3d, 4d }, 4d)]
+	[InlineData("x != 3 || x1", new object?[] { 3d, 4d }, 4d)]
+	[InlineData("x + x1 || true", new object?[] { 3d, 4d }, 7d)]
+	[InlineData("x + x1 && false", new object?[] { 2d, -2d }, 0d)]
+	public void MathExpressionConverter_WithBooleanOperator_ReturnsCorrectNumberResult(string expression, object[] variables, double expectedResult)
+	{
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+
+		object? result = mathExpressionConverter.Convert(variables, mathExpressionTargetType, expression);
+
+		Assert.True(result is not null);
+		Assert.Equal(expectedResult, result);
+	}
+
+	[Theory]
+	[InlineData("x != 3 && x1", new object?[] { 3d, 4d }, false)]
+	[InlineData("x == 3 || x1", new object?[] { 3d, 4d }, true)]
+	public void MathExpressionConverter_WithBooleanOperator_ReturnsCorrectBooleanResult(string expression, object[] variables, bool expectedResult)
+	{
+		var mathExpressionConverter = new MultiMathExpressionConverter();
 
-		Assert.Throws<ArgumentException>(() => ((ICommunityToolkitValueConverter)mathExpressionConverter).Convert(0d, mathExpressionTargetType, expression, cultureInfo));
-		Assert.Throws<ArgumentException>(() => mathExpressionConverter.ConvertFrom(0d, expression));
+		object? result = mathExpressionConverter.Convert(variables, mathExpressionTargetType, expression);
+
+		Assert.True(result is not null);
+		Assert.Equal(expectedResult, result);
+	}
+
+	[Theory]
+	[InlineData("x == 3 && x1", new object?[] { 3d, null})]
+	[InlineData("x != 3 || x1", new object?[] { 3d, null })]
+	[InlineData("x == 3 ? x1 : x2", new object?[] { 3d, null, 5d })]
+	[InlineData("x != 3 ? x1 : x2", new object?[] { 3d, 4d, null})]
+	public void MathExpressionConverter_ReturnsCorrectNullResult(string expression, object[] variables)
+	{
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+
+		object? result = mathExpressionConverter.Convert(variables, mathExpressionTargetType, expression);
+
+		Assert.True(result is null);
+	}
+
+	[Theory]
+	[InlineData("x == x1", new object?[] { 2d, 2d }, true)]
+	[InlineData("x == x1", new object?[] { 2d, null }, false)]
+	[InlineData("x == x1", new object?[] { null, 2d}, false)]
+	[InlineData("x == x1", new object?[] { null, null }, true)]
+	[InlineData("(x ? x1 : x2) == null", new object?[] { true, null, 2d }, true)]
+	public void MathExpressionConverter_WithEqualityOperator_ReturnsCorrectBooleanResult(string expression, object[] variables, bool expectedResult)
+	{
+		var mathExpressionConverter = new MultiMathExpressionConverter();
+
+		object? result = mathExpressionConverter.Convert(variables, mathExpressionTargetType, expression);
+
+		Assert.True(result is not null);
+		Assert.Equal(expectedResult, result);
 	}
 
 	[Theory]
 	[InlineData(2.5)]
 	[InlineData('c')]
 	[InlineData(true)]
+	[InlineData("1 + 3 + 5 + (3 - 2))")]
+	[InlineData("1 + 2) + (9")]
+	[InlineData("100 + pow(2)")]
 	public void MultiMathExpressionConverterInvalidParameterThrowsArgumentException(object parameter)
 	{
 		var mathExpressionConverter = new MultiMathExpressionConverter();
@@ -74,7 +234,7 @@ public void MultiMathExpressionConverterInvalidParameterThrowsArgumentException(
 	public void MultiMathExpressionConverterInvalidValuesReturnsNull()
 	{
 		var mathExpressionConverter = new MultiMathExpressionConverter();
-		var result = mathExpressionConverter.Convert([0d, null], mathExpressionTargetType, "x", cultureInfo);
+		var result = mathExpressionConverter.Convert([0d, null], mathExpressionTargetType, "x + x1", cultureInfo);
 		result.Should().BeNull();
 	}
 
@@ -85,9 +245,9 @@ public void MathExpressionConverterNullInputTest()
 		Assert.Throws<ArgumentNullException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).Convert(0.0, null, "x", null));
 		Assert.Throws<ArgumentNullException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).ConvertBack(0.0, null, null, null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).Convert(null, typeof(bool), "x", null));
+		Assert.True(((ICommunityToolkitValueConverter)new MathExpressionConverter()).Convert(null, typeof(bool), "x", null) is null);
 		Assert.Throws<ArgumentNullException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).Convert(null, typeof(bool), null, null));
-		Assert.Throws<ArgumentNullException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).ConvertBack(null, typeof(bool), null, null));
+		Assert.Throws<NotSupportedException>(() => ((ICommunityToolkitValueConverter)new MathExpressionConverter()).ConvertBack(null, typeof(bool), null, null));
 	}
 
 	[Fact]
@@ -98,4 +258,4 @@ public void MultiMathExpressionConverterNullInputTest()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 		Assert.Throws<ArgumentNullException>(() => new MultiMathExpressionConverter().Convert([0.0, 7], typeof(bool), null, null));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
index 77223c0580..5c972e5f59 100644
--- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
@@ -1,95 +1,148 @@
-using System.Globalization;
+using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.Maui.Core;
 
 namespace CommunityToolkit.Maui.Converters;
 
-sealed partial class MathExpression
+enum MathTokenType
 {
-	const NumberStyles numberStyle = NumberStyles.Float | NumberStyles.AllowThousands;
+	Value,
+	Operator,
+}
 
-	static readonly IFormatProvider formatProvider = new CultureInfo("en-US");
+sealed record MathToken(MathTokenType Type, string Text, object? Value);
 
+sealed partial class MathExpression
+{
 	readonly IReadOnlyList<MathOperator> operators;
 
-	internal MathExpression(string expression, IEnumerable<double>? arguments = null)
+	internal MathExpression(in string expression, in IReadOnlyList<object?> arguments)
 	{
 		ArgumentException.ThrowIfNullOrEmpty(expression, "Expression can't be null or empty.");
-
-		var argumentList = arguments?.ToList() ?? [];
+		ArgumentNullException.ThrowIfNull(arguments, "Arguments cannot be null.");
 
 		Expression = expression.ToLower();
 
-		var operators = new List<MathOperator>
-		{
-			new ("+", 2, MathOperatorPrecedence.Low, x => x[0] + x[1]),
-			new ("-", 2, MathOperatorPrecedence.Low, x => x[0] - x[1]),
-			new ("*", 2, MathOperatorPrecedence.Medium, x => x[0] * x[1]),
-			new ("/", 2, MathOperatorPrecedence.Medium, x => x[0] / x[1]),
-			new ("%", 2, MathOperatorPrecedence.Medium, x => x[0] % x[1]),
-			new ("abs", 1, MathOperatorPrecedence.Medium, x => Math.Abs(x[0])),
-			new ("acos", 1, MathOperatorPrecedence.Medium, x => Math.Acos(x[0])),
-			new ("asin", 1, MathOperatorPrecedence.Medium, x => Math.Asin(x[0])),
-			new ("atan", 1, MathOperatorPrecedence.Medium, x => Math.Atan(x[0])),
-			new ("atan2", 2, MathOperatorPrecedence.Medium, x => Math.Atan2(x[0], x[1])),
-			new ("ceiling", 1, MathOperatorPrecedence.Medium, x => Math.Ceiling(x[0])),
-			new ("cos", 1, MathOperatorPrecedence.Medium, x => Math.Cos(x[0])),
-			new ("cosh", 1, MathOperatorPrecedence.Medium, x => Math.Cosh(x[0])),
-			new ("exp", 1, MathOperatorPrecedence.Medium, x => Math.Exp(x[0])),
-			new ("floor", 1, MathOperatorPrecedence.Medium, x => Math.Floor(x[0])),
-			new ("ieeeremainder", 2, MathOperatorPrecedence.Medium, x => Math.IEEERemainder(x[0], x[1])),
-			new ("log", 2, MathOperatorPrecedence.Medium, x => Math.Log(x[0], x[1])),
-			new ("log10", 1, MathOperatorPrecedence.Medium, x => Math.Log10(x[0])),
-			new ("max", 2, MathOperatorPrecedence.Medium, x => Math.Max(x[0], x[1])),
-			new ("min", 2, MathOperatorPrecedence.Medium, x => Math.Min(x[0], x[1])),
-			new ("pow", 2, MathOperatorPrecedence.Medium, x => Math.Pow(x[0], x[1])),
-			new ("round", 2, MathOperatorPrecedence.Medium, x => Math.Round(x[0], Convert.ToInt32(x[1]))),
-			new ("sign", 1, MathOperatorPrecedence.Medium, x => Math.Sign(x[0])),
-			new ("sin", 1, MathOperatorPrecedence.Medium, x => Math.Sin(x[0])),
-			new ("sinh", 1, MathOperatorPrecedence.Medium, x => Math.Sinh(x[0])),
-			new ("sqrt", 1, MathOperatorPrecedence.Medium, x => Math.Sqrt(x[0])),
-			new ("tan", 1, MathOperatorPrecedence.Medium, x => Math.Tan(x[0])),
-			new ("tanh", 1, MathOperatorPrecedence.Medium, x => Math.Tanh(x[0])),
-			new ("truncate", 1, MathOperatorPrecedence.Medium, x => Math.Truncate(x[0])),
-			new ("^", 2, MathOperatorPrecedence.High, x => Math.Pow(x[0], x[1])),
-			new ("pi", 0, MathOperatorPrecedence.Constant, _ => Math.PI),
-			new ("e", 0, MathOperatorPrecedence.Constant, _ => Math.E),
-		};
-
-		if (argumentList.Count > 0)
+		List<MathOperator> operators =
+		[
+			new ("+", 2, x => Convert.ToDouble(x[0]) + Convert.ToDouble(x[1])),
+			new ("-", 2, x => Convert.ToDouble(x[0]) - Convert.ToDouble(x[1])),
+			new ("*", 2, x => Convert.ToDouble(x[0]) * Convert.ToDouble(x[1])),
+			new ("/", 2, x => Convert.ToDouble(x[0]) / Convert.ToDouble(x[1])),
+			new ("%", 2, x => Convert.ToDouble(x[0]) % Convert.ToDouble(x[1])),
+
+			new ("and", 2, x => ConvertToBoolean(x[0]) ? x[1] : x[0]),
+			new ("or", 2, x => ConvertToBoolean(x[0]) ? x[0] : x[1]),
+
+			new ("==", 2, x => object.Equals(x[0], x[1])),
+			new ("!=", 2, x => !object.Equals(x[0], x[1])),
+
+			new ("ge", 2, x => Convert.ToDouble(x[0]) >= Convert.ToDouble(x[1])),
+			new ("gt", 2, x => Convert.ToDouble(x[0]) > Convert.ToDouble(x[1])),
+			new ("le", 2, x => Convert.ToDouble(x[0]) <= Convert.ToDouble(x[1])),
+			new ("lt", 2, x => Convert.ToDouble(x[0]) < Convert.ToDouble(x[1])),
+			new ("neg", 1, x => -Convert.ToDouble(x[0])),
+			new ("not", 1, x => !ConvertToBoolean(x[0])),
+			new ("if", 3, x => ConvertToBoolean(x[0]) ? x[1] : x[2]),
+
+			new ("abs", 1, x => Math.Abs(Convert.ToDouble(x[0]))),
+			new ("acos", 1, x => Math.Acos(Convert.ToDouble(x[0]))),
+			new ("asin", 1, x => Math.Asin(Convert.ToDouble(x[0]))),
+			new ("atan", 1, x => Math.Atan(Convert.ToDouble(x[0]))),
+			new ("atan2", 2, x => Math.Atan2(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("ceiling", 1, x => Math.Ceiling(Convert.ToDouble(x[0]))),
+			new ("cos", 1, x => Math.Cos(Convert.ToDouble(x[0]))),
+			new ("cosh", 1, x => Math.Cosh(Convert.ToDouble(x[0]))),
+			new ("exp", 1, x => Math.Exp(Convert.ToDouble(x[0]))),
+			new ("floor", 1, x => Math.Floor(Convert.ToDouble(x[0]))),
+			new ("ieeeremainder", 2, x => Math.IEEERemainder(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("log", 2, x => Math.Log(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("log10", 1, x => Math.Log10(Convert.ToDouble(x[0]))),
+			new ("max", 2, x => Math.Max(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("min", 2, x => Math.Min(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("pow", 2, x => Math.Pow(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("round", 2, x => Math.Round(Convert.ToDouble(x[0]), Convert.ToInt32(x[1]))),
+			new ("sign", 1, x => Math.Sign(Convert.ToDouble(x[0]))),
+			new ("sin", 1, x => Math.Sin(Convert.ToDouble(x[0]))),
+			new ("sinh", 1, x => Math.Sinh(Convert.ToDouble(x[0]))),
+			new ("sqrt", 1, x => Math.Sqrt(Convert.ToDouble(x[0]))),
+			new ("tan", 1, x => Math.Tan(Convert.ToDouble(x[0]))),
+			new ("tanh", 1, x => Math.Tanh(Convert.ToDouble(x[0]))),
+			new ("truncate", 1, x => Math.Truncate(Convert.ToDouble(x[0]))),
+			new ("int", 1, x => Convert.ToInt32(x[0])),
+			new ("double", 1, x => Convert.ToDouble(x[0])),
+			new ("bool", 1, x => Convert.ToBoolean(x[0])),
+			new ("str", 1, x => x[0]?.ToString()),
+			new ("len", 1, x => x[0]?.ToString()?.Length),
+			new ("^", 2, x => Math.Pow(Convert.ToDouble(x[0]), Convert.ToDouble(x[1]))),
+			new ("pi", 0, _ => Math.PI),
+			new ("e", 0, _ => Math.E),
+			new ("true", 0, _ => true),
+			new ("false", 0, _ => false),
+			new ("null", 0, _ => null),
+		];
+
+		if (arguments.Count > 0)
 		{
-			operators.Add(new MathOperator("x", 0, MathOperatorPrecedence.Constant, _ => argumentList[0]));
+			var firstArgument = arguments[0];
+			operators.Add(new MathOperator("x", 0, _ => firstArgument));
 		}
 
-		for (var i = 0; i < argumentList.Count; i++)
+		for (var i = 0; i < arguments.Count; i++)
 		{
-			var index = i;
-			operators.Add(new MathOperator($"x{i}", 0, MathOperatorPrecedence.Constant, _ => argumentList[index]));
+			var currentArgument = arguments[i];
+			operators.Add(new MathOperator($"x{i}", 0, _ => currentArgument));
 		}
 
 		this.operators = operators;
 	}
+	
+	static ReadOnlyDictionary<string, string> BinaryMappingDictionary { get; } = new Dictionary<string, string>
+	{
+		{ "<", "lt" },
+		{ "<=", "le" },
+		{ ">", "gt" },
+		{ ">=", "ge" },
+		{ "&&", "and" },
+		{ "||", "or" }
+	}.AsReadOnly();
+
+	static ReadOnlyDictionary<string, string> UnaryMappingDictionary { get; } = new Dictionary<string, string>
+	{
+		{ "-", "neg" },
+		{ "!", "not" }
+	}.AsReadOnly();
+	
+	string Expression { get; }
+
+	List<MathToken> RPN { get; } = [];
+	
+	int ExpressionIndex { get; set; }
 
-	internal string Expression { get; }
+	Match PatternMatch { get; set; } = Match.Empty;
 
-	public double Calculate()
+	public object? CalculateResult()
 	{
-		var rpn = GetReversePolishNotation(Expression);
+		if (!ParseExpression())
+		{
+			throw new ArgumentException("Math Expression Invalid. Failed to parse math expression.");
+		}
 
-		var stack = new Stack<double>();
+		var stack = new Stack<object?>();
 
-		foreach (var value in rpn)
+		foreach (var token in RPN)
 		{
-			if (double.TryParse(value, numberStyle, formatProvider, out var numeric))
+			if (token.Type is MathTokenType.Value)
 			{
-				stack.Push(numeric);
+				stack.Push(token.Value);
 				continue;
 			}
 
-			var mathOperator = operators.FirstOrDefault(x => x.Name == value) ??
-				throw new ArgumentException($"Invalid math expression. Can't find operator or value with name \"{value}\".");
-
-			if (mathOperator.Precedence is MathOperatorPrecedence.Constant)
+			var mathOperator = operators.FirstOrDefault(x => x.Name == token.Text) ?? throw new ArgumentException($"Math Expression Invalid. Can't find operator or value with name \"{token.Text}\".");
+			
+            if (mathOperator.NumericCount is 0)
 			{
 				stack.Push(mathOperator.CalculateFunc([]));
 				continue;
@@ -99,146 +152,310 @@ public double Calculate()
 
 			if (stack.Count < operatorNumericCount)
 			{
-				throw new ArgumentException("Invalid math expression.");
+				throw new ArgumentException($"Math Expression Invalid. Insufficient parameters to operator \"{mathOperator.Name}\".");
 			}
 
-			var args = new List<double>();
+			bool containsNullArgument = false;
+			List<object?> args = [];
+			
 			for (var j = 0; j < operatorNumericCount; j++)
 			{
-				args.Add(stack.Pop());
+				object? val = stack.Pop();
+				args.Add(val);
+				containsNullArgument = containsNullArgument || val is null;
 			}
 
 			args.Reverse();
 
-			stack.Push(mathOperator.CalculateFunc([.. args]));
+			containsNullArgument = mathOperator.Name switch
+			{
+				"if" => args[0] is null,
+				"and" or "or" or "==" or "!=" => false,
+				_ => containsNullArgument
+			};
+
+			stack.Push(!containsNullArgument ? mathOperator.CalculateFunc([.. args]) : null);
 		}
 
-		if (stack.Count != 1)
+		return stack.Count switch
 		{
-			throw new ArgumentException("Invalid math expression.");
+			0 => throw new InvalidOperationException($"Math Expression Invalid. Stack is unexpectedly empty."),
+			> 1 => throw new InvalidOperationException($"Math Expression Invalid. Stack unexpectedly contains multiple items ({stack.Count}) items when it should contain only the final result."),
+			_ => stack.Pop()
+		};
+	}
+	
+	[GeneratedRegex("""^(\w+)\(""")]
+	private static partial Regex EvaluateFunctionStart();
+
+	[GeneratedRegex("""^(\,)""")]
+	private static partial Regex EvaluateComma();
+
+	[GeneratedRegex("""^(\))""")]
+	private static partial Regex EvaluateFunctionEnd();
+	
+	[GeneratedRegex("""^(\?)""")]
+	private static partial Regex EvaluateConditionalStart();
+
+	[GeneratedRegex("""^(\:)""")]
+	private static partial Regex EvaluateConditionalElse();
+	
+	[GeneratedRegex("""^(\|\||or)""")]
+	private static partial Regex EvaluateLogicalOROperator();
+	
+	[GeneratedRegex("""^(\&\&|and)""")]
+	private static partial Regex EvaluateLogicalAndOperator();
+
+	[GeneratedRegex("""^(==|!=|eq|ne)""")]
+	private static partial Regex EvaluateEqualityOperators();
+
+	[GeneratedRegex("""^(\<\=|\>\=|\<|\>|le|ge|lt|gt)""")]
+	private static partial Regex EvaluateCompareOperators();
+
+	[GeneratedRegex("""^(\+|\-)""")]
+	private static partial Regex EvaluateSumOperators();
+
+	[GeneratedRegex("""^(\*|\/|\%)""")]
+	private static partial Regex EvaluateProductOperators();
+
+	[GeneratedRegex("""^(\^)""")]
+	private static partial Regex EvaluatePowerOperator();
+
+	[GeneratedRegex("""^(\-|\!)""")]
+	private static partial Regex EvaluateUnaryOperators();
+
+	[GeneratedRegex("""^(\-?\d+\.\d+|\-?\d+)""")]
+	private static partial Regex EvaluateNumberPattern();
+
+	[GeneratedRegex("""^["]([^"]*)["]""")]
+	private static partial Regex EvaluateStringPattern();
+
+	[GeneratedRegex("""^(\w+)""")]
+	private static partial Regex EvaluateConstants();
+
+	[GeneratedRegex("""^(\()""")]
+	private static partial Regex EvaluateParenStart();
+
+	[GeneratedRegex("""^(\))""")]
+	private static partial Regex EvaluateParenEnd();
+	
+	[GeneratedRegex("""^\s*""")]
+	private static partial Regex EvaluateWhitespace();
+	
+	static bool ConvertToBoolean(object? b) => b switch
+	{
+		bool x => x,
+		null => false,
+		double doubleValue => doubleValue != 0 && !double.IsNaN(doubleValue),
+		string stringValue => !string.IsNullOrEmpty(stringValue),
+		_ => Convert.ToBoolean(b)
+	};
+	
+	bool ParsePattern(Regex regex)
+	{
+		var whitespaceMatch = EvaluateWhitespace().Match(Expression[ExpressionIndex..]);
+		if (whitespaceMatch.Success)
+		{
+			ExpressionIndex += whitespaceMatch.Length;
 		}
 
-		return stack.Pop();
+		PatternMatch = regex.Match(Expression[ExpressionIndex..]);
+		if (!PatternMatch.Success)
+		{
+			return false;
+		}
+		ExpressionIndex += PatternMatch.Length;
+
+		whitespaceMatch = EvaluateWhitespace().Match(Expression[ExpressionIndex..]);
+		if (whitespaceMatch.Success)
+		{
+			ExpressionIndex += whitespaceMatch.Length;
+		}
+
+		return true;
 	}
 
-	[GeneratedRegex(@"(?<!\d)\-?(?:\d+\.\d+|\d+)|\+|\-|\/|\*|\(|\)|\^|\%|\,|\w+")]
-	private static partial Regex MathExpressionRegexPattern();
+	bool ParseExpression()
+	{
+		ExpressionIndex = 0;
+		RPN.Clear();
+		return ParseExpr() && ExpressionIndex == Expression.Length;
+	}
 
-	List<string> GetReversePolishNotation(string expression)
+	bool ParseExpr()
 	{
-		var matches = MathExpressionRegexPattern().Matches(expression) ?? throw new ArgumentException("Invalid math expression.");
+		return ParseConditional();
+	}
 
-		var output = new List<string>();
-		var stack = new Stack<(string Name, MathOperatorPrecedence Precedence)>();
+	bool ParseConditional()
+	{
+		if (!ParseLogicalOR())
+		{
+			return false;
+		}
 
-		foreach (var match in matches.Cast<Match>())
+		if (!ParsePattern(EvaluateConditionalStart()))
 		{
-			if (string.IsNullOrEmpty(match?.Value))
-			{
-				continue;
-			}
+			return true;
+		}
 
-			var value = match.Value;
+		if (!ParseLogicalOR())
+		{
+			return false;
+		}
 
-			if (double.TryParse(value, numberStyle, formatProvider, out var numeric))
+		if (!ParsePattern(EvaluateConditionalElse()))
+		{
+			return false;
+		}
+
+		if (!ParseLogicalOR())
+		{
+			return false;
+		}
+
+		RPN.Add(new MathToken(MathTokenType.Operator, "if", null));
+		return true;
+	}
+
+	bool ParseLogicalOR() => ParseBinaryOperators(EvaluateLogicalOROperator(), ParseLogicalAnd);
+
+	bool ParseLogicalAnd() => ParseBinaryOperators(EvaluateLogicalAndOperator(), ParseEquality);
+
+	bool ParseEquality() => ParseBinaryOperators(EvaluateEqualityOperators(), ParseCompare);
+
+	bool ParseCompare() => ParseBinaryOperators(EvaluateCompareOperators(), ParseSum);
+
+	bool ParseSum() => ParseBinaryOperators(EvaluateSumOperators(), ParseProduct);
+
+	bool ParseProduct() => ParseBinaryOperators(EvaluateProductOperators(), ParsePower);
+
+	bool ParsePower() => ParseBinaryOperators(EvaluatePowerOperator(), ParsePrimary);
+
+	bool ParseBinaryOperators(Regex BinaryOperators, Func<bool> ParseNext)
+	{
+		if (!ParseNext())
+		{
+			return false;
+		}
+		int index = ExpressionIndex;
+		while (ParsePattern(BinaryOperators))
+		{
+			string _operator = PatternMatch.Groups[1].Value;
+			if (BinaryMappingDictionary.TryGetValue(_operator, out var value))
 			{
-				if (numeric < 0)
-				{
-					var isNegative = output.Count == 0 || stack.Count != 0;
-
-					if (!isNegative)
-					{
-						stack.Push(("-", MathOperatorPrecedence.Low));
-						output.Add(Math.Abs(numeric).ToString(formatProvider));
-						continue;
-					}
-				}
-
-				output.Add(value);
-				continue;
+				_operator = value;
+			}
+			if (!ParseNext())
+			{
+				ExpressionIndex = index;
+				return false;
 			}
+			RPN.Add(new MathToken(MathTokenType.Operator, _operator, null));
+			index = ExpressionIndex;
+		}
+		return true;
+	}
+
+	bool ParsePrimary()
+	{
+		if (ParsePattern(EvaluateNumberPattern()))
+		{
+			string _number = PatternMatch.Groups[1].Value;
+			RPN.Add(new MathToken(MathTokenType.Value, _number, double.Parse(_number)));
+			return true;
+		}
 
-			var mathOperator = operators.FirstOrDefault(x => x.Name == value);
-			if (mathOperator is not null)
+		if (ParsePattern(EvaluateStringPattern()))
+		{
+			string _string = PatternMatch.Groups[1].Value;
+			RPN.Add(new MathToken(MathTokenType.Value, _string, _string));
+			return true;
+		}
+
+		if (ParseFunction())
+		{
+			return true;
+		}
+
+		if (ParsePattern(EvaluateConstants()))
+		{
+			string _constant = PatternMatch.Groups[1].Value;
+			RPN.Add(new MathToken(MathTokenType.Operator, _constant, null));
+			return true;
+		}
+
+		int index = ExpressionIndex;
+		if (ParsePattern(EvaluateParenStart()))
+		{
+			if (!ParseExpr())
 			{
-				if (mathOperator.Precedence is MathOperatorPrecedence.Constant)
-				{
-					output.Add(value);
-					continue;
-				}
-
-				while (stack.Count > 0)
-				{
-					var (_, precedence) = stack.Peek();
-					if (precedence >= mathOperator.Precedence)
-					{
-						output.Add(stack.Pop().Name);
-					}
-					else
-					{
-						break;
-					}
-				}
-
-				stack.Push((value, mathOperator.Precedence));
+				ExpressionIndex = index;
+				return false;
 			}
-			else if (value is "(")
+			if (!ParsePattern(EvaluateParenEnd()))
 			{
-				stack.Push((value, MathOperatorPrecedence.Lowest));
+				ExpressionIndex = index;
+				return false;
 			}
-			else if (value is ")")
+			return true;
+		}
+
+		index = ExpressionIndex;
+		if (ParsePattern(EvaluateUnaryOperators()))
+		{
+			string _operator = PatternMatch.Groups[1].Value;
+			if (UnaryMappingDictionary.TryGetValue(_operator, out var value))
 			{
-				var isFound = false;
-				for (var i = stack.Count - 1; i >= 0; i--)
-				{
-					if (stack.Count == 0)
-					{
-						throw new ArgumentException("Invalid math expression.");
-					}
-
-					var stackValue = stack.Pop().Name;
-					if (stackValue is "(")
-					{
-						isFound = true;
-						break;
-					}
-
-					output.Add(stackValue);
-				}
-
-				if (!isFound)
-				{
-					throw new ArgumentException("Invalid math expression.");
-				}
+				_operator = value;
 			}
-			else if (value is ",")
+			if (!ParsePrimary())
 			{
-				while (stack.Count > 0)
-				{
-					var (_, precedence) = stack.Peek();
-					if (precedence >= MathOperatorPrecedence.Low)
-					{
-						output.Add(stack.Pop().Name);
-					}
-					else
-					{
-						break;
-					}
-				}
+				ExpressionIndex = index;
+				return false;
 			}
+			RPN.Add(new MathToken(MathTokenType.Operator, _operator, null));
+			return true;
 		}
 
-		for (var i = stack.Count - 1; i >= 0; i--)
+		return false;
+	}
+
+	bool ParseFunction()
+	{
+		int index = ExpressionIndex;
+		if (!ParsePattern(EvaluateFunctionStart()))
+		{
+			return false;
+		}
+
+		string text = PatternMatch.Groups[0].Value;
+		string functionName = PatternMatch.Groups[1].Value;
+
+		if (!ParseExpr())
 		{
-			var (name, _) = stack.Pop();
-			if (name is "(")
+			ExpressionIndex = index;
+			return false;
+		}
+
+		while (ParsePattern(EvaluateComma()))
+		{
+			if (!ParseExpr())
 			{
-				throw new ArgumentException("Invalid math expression.");
+				ExpressionIndex = index;
+				return false;
 			}
+			index = ExpressionIndex;
+		}
 
-			output.Add(name);
+		if (!ParsePattern(EvaluateFunctionEnd()))
+		{
+			ExpressionIndex = index;
+			return false;
 		}
 
-		return output;
+		RPN.Add(new MathToken(MathTokenType.Operator, functionName, null));
+
+		return true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpressionConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpressionConverter.shared.cs
index 8d29adcadf..4f72e1d4f3 100644
--- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpressionConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpressionConverter.shared.cs
@@ -6,23 +6,22 @@ namespace CommunityToolkit.Maui.Converters;
 /// Converters for Math expressions
 /// </summary>
 [AcceptEmptyServiceProvider]
-public partial class MathExpressionConverter : BaseConverterOneWay<double, double, string>
+public partial class MathExpressionConverter : BaseConverterOneWay<object?, object?, string>
 {
 	/// <inheritdoc/>
-	public override double DefaultConvertReturnValue { get; set; } = 0.0d;
+	public override object? DefaultConvertReturnValue { get; set; } = 0.0d;
 
 	/// <summary>
 	/// Calculate the incoming expression string with one variable.
 	/// </summary>
-	/// <param name="value">The variable X for an expression</param>
+	/// <param name="inputValue">The variable X for an expression</param>
 	/// <param name="parameter">The expression to calculate.</param>
 	/// <param name="culture">The culture to use in the converter. This is not implemented.</param>
 	/// <returns>A <see cref="double"/> The result of calculating an expression.</returns>
-	public override double ConvertFrom(double value, string parameter, CultureInfo? culture = null)
+	public override object? ConvertFrom(object? inputValue, string parameter, CultureInfo? culture = null)
 	{
 		ArgumentNullException.ThrowIfNull(parameter);
 
-		var mathExpression = new MathExpression(parameter, [value]);
-		return mathExpression.Calculate();
+		return new MathExpression(parameter, [inputValue]).CalculateResult();
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
index ca0325f8af..812b7b73e1 100644
--- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
@@ -18,7 +18,6 @@ public class MultiMathExpressionConverter : MultiValueConverterExtension, ICommu
 	/// <param name="parameter">The expression to calculate.</param>
 	/// <param name="culture">The culture to use in the converter. This is not implemented.</param>
 	/// <returns>A <see cref="double"/> The result of calculating an expression.</returns>
-	[return: NotNullIfNotNull(nameof(values))]
 	public object? Convert(object?[]? values, Type targetType, [NotNull] object? parameter, CultureInfo? culture = null)
 	{
 		ArgumentNullException.ThrowIfNull(targetType);
@@ -29,22 +28,9 @@ public class MultiMathExpressionConverter : MultiValueConverterExtension, ICommu
 			throw new ArgumentException("The parameter should be of type String.");
 		}
 
-		if (values is null || values.Any(x => !double.TryParse(x?.ToString(), out _)))
-		{
-			return null;
-		}
-
-		var args = new List<double>();
-		foreach (var value in values)
-		{
-			var valueString = value?.ToString() ?? throw new ArgumentException("Values cannot be null.");
-
-			var xValue = double.Parse(valueString);
-			args.Add(xValue);
-		}
-
-		var math = new MathExpression(expression, args);
-		return math.Calculate();
+		return values is null 
+			? null 
+			: new MathExpression(expression, values).CalculateResult();
 	}
 
 	/// <summary>

From 075be1b5c42c3b8ffccaae342adf355af04cc307 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:13:05 -0800
Subject: [PATCH 26/39] `dotnet format`

---
 .../Primitives/MathOperator.shared.cs         | 30 +++++++++----------
 .../MathExpressionConverterTests.cs           |  8 ++---
 .../MathExpression.shared.cs                  | 30 +++++++++----------
 .../MultiMathExpressionConverter.shared.cs    |  4 +--
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs b/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
index f2989fe5d7..3e7cdf15f2 100644
--- a/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Primitives/MathOperator.shared.cs
@@ -27,23 +27,23 @@ public enum MathOperatorPrecedence
 /// <param name="numericCount">Number of Numerals</param>
 /// <param name="calculateFunc">Calculation Function</param>
 public sealed class MathOperator(
-    string name,
-    int numericCount,
-    Func<object?[], object?> calculateFunc)
+	string name,
+	int numericCount,
+	Func<object?[], object?> calculateFunc)
 {
 
-    /// <summary>
-    /// Name
-    /// </summary>
-    public string Name { get; } = name;
+	/// <summary>
+	/// Name
+	/// </summary>
+	public string Name { get; } = name;
 
-    /// <summary>
-    /// Number of Numerals
-    /// </summary>
-    public int NumericCount { get; } = numericCount;
+	/// <summary>
+	/// Number of Numerals
+	/// </summary>
+	public int NumericCount { get; } = numericCount;
 
-    /// <summary>
-    /// Calculation Function
-    /// </summary>
-    public Func<object?[], object?> CalculateFunc { get; } = calculateFunc;
+	/// <summary>
+	/// Calculation Function
+	/// </summary>
+	public Func<object?[], object?> CalculateFunc { get; } = calculateFunc;
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
index e46273ddb5..a6ab9e45d6 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/MathExpressionConverterTests.cs
@@ -187,10 +187,10 @@ public void MathExpressionConverter_WithBooleanOperator_ReturnsCorrectBooleanRes
 	}
 
 	[Theory]
-	[InlineData("x == 3 && x1", new object?[] { 3d, null})]
+	[InlineData("x == 3 && x1", new object?[] { 3d, null })]
 	[InlineData("x != 3 || x1", new object?[] { 3d, null })]
 	[InlineData("x == 3 ? x1 : x2", new object?[] { 3d, null, 5d })]
-	[InlineData("x != 3 ? x1 : x2", new object?[] { 3d, 4d, null})]
+	[InlineData("x != 3 ? x1 : x2", new object?[] { 3d, 4d, null })]
 	public void MathExpressionConverter_ReturnsCorrectNullResult(string expression, object[] variables)
 	{
 		var mathExpressionConverter = new MultiMathExpressionConverter();
@@ -203,7 +203,7 @@ public void MathExpressionConverter_ReturnsCorrectNullResult(string expression,
 	[Theory]
 	[InlineData("x == x1", new object?[] { 2d, 2d }, true)]
 	[InlineData("x == x1", new object?[] { 2d, null }, false)]
-	[InlineData("x == x1", new object?[] { null, 2d}, false)]
+	[InlineData("x == x1", new object?[] { null, 2d }, false)]
 	[InlineData("x == x1", new object?[] { null, null }, true)]
 	[InlineData("(x ? x1 : x2) == null", new object?[] { true, null, 2d }, true)]
 	public void MathExpressionConverter_WithEqualityOperator_ReturnsCorrectBooleanResult(string expression, object[] variables, bool expectedResult)
@@ -258,4 +258,4 @@ public void MultiMathExpressionConverterNullInputTest()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 		Assert.Throws<ArgumentNullException>(() => new MultiMathExpressionConverter().Convert([0.0, 7], typeof(bool), null, null));
 	}
-}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
index 5c972e5f59..28167ff982 100644
--- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
-using System.Text.RegularExpressions;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
 using CommunityToolkit.Maui.Core;
 
 namespace CommunityToolkit.Maui.Converters;
@@ -98,7 +98,7 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 
 		this.operators = operators;
 	}
-	
+
 	static ReadOnlyDictionary<string, string> BinaryMappingDictionary { get; } = new Dictionary<string, string>
 	{
 		{ "<", "lt" },
@@ -114,11 +114,11 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 		{ "-", "neg" },
 		{ "!", "not" }
 	}.AsReadOnly();
-	
+
 	string Expression { get; }
 
 	List<MathToken> RPN { get; } = [];
-	
+
 	int ExpressionIndex { get; set; }
 
 	Match PatternMatch { get; set; } = Match.Empty;
@@ -141,8 +141,8 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 			}
 
 			var mathOperator = operators.FirstOrDefault(x => x.Name == token.Text) ?? throw new ArgumentException($"Math Expression Invalid. Can't find operator or value with name \"{token.Text}\".");
-			
-            if (mathOperator.NumericCount is 0)
+
+			if (mathOperator.NumericCount is 0)
 			{
 				stack.Push(mathOperator.CalculateFunc([]));
 				continue;
@@ -157,7 +157,7 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 
 			bool containsNullArgument = false;
 			List<object?> args = [];
-			
+
 			for (var j = 0; j < operatorNumericCount; j++)
 			{
 				object? val = stack.Pop();
@@ -184,7 +184,7 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 			_ => stack.Pop()
 		};
 	}
-	
+
 	[GeneratedRegex("""^(\w+)\(""")]
 	private static partial Regex EvaluateFunctionStart();
 
@@ -193,16 +193,16 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 
 	[GeneratedRegex("""^(\))""")]
 	private static partial Regex EvaluateFunctionEnd();
-	
+
 	[GeneratedRegex("""^(\?)""")]
 	private static partial Regex EvaluateConditionalStart();
 
 	[GeneratedRegex("""^(\:)""")]
 	private static partial Regex EvaluateConditionalElse();
-	
+
 	[GeneratedRegex("""^(\|\||or)""")]
 	private static partial Regex EvaluateLogicalOROperator();
-	
+
 	[GeneratedRegex("""^(\&\&|and)""")]
 	private static partial Regex EvaluateLogicalAndOperator();
 
@@ -238,10 +238,10 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 
 	[GeneratedRegex("""^(\))""")]
 	private static partial Regex EvaluateParenEnd();
-	
+
 	[GeneratedRegex("""^\s*""")]
 	private static partial Regex EvaluateWhitespace();
-	
+
 	static bool ConvertToBoolean(object? b) => b switch
 	{
 		bool x => x,
@@ -250,7 +250,7 @@ internal MathExpression(in string expression, in IReadOnlyList<object?> argument
 		string stringValue => !string.IsNullOrEmpty(stringValue),
 		_ => Convert.ToBoolean(b)
 	};
-	
+
 	bool ParsePattern(Regex regex)
 	{
 		var whitespaceMatch = EvaluateWhitespace().Match(Expression[ExpressionIndex..]);
@@ -458,4 +458,4 @@ bool ParseFunction()
 
 		return true;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
index 812b7b73e1..14dea65fae 100644
--- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MultiMathExpressionConverter.shared.cs
@@ -28,8 +28,8 @@ public class MultiMathExpressionConverter : MultiValueConverterExtension, ICommu
 			throw new ArgumentException("The parameter should be of type String.");
 		}
 
-		return values is null 
-			? null 
+		return values is null
+			? null
 			: new MathExpression(expression, values).CalculateResult();
 	}
 

From 46fb9a23c5879e990a3ba33e2ecf2c902aa83d08 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:19:32 +0100
Subject: [PATCH 27/39] [iOS] StatusBarBehavior does not occupy entire notch -
 fix (#2309)

* [iOS] Improve status bar

* Use `Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea`, Remove `CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific.StatusBar`, Remove `OperatingSystem.IsIOSVersionAtLeast(13))` (Toolkit now supports iOS 15+)

* Remove iOS 13 check (Toolkit only supports iOS 15+)

* Don't modify StatusBar Frame in `PlatformSetColor`

* Remove iOS 13 code (Toolkit support iOS 15+

* Refactor

* Update azure-pipelines.yml

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
---
 azure-pipelines.yml                           |   2 +-
 .../Pages/Base/BasePage.cs                    |   7 +-
 .../Behaviors/StatusBarBehaviorPage.xaml      |   4 +-
 .../Platform/StatusBar/StatusBar.ios.cs       | 126 +++++++-----------
 .../StatusBar/StatusBarBehavior.shared.cs     |  31 +++--
 5 files changed, 74 insertions(+), 96 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4bd5000e1f..5b0b683223 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,7 +29,7 @@ variables:
   PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
   DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
   CommunityToolkitSampleApp_Xcode_Version: '16.2'
-  CommunityToolkitLibrary_Xcode_Version: '16.1'
+  CommunityToolkitLibrary_Xcode_Version: '16.2'
 
 trigger:
   branches:
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
index e659b1568e..c88679bddc 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
@@ -3,12 +3,9 @@
 
 namespace CommunityToolkit.Maui.Sample.Pages;
 
-public abstract class BasePage<TViewModel> : BasePage where TViewModel : BaseViewModel
+public abstract class BasePage<TViewModel>(TViewModel viewModel) : BasePage(viewModel)
+	where TViewModel : BaseViewModel
 {
-	protected BasePage(TViewModel viewModel) : base(viewModel)
-	{
-	}
-
 	public new TViewModel BindingContext => (TViewModel)base.BindingContext;
 }
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
index f86bf5f884..7698437c54 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
@@ -6,6 +6,8 @@
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
     xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Behaviors"
+    xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
+    ios:Page.UseSafeArea="True"
     Title="StatusBarBehavior"
     x:DataType="vm:StatusBarBehaviorViewModel"
     x:TypeArguments="vm:StatusBarBehaviorViewModel"
@@ -81,7 +83,7 @@
 
     <ScrollView Padding="{StaticResource ContentPadding}">
 
-        <VerticalStackLayout Padding="15,0" Spacing="30">
+        <VerticalStackLayout Padding="15,0" Spacing="30" IgnoreSafeArea="False">
 
             <Label Text="Slide to change StatusBar color" />
 
diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index a4403260aa..82066d006d 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -11,91 +11,73 @@ static partial class StatusBar
 	/// <summary>
 	/// Method to update the status bar size.
 	/// </summary>
-	public static void UpdateBarSize()
+	public static void SetBarSize(bool isUsingSafeArea)
 	{
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
+		var communityToolkitStatusBarTag = new IntPtr(38482);
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var statusBarTag = new IntPtr(38482);
-			foreach (var window in UIApplication.SharedApplication.Windows)
+			var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
+			if (statusBarFrame is null)
 			{
-				var statusBar = window.ViewWithTag(statusBarTag);
-				var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
-				if (statusBarFrame is null)
-				{
-					continue;
-				}
-
-				statusBar ??= new UIView(statusBarFrame.Value);
-				statusBar.Tag = statusBarTag;
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
-				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
-				foreach (var statusBarSubView in statusBarSubViews)
-				{
-					statusBarSubView.RemoveFromSuperview();
-				}
-
-				window.AddSubview(statusBar);
-
-				TryUpdateStatusBarAppearance(window);
+				continue;
 			}
-		}
-		else
-		{
-			if (UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) is UIView statusBar)
+
+			var statusBar = window.ViewWithTag(communityToolkitStatusBarTag) ?? new UIView(statusBarFrame.Value);
+			statusBar.Tag = communityToolkitStatusBarTag;
+			statusBar.Frame = GetStatusBarFrame(window, isUsingSafeArea);
+
+			var statusBarSubViews = window.Subviews.Where(x => x.Tag == communityToolkitStatusBarTag).ToList();
+			foreach (var statusBarSubView in statusBarSubViews)
 			{
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
+				statusBarSubView.RemoveFromSuperview();
 			}
 
-			TryUpdateStatusBarAppearance();
+			window.AddSubview(statusBar);
+
+			TryUpdateStatusBarAppearance(window);
 		}
 	}
 
 	static void PlatformSetColor(Color color)
 	{
 		var uiColor = color.ToPlatform();
-
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
+		
+		var statusBarTag = new IntPtr(38482);
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var statusBarTag = new IntPtr(38482);
-			foreach (var window in UIApplication.SharedApplication.Windows)
+			var statusBar = window.ViewWithTag(statusBarTag);
+			var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
+			if (statusBarFrame is null)
 			{
-				var statusBar = window.ViewWithTag(statusBarTag);
-				var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
-				if (statusBarFrame is null)
-				{
-					continue;
-				}
-
-				// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
-				// window.ViewWithTag(tag) can return null
-				statusBar ??= new UIView(statusBarFrame.Value);
-				statusBar.Tag = statusBarTag;
-				statusBar.BackgroundColor = uiColor;
-				statusBar.TintColor = uiColor;
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
-				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
-				foreach (var statusBarSubView in statusBarSubViews)
-				{
-					statusBarSubView.RemoveFromSuperview();
-				}
-
-				window.AddSubview(statusBar);
-
-				TryUpdateStatusBarAppearance(window);
+				continue;
 			}
-		}
-		else
-		{
-			if (UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) is UIView statusBar
-				&& statusBar.RespondsToSelector(new ObjCRuntime.Selector("setBackgroundColor:")))
+			
+			statusBar ??= new UIView(statusBarFrame.Value);
+			statusBar.Tag = statusBarTag;
+			statusBar.BackgroundColor = uiColor;
+			statusBar.TintColor = uiColor;
+
+			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
+			foreach (var statusBarSubView in statusBarSubViews)
 			{
-				statusBar.BackgroundColor = uiColor;
+				statusBarSubView.RemoveFromSuperview();
 			}
 
-			TryUpdateStatusBarAppearance();
+			window.AddSubview(statusBar);
+
+			TryUpdateStatusBarAppearance(window);
 		}
 	}
 
+	static CGRect GetStatusBarFrame(in UIWindow window, in bool isUsingSafeArea)
+	{
+		var statusBarFrame = UIApplication.SharedApplication.StatusBarFrame;
+		
+		return isUsingSafeArea
+			? new CGRect(statusBarFrame.X, statusBarFrame.Y, statusBarFrame.Width, window.SafeAreaInsets.Top)
+			: statusBarFrame;
+	}
+
 	static void PlatformSetStyle(StatusBarStyle statusBarStyle)
 	{
 		var uiStyle = statusBarStyle switch
@@ -113,22 +95,14 @@ static void PlatformSetStyle(StatusBarStyle statusBarStyle)
 
 	static bool TryUpdateStatusBarAppearance()
 	{
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
-		{
-			var didUpdateAllStatusBars = true;
+		var didUpdateAllStatusBars = true;
 
-			foreach (var window in UIApplication.SharedApplication.Windows)
-			{
-				didUpdateAllStatusBars &= TryUpdateStatusBarAppearance(window);
-			}
-
-			return didUpdateAllStatusBars;
-		}
-		else
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var window = UIApplication.SharedApplication.KeyWindow;
-			return TryUpdateStatusBarAppearance(window);
+			didUpdateAllStatusBars &= TryUpdateStatusBarAppearance(window);
 		}
+
+		return didUpdateAllStatusBars;
 	}
 
 	static bool TryUpdateStatusBarAppearance(UIWindow? window)
diff --git a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
index 507af7c4c1..521342b6cd 100644
--- a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
+++ b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
@@ -78,48 +78,53 @@ public StatusBarApplyOn ApplyOn
 
 	/// <inheritdoc /> 
 #if IOS
-	protected override void OnAttachedTo(Page bindable, UIKit.UIView platformView)
+	protected override void OnAttachedTo(Page page, UIKit.UIView platformView)
 #elif ANDROID
-	protected override void OnAttachedTo(Page bindable, Android.Views.View platformView)
+	protected override void OnAttachedTo(Page page, Android.Views.View platformView)
 #else
-	protected override void OnAttachedTo(Page bindable, object platformView)
+	protected override void OnAttachedTo(Page page, object platformView)
 #endif
 	{
-		base.OnAttachedTo(bindable, platformView);
+		base.OnAttachedTo(page, platformView);
 
 		if (ApplyOn is StatusBarApplyOn.OnBehaviorAttachedTo)
 		{
+#if IOS
+			StatusBar.SetBarSize(Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea(page));
+#endif
+
 			StatusBar.SetColor(StatusBarColor);
 			StatusBar.SetStyle(StatusBarStyle);
 		}
 
-		bindable.NavigatedTo += OnPageNavigatedTo;
+		page.NavigatedTo += OnPageNavigatedTo;
 #if IOS
-		bindable.SizeChanged += OnPageSizeChanged;
+		page.SizeChanged += OnPageSizeChanged;
 #endif
 	}
 
 	/// <inheritdoc /> 
 #if IOS
-	protected override void OnDetachedFrom(Page bindable, UIKit.UIView platformView)
+	protected override void OnDetachedFrom(Page page, UIKit.UIView platformView)
 #elif ANDROID
-	protected override void OnDetachedFrom(Page bindable, Android.Views.View platformView)
+	protected override void OnDetachedFrom(Page page, Android.Views.View platformView)
 #else
-	protected override void OnDetachedFrom(Page bindable, object platformView)
+	protected override void OnDetachedFrom(Page page, object platformView)
 #endif
 	{
 #if IOS
-		bindable.SizeChanged -= OnPageSizeChanged;
+		page.SizeChanged -= OnPageSizeChanged;
 #endif
-		base.OnDetachedFrom(bindable, platformView);
+		base.OnDetachedFrom(page, platformView);
 
-		bindable.NavigatedTo -= OnPageNavigatedTo;
+		page.NavigatedTo -= OnPageNavigatedTo;
 	}
 
 #if IOS
 	static void OnPageSizeChanged(object? sender, EventArgs e)
 	{
-		StatusBar.UpdateBarSize();
+		ArgumentNullException.ThrowIfNull(sender);
+		StatusBar.SetBarSize(Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea((Page)sender));
 	}
 #endif
 

From f35914835b2640c246e30583356595a0bf5abd6b Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jan 2025 10:59:20 +0100
Subject: [PATCH 28/39] Fix PublishCodeCoverageResults in Azure Pipelines
 (#2450)

Update azure-pipelines.yml
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5b0b683223..31c14c3245 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -323,7 +323,7 @@ jobs:
           testResultsFiles: '**/*.trx'
           searchFolder: $(Agent.TempDirectory)
 
-      - task: PublishCodeCoverageResults@2
+      - task: PublishCodeCoverageResults@1
         condition: eq(variables['Agent.OS'], 'Windows_NT') # Only run this step on Windows
         displayName: 'Publish Code Coverage Results'
         inputs:

From 1412e575a06d46610eeec65d510ee0fef9af3c90 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:44:31 +0200
Subject: [PATCH 29/39] Use GitHub Actions for CI and release (#2091)

* Use GitHub Actions

* Add sign and release

* update with latest version

* xcode 15.3

* Update dotnet-build.yml

* Update dotnet-build.yml

* Update azure-pipelines.yml

* Disable Azure Pipelines for PRs

* Update azure-pipelines.yml

---------

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 .github/workflows/SignClientFileList.txt |   1 +
 .github/workflows/dotnet-build.yml       | 270 +++++++++++++++++++++++
 azure-pipelines.yml                      |  26 +--
 3 files changed, 284 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/SignClientFileList.txt
 create mode 100644 .github/workflows/dotnet-build.yml

diff --git a/.github/workflows/SignClientFileList.txt b/.github/workflows/SignClientFileList.txt
new file mode 100644
index 0000000000..1a17866f45
--- /dev/null
+++ b/.github/workflows/SignClientFileList.txt
@@ -0,0 +1 @@
+**/CommunityToolkit.*
\ No newline at end of file
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
new file mode 100644
index 0000000000..1bf69e094f
--- /dev/null
+++ b/.github/workflows/dotnet-build.yml
@@ -0,0 +1,270 @@
+name: .NET
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+    paths-ignore:
+      - README.md
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - README.md
+
+env:
+  CurrentSemanticVersionBase: '99.0.0'
+  PreviewNumber: ${{ github.run_number }}
+  CurrentSemanticVersion: '99.0.0-preview${{ github.run_number }}'
+  NugetPackageVersion: '99.0.0-preview${{ github.run_number }}'
+  NugetPackageVersionCamera: '99.0.0-preview${{ github.run_number }}'
+  NugetPackageVersionMediaElement: '99.0.0-preview${{ github.run_number }}'
+  NugetPackageVersionMaps: '99.0.0-preview${{ github.run_number }}'
+  TOOLKIT_NET_VERSION: '9.0.102'
+  LATEST_NET_VERSION: '9.0.x'
+  PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
+  PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
+  PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
+  PathToCommunityToolkitCoreCsproj: 'src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj'
+  PathToCommunityToolkitCameraCsproj: 'src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj'
+  PathToCommunityToolkitMediaElementCsproj: 'src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj'
+  PathToCommunityToolkitMapsCsproj: 'src/CommunityToolkit.Maui.Maps/CommunityToolkit.Maui.Maps.csproj'
+  PathToCommunityToolkitSampleCsproj: 'samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj'
+  PathToCommunityToolkitUnitTestCsproj: 'src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj'
+  PathToCommunityToolkitAnalyzersCsproj: 'src/CommunityToolkit.Maui.Analyzers/CommunityToolkit.Maui.Analyzers.csproj'
+  PathToCommunityToolkitCameraAnalyzersCsproj: 'src/CommunityToolkit.Maui.Camera.Analyzers/CommunityToolkit.Maui.Camera.Analyzers.csproj'
+  PathToCommunityToolkitMediaElementAnalyzersCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers/CommunityToolkit.Maui.MediaElement.Analyzers.csproj'
+  PathToCommunityToolkitSourceGeneratorsCsproj: 'src/CommunityToolkit.Maui.SourceGenerators/CommunityToolkit.Maui.SourceGenerators.csproj'
+  PathToCommunityToolkitSourceGeneratorsInternalCsproj: 'src/CommunityToolkit.Maui.SourceGenerators.Internal/CommunityToolkit.Maui.SourceGenerators.Internal.csproj'
+  PathToCommunityToolkitAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.Analyzers.CodeFixes/CommunityToolkit.Maui.Analyzers.CodeFixes.csproj'
+  PathToCommunityToolkitCameraAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.csproj'
+  PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
+  PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
+  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
+  CommunityToolkitSampleApp_Xcode_Version: '16.2'
+  CommunityToolkitLibrary_Xcode_Version: '16.2'
+
+jobs:
+  build_sample:
+    name: Build Sample App using Latest .NET SDK
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, macos-15]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+
+      - name: Set Xcode version
+        if: runner.os == 'macOS'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitSampleApp_Xcode_Version }}.app/Contents/Developer
+
+      - name: Install Latest .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.LATEST_NET_VERSION }}
+
+      - name: Install .NET MAUI Workload
+        run: dotnet workload install maui
+
+      - name: Install Tizen Workload
+        run: |
+          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
+          .\workload-install.ps1
+        shell: pwsh
+
+      - name: Display dotnet info
+        run: dotnet --info
+
+      - name: Build Community Toolkit Sample
+        run: dotnet build -c Release ${{ env.PathToCommunityToolkitSampleCsproj }}
+
+  build_library:
+    name: Build Library
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, macos-15]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+
+      - name: Set NuGet Version to Tag Number
+        if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-mediaelement')
+        run: echo "NugetPackageVersion=${{ github.ref }}" >> $GITHUB_ENV
+
+      - name: Set NuGet Version to Tag Number for Camera
+        if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-camera')
+        run: echo "NugetPackageVersionCamera=${{ github.ref }}" >> $GITHUB_ENV
+
+      - name: Set NuGet Version to Tag Number for MediaElement
+        if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-mediaelement')
+        run: echo "NugetPackageVersionMediaElement=${{ github.ref }}" >> $GITHUB_ENV
+
+      - name: Set NuGet Version to Tag Number for Maps
+        if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-maps')
+        run: echo "NugetPackageVersionMaps=${{ github.ref }}" >> $GITHUB_ENV
+
+      - name: Set NuGet Version to PR Version
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo "NugetPackageVersion=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
+          echo "NugetPackageVersionMediaElement=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
+          echo "NugetPackageVersionMaps=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
+        shell: bash
+
+      - name: Set Xcode version
+        if: runner.os == 'macOS'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitLibrary_Xcode_Version }}.app/Contents/Developer
+
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+
+      - name: Install .NET MAUI Workload
+        run: dotnet workload install maui --skip-sign-check --source https://api.nuget.org/v3/index.json
+
+      - name: Install Tizen Workload
+        run: |
+          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
+          .\workload-install.ps1
+        shell: pwsh
+
+      - name: Display dotnet info
+        run: dotnet --info
+
+      - name: Build CommunityToolkit.Maui
+        run: dotnet build -c Release ${{ env.PathToLibrarySolution }}
+
+      - name: Run CommunityToolkit.Maui.UnitTests
+        run: dotnet test -c Release ${{ env.PathToLibrarySolution }} --settings ".runsettings" --collect "XPlat code coverage" --logger trx --results-directory ${{ runner.temp }}
+
+      - name: Publish Test Results
+        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Test Results
+          path: |
+            ${{ runner.temp }}/**/*.trx
+
+      - name: Pack CommunityToolkit.Maui.Core NuGet
+        run: dotnet pack -c Release ${{ env.PathToCommunityToolkitCoreCsproj }} -p:PackageVersion=${{ env.NugetPackageVersion }}
+
+      - name: Pack CommunityToolkit.Maui NuGet
+        run: dotnet pack -c Release ${{ env.PathToCommunityToolkitCsproj }} -p:PackageVersion=${{ env.NugetPackageVersion }}
+
+      - name: Pack CommunityToolkit.Maui.Camera NuGet
+        run: dotnet pack -c Release ${{ env.PathToCommunityToolkitCameraCsproj }} -p:PackageVersion=${{ env.NugetPackageVersionCamera }}
+
+      - name: Pack CommunityToolkit.Maui.MediaElement NuGet
+        run: dotnet pack -c Release ${{ env.PathToCommunityToolkitMediaElementCsproj }} -p:PackageVersion=${{ env.NugetPackageVersionMediaElement }}
+
+      - name: Pack CommunityToolkit.Maui.Maps NuGet
+        run: dotnet pack -c Release ${{ env.PathToCommunityToolkitMapsCsproj }} -p:PackageVersion=${{ env.NugetPackageVersionMaps }}
+
+      - name: Copy NuGet Packages to Staging Directory
+        if: runner.os == 'Windows' && !startsWith(github.ref, 'refs/tags/')
+        run: |
+          mkdir -p ${{ github.workspace }}/nuget
+          Get-ChildItem -Path "./src" -Recurse | Where-Object { $_.Extension -match "nupkg" } | Copy-Item -Destination "${{ github.workspace }}/nuget"
+        shell: pwsh
+
+      - name: Upload Package List
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
+        with:
+          name: nuget-list
+          if-no-files-found: error
+          path: |
+            ${{ github.workspace }}/.github/workflows/SignClientFileList.txt
+
+      - name: Publish Packages
+        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: packages
+          path: ${{ github.workspace }}/nuget/
+
+  sign:
+    needs: [build_library]
+    if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') }}
+    runs-on: windows-latest
+    permissions:
+      id-token: write # Required for requesting the JWT
+
+    steps:
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+
+      - name: Download NuGet List
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-list
+          path: ./
+
+      - name: Download Package List
+        uses: actions/download-artifact@v4
+        with:
+          name: packages
+          path: ./packages
+
+      - name: Install Signing Tool
+        run: dotnet tool install --tool-path ./tools sign --version 0.9.1-beta.23356.1
+
+      - name: Sign Packages
+        run: >
+          ./tools/sign code azure-key-vault
+          **/*.nupkg
+          --base-directory "${{ github.workspace }}/packages"
+          --file-list "${{ github.workspace }}/SignClientFileList.txt"
+          --timestamp-url "http://timestamp.digicert.com"
+          --publisher-name ".NET Foundation"
+          --description "Community Toolkit MAUI"
+          --description-url "https://github.com/CommunityToolkit/Maui"
+          --azure-key-vault-url "${{ secrets.SIGN_KEY_VAULT_URL }}"
+          --azure-key-vault-client-id ${{ secrets.SIGN_CLIENT_ID }}
+          --azure-key-vault-client-secret "${{ secrets.SIGN_CLIENT_SECRET }}"
+          --azure-key-vault-tenant-id ${{ secrets.SIGN_TENANT_ID }}
+          --azure-key-vault-certificate "${{ secrets.SIGN_CERTIFICATE }}"
+          --verbosity Information
+
+      - name: Publish Packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: signed-packages
+          if-no-files-found: error
+          path: |
+            ${{ github.workspace }}/packages/**/*.nupkg
+
+  release:
+    if: ${{ startsWith(github.ref, 'refs/heads/rel/') }}
+    needs: [sign]
+    environment: nuget-release-gate # This gates this job until manually approved
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+
+      - name: Download signed packages for ${{ matrix.platform }}
+        uses: actions/download-artifact@v4
+        with:
+          name: signed-packages
+          path: ./packages
+
+      - name: Push to NuGet.org
+        run: >
+          dotnet nuget push
+          **/*.nupkg
+          --source https://api.nuget.org/v3/index.json
+          --api-key ${{ secrets.NUGET_PACKAGE_PUSH_TOKEN }}
+          --skip-duplicate
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 31c14c3245..d528d40c3f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,10 +32,10 @@ variables:
   CommunityToolkitLibrary_Xcode_Version: '16.2'
 
 trigger:
-  branches:
-    include:
-    - main
-    - develop
+  # branches:
+  #   include:
+  #   - main
+  #   - develop
   tags:
     include:
     - '*'
@@ -43,15 +43,15 @@ trigger:
     exclude:
     - README.md
 
-pr:
-  autoCancel: 'true'
-  branches:
-    include:
-    - main
-    - develop
-  paths:
-    exclude:
-    - README.md
+# pr:
+#   autoCancel: 'true'
+#   branches:
+#     include:
+#     - main
+#     - develop
+#   paths:
+#     exclude:
+#     - README.md
 
 jobs:
   - job: build_sample

From a96fe612d6bf58a64490d0a2e85ab94116be484c Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:44:11 -0800
Subject: [PATCH 30/39] Remove `[Obsolete]`

This attribute was added automatically by the `dotnet format` CLI command
---
 .../Handlers/MediaElementHandler.android.cs   |  2 +-
 .../Handlers/MediaElementHandler.shared.cs    |  2 +-
 .../Services/MediaControlsService.android.cs  |  2 +-
 .../Views/MauiMediaElement.android.cs         |  2 +-
 .../Views/MediaManager.macios.cs              | 36 +++++++++----------
 .../Behaviors/MaskedBehaviorTests.cs          |  2 +-
 .../MaxLengthReachedBehaviorTests.cs          | 20 +++++------
 .../SetFocusOnEntryCompletedTests.cs          |  6 ++--
 .../UserStoppedTypingBehaviorTests.cs         | 20 +++++------
 .../Views/DrawingView/DrawingViewTests.cs     |  8 ++---
 .../Views/Popup/PopupTests.cs                 | 18 +++++-----
 11 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
index b3eac0a48f..a7ac4b9a3d 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
@@ -17,7 +17,7 @@ public static void ShouldLoopPlayback(MediaElementHandler handler, MediaElement
 		handler.mediaManager?.UpdateShouldLoopPlayback();
 	}
 
-	[Obsolete]
+	
 	protected override MauiMediaElement CreatePlatformView()
 	{
 		mediaManager ??= new(MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} cannot be null"),
diff --git a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
index cf24b345ff..44b91acc4b 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs
@@ -13,7 +13,7 @@ public partial class MediaElementHandler
 	/// <summary>
 	/// The <see cref="MediaManager"/> that is managing the <see cref="IMediaElement"/> instance.
 	/// </summary>
-	[Obsolete]
+	
 	protected MediaManager? mediaManager;
 #endif
 
diff --git a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
index 8e79a99f4c..6d776e8da7 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
@@ -93,7 +93,7 @@ public void UpdateNotifications(in MediaSession session, in PlatformMediaElement
 	}
 
 	[MemberNotNull(nameof(playerNotificationManager))]
-	[Obsolete]
+	
 	public void SetLegacyNotifications(in MediaSession session, in PlatformMediaElement mediaElement)
 	{
 		ArgumentNullException.ThrowIfNull(session);
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
index 6e6092fa4b..416718d202 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
@@ -81,7 +81,7 @@ protected override void OnVisibilityChanged(Android.Views.View changedView, [Gen
 	/// Releases the unmanaged resources used by the <see cref="MediaElement"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-	[Obsolete]
+	
 	protected override void Dispose(bool disposing)
 	{
 		if (disposing)
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
index 0029bef199..7c0b4f72e6 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
@@ -90,7 +90,7 @@ public partial class MediaManager : IDisposable
 	/// Creates the corresponding platform view of <see cref="MediaElement"/> on iOS and macOS.
 	/// </summary>
 	/// <returns>The platform native counterpart of <see cref="MediaElement"/>.</returns>
-	[Obsolete]
+	
 	public (PlatformMediaElement Player, AVPlayerViewController PlayerViewController) CreatePlatformView()
 	{
 		Player = new();
@@ -133,7 +133,7 @@ public void Dispose()
 		GC.SuppressFinalize(this);
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformPlay()
 	{
 		if (Player?.CurrentTime == PlayerItem?.Duration)
@@ -144,13 +144,13 @@ protected virtual partial void PlatformPlay()
 		Player?.Play();
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformPause()
 	{
 		Player?.Pause();
 	}
 
-	[Obsolete]
+	
 	protected virtual async partial Task PlatformSeek(TimeSpan position, CancellationToken token)
 	{
 		token.ThrowIfCancellationRequested();
@@ -191,7 +191,7 @@ protected virtual async partial Task PlatformSeek(TimeSpan position, Cancellatio
 		MediaElement.SeekCompleted();
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformStop()
 	{
 		// There's no Stop method so pause the video and reset its position
@@ -385,7 +385,7 @@ protected virtual partial void PlatformUpdateShouldShowPlaybackControls()
 			MediaElement.ShouldShowPlaybackControls;
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformUpdatePosition()
 	{
 		if (Player is null)
@@ -418,7 +418,7 @@ protected virtual partial void PlatformUpdatePosition()
 		}
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformUpdateVolume()
 	{
 		if (Player is null)
@@ -433,7 +433,7 @@ protected virtual partial void PlatformUpdateVolume()
 		}
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 	{
 		if (Player is null)
@@ -443,7 +443,7 @@ protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 		UIApplication.SharedApplication.IdleTimerDisabled = MediaElement.ShouldKeepScreenOn;
 	}
 
-	[Obsolete]
+	
 	protected virtual partial void PlatformUpdateShouldMute()
 	{
 		if (Player is null)
@@ -463,7 +463,7 @@ protected virtual partial void PlatformUpdateShouldLoopPlayback()
 	/// Releases the unmanaged resources used by the <see cref="MediaManager"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-	[Obsolete]
+	
 	protected virtual void Dispose(bool disposing)
 	{
 		if (disposing)
@@ -548,7 +548,7 @@ protected virtual void Dispose(bool disposing)
 		}
 	}
 
-	[Obsolete]
+	
 	void AddStatusObservers()
 	{
 		if (Player is null)
@@ -563,7 +563,7 @@ void AddStatusObservers()
 		RateObserver = AVPlayer.Notifications.ObserveRateDidChange(RateChanged);
 	}
 
-	[Obsolete]
+	
 	void VolumeChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -578,7 +578,7 @@ void VolumeChanged(NSObservedChange e)
 		}
 	}
 
-	[Obsolete]
+	
 	void MutedChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -617,7 +617,7 @@ void DestroyPlayedToEndObserver()
 		PlayedToEndObserver?.Dispose();
 	}
 
-	[Obsolete]
+	
 	void StatusChanged(NSObservedChange obj)
 	{
 		if (Player is null)
@@ -636,7 +636,7 @@ void StatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
-	[Obsolete]
+	
 	void TimeControlStatusChanged(NSObservedChange obj)
 	{
 		if (Player is null || Player.Status is AVPlayerStatus.Unknown
@@ -658,7 +658,7 @@ void TimeControlStatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
-	[Obsolete]
+	
 	void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 	{
 		string message;
@@ -681,7 +681,7 @@ void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
-	[Obsolete]
+	
 	void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 	{
 		if (args.Notification.Object != PlayerViewController?.Player?.CurrentItem || Player is null)
@@ -707,7 +707,7 @@ void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
-	[Obsolete]
+	
 	void RateChanged(object? sender, NSNotificationEventArgs args)
 	{
 		if (Player is null)
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
index d8faa8683e..931b0caa97 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
@@ -58,7 +58,7 @@ public void ValidMaskWithUniqueUnmaskedCharacterTests(string? mask, char unmaske
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void AttachedToInvalidElementTest()
 	{
 		IReadOnlyList<VisualElement> invalidVisualElements =
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
index 25fbe1c21a..d25ef8f114 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class MaxLengthReachedBehaviorTests() : BaseBehaviorTest<MaxLengthReachedBehavior, InputView>(new MaxLengthReachedBehavior(), new Entry())
 {
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -23,7 +23,7 @@ public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -39,7 +39,7 @@ public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -56,7 +56,7 @@ public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -73,7 +73,7 @@ public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -88,7 +88,7 @@ public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -103,7 +103,7 @@ public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -119,7 +119,7 @@ public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -134,7 +134,7 @@ public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void ShouldNotDismissKeyboardWhenOptionSetToFalse()
 	{
 		// arrange
@@ -149,7 +149,7 @@ public void ShouldNotDismissKeyboardWhenOptionSetToFalse()
 		Assert.True(entry.IsFocused);
 	}
 
-	[Obsolete]
+	
 	static Entry CreateEntry(int? maxLength = 2,
 							  bool shouldDismissKeyboardAutomatically = false,
 							  ICommand? command = null,
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
index 24faf1e414..b66ce8e828 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
@@ -6,7 +6,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class SetFocusOnEntryCompletedTests() : BaseBehaviorTest<SetFocusOnEntryCompletedBehavior, VisualElement>(new SetFocusOnEntryCompletedBehavior(), new View())
 {
 	[Fact]
-	[Obsolete]
+	
 	public void DoesNotSetFocusBeforeCompletion()
 	{
 		// arrange
@@ -22,7 +22,7 @@ public void DoesNotSetFocusBeforeCompletion()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void SetsFocusWhenCompleted()
 	{
 		// arrange
@@ -37,7 +37,7 @@ public void SetsFocusWhenCompleted()
 		Assert.True(entry2.IsFocused);
 	}
 
-	[Obsolete]
+	
 	static Entry CreateEntry(VisualElement? nextElement = null)
 	{
 		var entry = new Entry();
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
index 19a5699eb6..b14e92d809 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class UserStoppedTypingBehaviorTests() : BaseBehaviorTest<UserStoppedTypingBehavior, InputView>(new UserStoppedTypingBehavior(), new Entry())
 {
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -29,7 +29,7 @@ public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	{
 		// arrange
@@ -50,7 +50,7 @@ public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	{
 		// arrange
@@ -75,7 +75,7 @@ public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultipleTimes()
 	{
 		// arrange
@@ -99,7 +99,7 @@ public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultiple
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldDismissKeyboardWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -124,7 +124,7 @@ void HandleEntryUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	{
 		// arrange
@@ -148,7 +148,7 @@ public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
-	[Obsolete]
+	
 	public async Task ShouldNotExecuteCommandWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -187,7 +187,7 @@ void HandleFocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
-	[Obsolete]
+	
 	public async Task ShouldNotDismissKeyboardWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -228,7 +228,7 @@ void HandleUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShouldExecuteCommandImmediatelyWhenMinimumLengthThresholdHasNotBeenSet()
 	{
 		// arrange
@@ -248,7 +248,7 @@ public async Task ShouldExecuteCommandImmediatelyWhenMinimumLengthThresholdHasNo
 		Assert.True(commandHasBeenExecuted);
 	}
 
-	[Obsolete]
+	
 	static Entry CreateEntryWithBehavior(int stoppedTypingTimeThreshold = 500,
 		int minimumLengthThreshold = 0,
 		bool shouldDismissKeyboardAutomatically = false,
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
index cf4eabfb93..5791f6c698 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
@@ -294,7 +294,7 @@ public void OnDrawingLastPointPassedWithCommand()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void OnDrawingLineCompletedLastDrawingLinePassedWithCommand()
 	{
 		var drawingView = new DrawingView();
@@ -316,7 +316,7 @@ public void OnDrawingLineCompletedLastDrawingLinePassedWithCommand()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void OnDrawingLineCompleted_CommandIsNull_LastDrawingLineNotPassed()
 	{
 		var drawingView = new DrawingView();
@@ -353,7 +353,7 @@ public void OnDrawing_CommandIsNull_LastDrawingPointNotPassed()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void OnDrawingLineCompleted_CommandIsNotAllowedExecute_LastDrawingLineNotPassed()
 	{
 		var drawingView = new DrawingView();
@@ -390,7 +390,7 @@ public void OnDrawing_CommandIsNotAllowedExecute_LastDrawingPointNotPassed()
 	}
 
 	[Fact]
-	[Obsolete]
+	
 	public void OnDrawingLineCompletedLastDrawingLinePassedWithEvent()
 	{
 		var drawingView = new DrawingView();
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
index d25f59de79..f22f12b8a8 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
@@ -30,7 +30,7 @@ public void GetRequiredServiceThrowsOnNoContext()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShowPopupAsync_CancellationTokenExpired()
 	{
 		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
@@ -62,7 +62,7 @@ public async Task ShowPopupAsync_CancellationTokenExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShowPopupAsync_CancellationTokenCancelled()
 	{
 		var cts = new CancellationTokenSource();
@@ -94,7 +94,7 @@ public async Task ShowPopupAsync_CancellationTokenCancelled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task CloseAsync_CancellationTokenExpired()
 	{
 		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
@@ -126,7 +126,7 @@ public async Task CloseAsync_CancellationTokenExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task CloseAsync_CancellationTokenCancelled()
 	{
 		var cts = new CancellationTokenSource();
@@ -158,7 +158,7 @@ public async Task CloseAsync_CancellationTokenCancelled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task OnOpenedMapperIsCalled()
 	{
 		var app = Application.Current ?? throw new NullReferenceException();
@@ -194,7 +194,7 @@ public async Task OnOpenedMapperIsCalled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Medium)]
-	[Obsolete]
+	
 	public async Task PopupDismissedByTappingOutsideOfPopup()
 	{
 		var popupClosedTCS = new TaskCompletionSource<(string? Result, bool WasDismissedByTappingOutsideOfPopup)>();
@@ -233,7 +233,7 @@ public async Task PopupDismissedByTappingOutsideOfPopup()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task OnDismissedWithResult()
 	{
 		object? result = null;
@@ -276,7 +276,7 @@ public async Task OnDismissedWithResult()
 
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task OnDismissedWithoutResult()
 	{
 		object? result = null;
@@ -332,7 +332,7 @@ public void NullColorThrowsArgumentNullException()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	[Obsolete]
+	
 	public async Task ShowPopup_IsLogicalChild()
 	{
 		var app = Application.Current ?? throw new NullReferenceException();

From e66f78e1a401ecab32e6997aaa62622dcfd1d256 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:54:39 -0800
Subject: [PATCH 31/39] `dotnet format`

---
 .../Platform/StatusBar/StatusBar.ios.cs       |  6 ++--
 .../Handlers/MediaElementHandler.android.cs   |  2 +-
 .../Views/MauiMediaElement.android.cs         |  1 -
 .../Views/MediaManager.macios.cs              | 29 +++++++---------
 .../Behaviors/MaskedBehaviorTests.cs          |  1 -
 .../MaxLengthReachedBehaviorTests.cs          | 10 ------
 .../SetFocusOnEntryCompletedTests.cs          |  3 --
 .../UserStoppedTypingBehaviorTests.cs         | 10 ------
 .../Views/DrawingView/DrawingViewTests.cs     |  4 ---
 .../Views/Popup/PopupTests.cs                 | 33 +++++++------------
 10 files changed, 27 insertions(+), 72 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 82066d006d..784b818eba 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -41,7 +41,7 @@ public static void SetBarSize(bool isUsingSafeArea)
 	static void PlatformSetColor(Color color)
 	{
 		var uiColor = color.ToPlatform();
-		
+
 		var statusBarTag = new IntPtr(38482);
 		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
@@ -51,7 +51,7 @@ static void PlatformSetColor(Color color)
 			{
 				continue;
 			}
-			
+
 			statusBar ??= new UIView(statusBarFrame.Value);
 			statusBar.Tag = statusBarTag;
 			statusBar.BackgroundColor = uiColor;
@@ -72,7 +72,7 @@ static void PlatformSetColor(Color color)
 	static CGRect GetStatusBarFrame(in UIWindow window, in bool isUsingSafeArea)
 	{
 		var statusBarFrame = UIApplication.SharedApplication.StatusBarFrame;
-		
+
 		return isUsingSafeArea
 			? new CGRect(statusBarFrame.X, statusBarFrame.Y, statusBarFrame.Width, window.SafeAreaInsets.Top)
 			: statusBarFrame;
diff --git a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
index a7ac4b9a3d..c204ef847b 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs
@@ -17,7 +17,7 @@ public static void ShouldLoopPlayback(MediaElementHandler handler, MediaElement
 		handler.mediaManager?.UpdateShouldLoopPlayback();
 	}
 
-	
+
 	protected override MauiMediaElement CreatePlatformView()
 	{
 		mediaManager ??= new(MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} cannot be null"),
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
index 416718d202..50c06b756a 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
@@ -81,7 +81,6 @@ protected override void OnVisibilityChanged(Android.Views.View changedView, [Gen
 	/// Releases the unmanaged resources used by the <see cref="MediaElement"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-	
 	protected override void Dispose(bool disposing)
 	{
 		if (disposing)
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
index 7c0b4f72e6..a97224028b 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
@@ -90,7 +90,6 @@ public partial class MediaManager : IDisposable
 	/// Creates the corresponding platform view of <see cref="MediaElement"/> on iOS and macOS.
 	/// </summary>
 	/// <returns>The platform native counterpart of <see cref="MediaElement"/>.</returns>
-	
 	public (PlatformMediaElement Player, AVPlayerViewController PlayerViewController) CreatePlatformView()
 	{
 		Player = new();
@@ -132,7 +131,6 @@ public void Dispose()
 		Dispose(true);
 		GC.SuppressFinalize(this);
 	}
-
 	
 	protected virtual partial void PlatformPlay()
 	{
@@ -144,12 +142,10 @@ protected virtual partial void PlatformPlay()
 		Player?.Play();
 	}
 
-	
 	protected virtual partial void PlatformPause()
 	{
 		Player?.Pause();
 	}
-
 	
 	protected virtual async partial Task PlatformSeek(TimeSpan position, CancellationToken token)
 	{
@@ -191,7 +187,6 @@ protected virtual async partial Task PlatformSeek(TimeSpan position, Cancellatio
 		MediaElement.SeekCompleted();
 	}
 
-	
 	protected virtual partial void PlatformStop()
 	{
 		// There's no Stop method so pause the video and reset its position
@@ -384,7 +379,6 @@ protected virtual partial void PlatformUpdateShouldShowPlaybackControls()
 		PlayerViewController.ShowsPlaybackControls =
 			MediaElement.ShouldShowPlaybackControls;
 	}
-
 	
 	protected virtual partial void PlatformUpdatePosition()
 	{
@@ -417,7 +411,6 @@ protected virtual partial void PlatformUpdatePosition()
 			MediaElement.Duration = MediaElement.Position = TimeSpan.Zero;
 		}
 	}
-
 	
 	protected virtual partial void PlatformUpdateVolume()
 	{
@@ -433,7 +426,7 @@ protected virtual partial void PlatformUpdateVolume()
 		}
 	}
 
-	
+
 	protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 	{
 		if (Player is null)
@@ -443,7 +436,7 @@ protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 		UIApplication.SharedApplication.IdleTimerDisabled = MediaElement.ShouldKeepScreenOn;
 	}
 
-	
+
 	protected virtual partial void PlatformUpdateShouldMute()
 	{
 		if (Player is null)
@@ -463,7 +456,7 @@ protected virtual partial void PlatformUpdateShouldLoopPlayback()
 	/// Releases the unmanaged resources used by the <see cref="MediaManager"/> and optionally releases the managed resources.
 	/// </summary>
 	/// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-	
+
 	protected virtual void Dispose(bool disposing)
 	{
 		if (disposing)
@@ -548,7 +541,7 @@ protected virtual void Dispose(bool disposing)
 		}
 	}
 
-	
+
 	void AddStatusObservers()
 	{
 		if (Player is null)
@@ -563,7 +556,7 @@ void AddStatusObservers()
 		RateObserver = AVPlayer.Notifications.ObserveRateDidChange(RateChanged);
 	}
 
-	
+
 	void VolumeChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -578,7 +571,7 @@ void VolumeChanged(NSObservedChange e)
 		}
 	}
 
-	
+
 	void MutedChanged(NSObservedChange e)
 	{
 		if (Player is null)
@@ -617,7 +610,7 @@ void DestroyPlayedToEndObserver()
 		PlayedToEndObserver?.Dispose();
 	}
 
-	
+
 	void StatusChanged(NSObservedChange obj)
 	{
 		if (Player is null)
@@ -636,7 +629,7 @@ void StatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
-	
+
 	void TimeControlStatusChanged(NSObservedChange obj)
 	{
 		if (Player is null || Player.Status is AVPlayerStatus.Unknown
@@ -658,7 +651,7 @@ void TimeControlStatusChanged(NSObservedChange obj)
 		MediaElement.CurrentStateChanged(newState);
 	}
 
-	
+
 	void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 	{
 		string message;
@@ -681,7 +674,7 @@ void ErrorOccurred(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
-	
+
 	void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 	{
 		if (args.Notification.Object != PlayerViewController?.Player?.CurrentItem || Player is null)
@@ -707,7 +700,7 @@ void PlayedToEnd(object? sender, NSNotificationEventArgs args)
 		}
 	}
 
-	
+
 	void RateChanged(object? sender, NSNotificationEventArgs args)
 	{
 		if (Player is null)
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
index 931b0caa97..2bbb594f59 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaskedBehaviorTests.cs
@@ -58,7 +58,6 @@ public void ValidMaskWithUniqueUnmaskedCharacterTests(string? mask, char unmaske
 	}
 
 	[Fact]
-	
 	public void AttachedToInvalidElementTest()
 	{
 		IReadOnlyList<VisualElement> invalidVisualElements =
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
index d25ef8f114..47b9e11916 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/MaxLengthReachedBehaviorTests.cs
@@ -7,7 +7,6 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class MaxLengthReachedBehaviorTests() : BaseBehaviorTest<MaxLengthReachedBehavior, InputView>(new MaxLengthReachedBehavior(), new Entry())
 {
 	[Fact]
-	
 	public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -23,7 +22,6 @@ public void ShouldExecuteCommandWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -39,7 +37,6 @@ public void ShouldInvokeEventHandlerWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -56,7 +53,6 @@ public void ShouldExecuteCommandWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
-	
 	public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	{
 		// arrange
@@ -73,7 +69,6 @@ public void ShouldInvokeEventHandlerWithTextValueNoLargerThenMaxLength()
 	}
 
 	[Fact]
-	
 	public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -88,7 +83,6 @@ public void ShouldNotExecuteCommandBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -103,7 +97,6 @@ public void ShouldNotInvokeEventHandlerBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -119,7 +112,6 @@ public void ShouldDismissKeyboardWhenMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	{
 		// arrange
@@ -134,7 +126,6 @@ public void ShouldNotDismissKeyboardBeforeMaxLengthHasBeenReached()
 	}
 
 	[Fact]
-	
 	public void ShouldNotDismissKeyboardWhenOptionSetToFalse()
 	{
 		// arrange
@@ -148,7 +139,6 @@ public void ShouldNotDismissKeyboardWhenOptionSetToFalse()
 		// assert
 		Assert.True(entry.IsFocused);
 	}
-
 	
 	static Entry CreateEntry(int? maxLength = 2,
 							  bool shouldDismissKeyboardAutomatically = false,
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
index b66ce8e828..f3f1eaf454 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/SetFocusOnEntryCompletedTests.cs
@@ -6,7 +6,6 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class SetFocusOnEntryCompletedTests() : BaseBehaviorTest<SetFocusOnEntryCompletedBehavior, VisualElement>(new SetFocusOnEntryCompletedBehavior(), new View())
 {
 	[Fact]
-	
 	public void DoesNotSetFocusBeforeCompletion()
 	{
 		// arrange
@@ -22,7 +21,6 @@ public void DoesNotSetFocusBeforeCompletion()
 	}
 
 	[Fact]
-	
 	public void SetsFocusWhenCompleted()
 	{
 		// arrange
@@ -36,7 +34,6 @@ public void SetsFocusWhenCompleted()
 		// assert
 		Assert.True(entry2.IsFocused);
 	}
-
 	
 	static Entry CreateEntry(VisualElement? nextElement = null)
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
index b14e92d809..c232f5139c 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/UserStoppedTypingBehaviorTests.cs
@@ -7,7 +7,6 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors;
 public class UserStoppedTypingBehaviorTests() : BaseBehaviorTest<UserStoppedTypingBehavior, InputView>(new UserStoppedTypingBehavior(), new Entry())
 {
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -29,7 +28,6 @@ public async Task ShouldExecuteCommandWhenTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	{
 		// arrange
@@ -50,7 +48,6 @@ public async Task ShouldExecuteCommandWithSpecificParameterWhenSpecified()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	{
 		// arrange
@@ -75,7 +72,6 @@ public async Task ShouldNotExecuteCommandBeforeTimeThresholdHasExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultipleTimes()
 	{
 		// arrange
@@ -99,7 +95,6 @@ public async Task ShouldOnlyExecuteCommandOnceWhenTextChangedHasOccurredMultiple
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldDismissKeyboardWhenTimeThresholdHasExpired()
 	{
 		// arrange
@@ -124,7 +119,6 @@ void HandleEntryUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	{
 		// arrange
@@ -148,7 +142,6 @@ public async Task ShouldExecuteCommandWhenMinimumLengthThresholdHasBeenReached()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
-	
 	public async Task ShouldNotExecuteCommandWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -187,7 +180,6 @@ void HandleFocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Long)]
-	
 	public async Task ShouldNotDismissKeyboardWhenMinimumLengthThresholdHasNotBeenReached()
 	{
 		// arrange
@@ -228,7 +220,6 @@ void HandleUnfocused(object? sender, FocusEventArgs e)
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShouldExecuteCommandImmediatelyWhenMinimumLengthThresholdHasNotBeenSet()
 	{
 		// arrange
@@ -247,7 +238,6 @@ public async Task ShouldExecuteCommandImmediatelyWhenMinimumLengthThresholdHasNo
 		// assert
 		Assert.True(commandHasBeenExecuted);
 	}
-
 	
 	static Entry CreateEntryWithBehavior(int stoppedTypingTimeThreshold = 500,
 		int minimumLengthThreshold = 0,
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
index 5791f6c698..f3a60d3467 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
@@ -294,7 +294,6 @@ public void OnDrawingLastPointPassedWithCommand()
 	}
 
 	[Fact]
-	
 	public void OnDrawingLineCompletedLastDrawingLinePassedWithCommand()
 	{
 		var drawingView = new DrawingView();
@@ -316,7 +315,6 @@ public void OnDrawingLineCompletedLastDrawingLinePassedWithCommand()
 	}
 
 	[Fact]
-	
 	public void OnDrawingLineCompleted_CommandIsNull_LastDrawingLineNotPassed()
 	{
 		var drawingView = new DrawingView();
@@ -353,7 +351,6 @@ public void OnDrawing_CommandIsNull_LastDrawingPointNotPassed()
 	}
 
 	[Fact]
-	
 	public void OnDrawingLineCompleted_CommandIsNotAllowedExecute_LastDrawingLineNotPassed()
 	{
 		var drawingView = new DrawingView();
@@ -390,7 +387,6 @@ public void OnDrawing_CommandIsNotAllowedExecute_LastDrawingPointNotPassed()
 	}
 
 	[Fact]
-	
 	public void OnDrawingLineCompletedLastDrawingLinePassedWithEvent()
 	{
 		var drawingView = new DrawingView();
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
index f22f12b8a8..9a16351207 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
@@ -30,7 +30,6 @@ public void GetRequiredServiceThrowsOnNoContext()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShowPopupAsync_CancellationTokenExpired()
 	{
 		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
@@ -48,7 +47,7 @@ public async Task ShowPopupAsync_CancellationTokenExpired()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		var popupHandler = CreateElementHandler<MockPopupHandler>(popup);
 
@@ -62,7 +61,6 @@ public async Task ShowPopupAsync_CancellationTokenExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShowPopupAsync_CancellationTokenCancelled()
 	{
 		var cts = new CancellationTokenSource();
@@ -80,7 +78,7 @@ public async Task ShowPopupAsync_CancellationTokenCancelled()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		var popupHandler = CreateElementHandler<MockPopupHandler>(popup);
 
@@ -94,7 +92,6 @@ public async Task ShowPopupAsync_CancellationTokenCancelled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task CloseAsync_CancellationTokenExpired()
 	{
 		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
@@ -112,7 +109,7 @@ public async Task CloseAsync_CancellationTokenExpired()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		var popupHandler = CreateElementHandler<MockPopupHandler>(popup);
 
@@ -126,7 +123,6 @@ public async Task CloseAsync_CancellationTokenExpired()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task CloseAsync_CancellationTokenCancelled()
 	{
 		var cts = new CancellationTokenSource();
@@ -144,7 +140,7 @@ public async Task CloseAsync_CancellationTokenCancelled()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		var popupHandler = CreateElementHandler<MockPopupHandler>(popup);
 
@@ -158,7 +154,6 @@ public async Task CloseAsync_CancellationTokenCancelled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task OnOpenedMapperIsCalled()
 	{
 		var app = Application.Current ?? throw new NullReferenceException();
@@ -174,7 +169,7 @@ public async Task OnOpenedMapperIsCalled()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		var popupHandler = CreateElementHandler<MockPopupHandler>(popup);
 
@@ -194,7 +189,6 @@ public async Task OnOpenedMapperIsCalled()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Medium)]
-	
 	public async Task PopupDismissedByTappingOutsideOfPopup()
 	{
 		var popupClosedTCS = new TaskCompletionSource<(string? Result, bool WasDismissedByTappingOutsideOfPopup)>();
@@ -217,7 +211,7 @@ public async Task PopupDismissedByTappingOutsideOfPopup()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		CreateElementHandler<MockPopupHandler>(popup);
 
@@ -233,7 +227,6 @@ public async Task PopupDismissedByTappingOutsideOfPopup()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task OnDismissedWithResult()
 	{
 		object? result = null;
@@ -252,7 +245,7 @@ public async Task OnDismissedWithResult()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		// Make sure that our popup will have a Handler
 		CreateElementHandler<MockPopupHandler>(popup);
@@ -276,7 +269,6 @@ public async Task OnDismissedWithResult()
 
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task OnDismissedWithoutResult()
 	{
 		object? result = null;
@@ -294,7 +286,7 @@ public async Task OnDismissedWithoutResult()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		// Make sure that our popup will have a Handler
 		CreateElementHandler<MockPopupHandler>(popup);
@@ -332,7 +324,6 @@ public void NullColorThrowsArgumentNullException()
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	
 	public async Task ShowPopup_IsLogicalChild()
 	{
 		var app = Application.Current ?? throw new NullReferenceException();
@@ -348,7 +339,7 @@ public async Task ShowPopup_IsLogicalChild()
 		// Make sure that our page will have a Handler
 		CreateViewHandler<MockPageHandler>(page);
 
-		app.MainPage = page;
+		app.Windows[0].Page = page;
 
 		// Make sure that our popup will have a Handler
 		CreateElementHandler<MockPopupHandler>(popup);
@@ -364,14 +355,14 @@ public async Task ShowPopup_IsLogicalChild()
 		Assert.Single(page.LogicalChildrenInternal);
 	}
 
-	class MockPopup : Popup
+	sealed class MockPopup : Popup
 	{
 		public MockPopup()
 		{
 			ResultWhenUserTapsOutsideOfPopup = resultWhenUserTapsOutsideOfPopup;
 		}
 
-		protected override async Task OnClosed(object? result, bool wasDismissedByTappingOutsideOfPopup, CancellationToken token)
+		protected override async Task OnClosed(object? result, bool wasDismissedByTappingOutsideOfPopup, CancellationToken token = default)
 		{
 			await Task.Delay(100, token);
 
@@ -381,7 +372,7 @@ protected override async Task OnClosed(object? result, bool wasDismissedByTappin
 		}
 	}
 
-	class PopupViewModel : INotifyPropertyChanged
+	sealed class PopupViewModel : INotifyPropertyChanged
 	{
 		public event PropertyChangedEventHandler? PropertyChanged;
 

From fa3e834529a1de61236386c0d64dc4d806f2b8bf Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Mon, 20 Jan 2025 16:31:57 +0100
Subject: [PATCH 32/39] Add IProvideParentValues as required service for
 AppThemeResourceExtension (#2460)

---
 .../Extensions/AppThemeResourceExtension.shared.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs b/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs
index 2400efcf8e..f96cbe622f 100644
--- a/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs
@@ -3,7 +3,7 @@
 /// <summary>
 /// A XAML markup extension that enables using <see cref="AppThemeColor"/> and <see cref="AppThemeObject"/> from XAML.
 /// </summary>
-[ContentProperty(nameof(Key)), RequireService([typeof(IServiceProvider)])]
+[ContentProperty(nameof(Key)), RequireService([typeof(IServiceProvider), typeof(IProvideParentValues)])]
 public sealed class AppThemeResourceExtension : IMarkupExtension<BindingBase>
 {
 	/// <summary>

From 20c9f1a8717807ffe5211ad4ab595b6d7b2c099e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:50:01 -0800
Subject: [PATCH 33/39] Bump coverlet.collector from 6.0.3 to 6.0.4 in /samples
 (#2458)

---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index da1623e571..0a24dcfce9 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" PrivateAssets="All" />
-    <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
   </ItemGroup>
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index c819ff3307..158e359f99 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit.v3" Version="1.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" PrivateAssets="All" />
-    <PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="All" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>
   </ItemGroup>
 

From 55553243e0ebf2a05de1bca6da0bbcc3d2513e80 Mon Sep 17 00:00:00 2001
From: Ulric DE GASPERIN <144207322+UlriCode@users.noreply.github.com>
Date: Tue, 21 Jan 2025 01:50:31 +0100
Subject: [PATCH 34/39] [CameraView] Android - Fix SetSurfaceProvider crash
 (#2449)

---
 src/CommunityToolkit.Maui.Camera/CameraManager.android.cs     | 4 ++--
 .../CommunityToolkit.Maui.Camera.csproj                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 23cfdd4c63..f3a23aa830 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -172,7 +172,7 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
 
 	protected async Task StartUseCase(CancellationToken token)
 	{
-		if (resolutionSelector is null)
+		if (resolutionSelector is null || cameraExecutor is null)
 		{
 			return;
 		}
@@ -183,7 +183,7 @@ protected async Task StartUseCase(CancellationToken token)
 		imageCapture?.Dispose();
 
 		cameraPreview = new Preview.Builder().SetResolutionSelector(resolutionSelector).Build();
-		cameraPreview.SetSurfaceProvider(previewView?.SurfaceProvider);
+		cameraPreview.SetSurfaceProvider(cameraExecutor, previewView?.SurfaceProvider);
 
 		imageCapture = new ImageCapture.Builder()
 		.SetCaptureMode(ImageCapture.CaptureModeMaximizeQuality)
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index abb23f8555..e21362b7d6 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -51,8 +51,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1" />
 
     <!--  Ensure Linker does not remove required libraries -->
     <None Include="linker.xml" Pack="true" PackagePath="build\$(PackageId).LinkerConfigurationFile.xml" />

From 597939033e8f339bbf20b426d7029f5881fa77d6 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 21 Jan 2025 01:50:36 +0100
Subject: [PATCH 35/39] Add UnconditionalSuppressMessage to fix IL2092 (#2461)

---
 .../Converters/ICommunityToolkitValueConverter.shared.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Converters/ICommunityToolkitValueConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/ICommunityToolkitValueConverter.shared.cs
index 51b77034bd..465fc96c16 100644
--- a/src/CommunityToolkit.Maui/Converters/ICommunityToolkitValueConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/ICommunityToolkitValueConverter.shared.cs
@@ -52,12 +52,12 @@ public interface ICommunityToolkitValueConverter : IValueConverter
 
 
 	/// <inheritdoc />
-#pragma warning disable IL2092
+	[UnconditionalSuppressMessage("TrimAnalysis", "IL2092", Justification = "The ToType and FromType properties are attributed with the appropriate DynamicallyAccessedMembers attributes.")]
 	object? IValueConverter.Convert(object? value, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type targetType, object? parameter, CultureInfo culture) =>
 		Convert(value, targetType, parameter, culture);
 
 	/// <inheritdoc />
+	[UnconditionalSuppressMessage("TrimAnalysis", "IL2092", Justification = "The ToType and FromType properties are attributed with the appropriate DynamicallyAccessedMembers attributes.")]
 	object? IValueConverter.ConvertBack(object? value, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type targetType, object? parameter, CultureInfo culture) =>
 		ConvertBack(value, targetType, parameter, culture);
-#pragma warning restore IL2092
 }
\ No newline at end of file

From dec248e70539f004ccd5f2c64ebf5172ba49d947 Mon Sep 17 00:00:00 2001
From: James Crutchley <ne0rmatrix@gmail.com>
Date: Wed, 22 Jan 2025 11:51:12 -0800
Subject: [PATCH 36/39] Update MediaElement Transport Controls for Windows
 (#2329)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add custom transport controls and resource dictionary

Introduced a new embedded resource, `ResourceDictionary.windows.xaml`, in the `CommunityToolkit.Maui.MediaElement.csproj` project file.

Updated `MauiMediaElement.windows.cs`:
- Imported new namespaces.
- Added `CustomTransportControls` field and methods for loading resource dictionary and applying custom styles.
- Updated constructor to load resource dictionary and set custom transport controls.
- Added `LoadResourceDictionary`, `ApplyCustomStyle`, and `SetTransportControls` methods.
- Updated `Dispose` method to handle custom transport controls.
- Removed `OnMediaPlayerElementPointerMoved` method and related code.
- Updated `OnFullScreenButtonClick` method to remove fullscreen button references.

Updated `MediaManager.windows.cs`:
- Disabled `SystemMediaTransportControls` in `CreatePlatformView`.

Added `CustomTransportControls` class in `CommunityToolkit.Maui.Primitives`:
- Imported necessary namespaces.
- Defined `FullScreenButton` property.
- Implemented `OnTemplateLoaded` event.
- Overrode `OnApplyTemplate` method to add full-screen button.
- Added `FullScreenButton_Click` event handler.
- Introduced `isFullScreen` field to track full-screen state.

* Reorder AppBarSeparator in ResourceDictionary.xaml

Moved RightSeparator before PlaybackRateButton in ResourceDictionary.windows.xaml. Added RightSeparator with Height='0', Width='0', and Margin='0,0'. Reordered properties of PlaybackRateButton without changing values. Removed original RightSeparator after PlaybackRateButton.

* Re-add and enhance media control styles and templates

Re-added various properties and elements to styles and templates in `ResourceDictionary.windows.xaml` to ensure consistent UI appearance and behavior. Added new buttons like `ZoomButton` and `CastButton` to the media controls command bar. Enhanced `customTransportcontrols` and `CommandBarStyle` with additional properties.

* Update layout properties and add corner radius to Grid

Removed the `UseLayoutRounding` property and adjusted the `Margin`
property from `0,0,0,20` to `0,0,0,10`. Added `VerticalContentAlignment`
set to `Center` and `VerticalAlignment` set to `Bottom`. Introduced
`CornerRadius` of `8,8,8,8` to the `Grid` element in the
`ResourceDictionary.windows.xaml` file.

* Refactor CustomTransportControls class and clean up code

- Cleaned up `using` directives by removing redundant `using CommunityToolkit.Maui.Core;` and reordering the remaining directives.
- Changed `CustomTransportControls` class from public sealed to sealed partial.
- Removed XML documentation comments for `CustomTransportControls` class and its members.
- Changed `FullScreenButton` property from nullable `AppBarButton` with a private setter to non-nullable `AppBarButton` initialized with a new instance.
- Removed null check for `FullScreenButton` in `FullScreenButton_Click` method as `FullScreenButton` is no longer nullable.

* Fix volume slider bug with Should Mute

---------

Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Co-authored-by: Víctor Hugo García Hernández <vhugogarcia@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 .../CommunityToolkit.Maui.MediaElement.csproj |   5 +
 .../CustomTransportControls.windows.cs        |  43 +
 .../ResourceDictionary.windows.xaml           | 799 ++++++++++++++++++
 .../Views/MauiMediaElement.windows.cs         | 128 +--
 .../Views/MediaManager.windows.cs             |   7 +-
 5 files changed, 920 insertions(+), 62 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/Primitives/CustomTransportControls.windows.cs
 create mode 100644 src/CommunityToolkit.Maui.MediaElement/ResourceDictionary.windows.xaml

diff --git a/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj b/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
index c3c93f8320..d770a5273c 100644
--- a/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
+++ b/src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj
@@ -81,4 +81,9 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="ResourceDictionary.windows.xaml">
+      <LogicalName>ResourceDictionary.windows.xaml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/CustomTransportControls.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/CustomTransportControls.windows.cs
new file mode 100644
index 0000000000..fe9c130c8a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/Primitives/CustomTransportControls.windows.cs
@@ -0,0 +1,43 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+namespace CommunityToolkit.Maui.Primitives;
+
+sealed partial class CustomTransportControls : MediaTransportControls
+{
+	public event EventHandler<EventArgs>? OnTemplateLoaded;
+	public AppBarButton FullScreenButton = new();
+	bool isFullScreen = false;
+
+	public CustomTransportControls()
+	{
+		this.DefaultStyleKey = typeof(CustomTransportControls);
+	}
+
+	protected override void OnApplyTemplate()
+	{
+		base.OnApplyTemplate();
+
+		var temp = GetTemplateChild("FullWindowButton") as AppBarButton;
+		if(temp is not null)
+		{
+			FullScreenButton = temp;
+			FullScreenButton.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+			OnTemplateLoaded?.Invoke(this, EventArgs.Empty);
+			FullScreenButton.Click += FullScreenButton_Click;
+		}
+	}
+
+	void FullScreenButton_Click(object sender, RoutedEventArgs e)
+	{
+		if (isFullScreen)
+		{
+			FullScreenButton.Icon = new FontIcon { Glyph = "\uE740" };
+			isFullScreen = false;
+		}
+		else
+		{
+			FullScreenButton.Icon = new SymbolIcon(Symbol.BackToWindow);
+			isFullScreen = true;
+		}
+	}
+}
diff --git a/src/CommunityToolkit.Maui.MediaElement/ResourceDictionary.windows.xaml b/src/CommunityToolkit.Maui.MediaElement/ResourceDictionary.windows.xaml
new file mode 100644
index 0000000000..4d1cc2e70b
--- /dev/null
+++ b/src/CommunityToolkit.Maui.MediaElement/ResourceDictionary.windows.xaml
@@ -0,0 +1,799 @@
+<ResourceDictionary  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+
+    <Style x:Key="customTransportcontrols" TargetType="muxc:MediaTransportControls">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FlowDirection" Value="LeftToRight" />
+        <Setter Property="Width" Value="{StaticResource MediaTransportControlsMaxWidth}" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+        <Setter Property="Margin" Value="0,0,0,10" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="IsTextScaleFactorEnabled" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MediaTransportControls">
+                    <Grid x:Name="RootGrid" Background="Transparent" CornerRadius="8,8,8,8">
+
+                        <Grid.Resources>
+                            <!-- New AppBar button style 48x48 pixels in size -->
+                            <Style x:Key="AppBarButtonStyle" TargetType="AppBarButton" BasedOn="{StaticResource AppBarButtonRevealStyle}">
+                                <Setter Property="Width" Value="{ThemeResource MTCMediaButtonWidth}" />
+                                <Setter Property="Height" Value="{ThemeResource MTCMediaButtonHeight}" />
+                                <Setter Property="AllowFocusOnInteraction" Value="True" />
+                            </Style>
+                            <!-- New AppBarToggle button style 48x48 pixels in size -->
+                            <Style x:Key="AppBarToggleButtonStyle" TargetType="AppBarToggleButton" BasedOn="{StaticResource AppBarToggleButtonRevealStyle}">
+                                <Setter Property="Width" Value="{ThemeResource MTCMediaButtonWidth}" />
+                                <Setter Property="Height" Value="{ThemeResource MTCMediaButtonHeight}" />
+                                <Setter Property="AllowFocusOnInteraction" Value="True" />
+                            </Style>
+                            <!-- New CommandBar Style -->
+                            <Style x:Key="CommandBarStyle" TargetType="CommandBar">
+                                <Setter Property="Height" Value="{ThemeResource MTCMediaButtonHeight}" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                            </Style>
+                            <!-- Style for Error Message text -->
+                            <Style x:Key="MediaTextBlockStyle" TargetType="TextBlock">
+                                <Setter Property="VerticalAlignment" Value="Center" />
+                                <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                <Setter Property="FontSize" Value="{ThemeResource MTCMediaFontSize}" />
+                                <Setter Property="FontFamily" Value="{ThemeResource MTCMediaFontFamily}" />
+                                <Setter Property="Style" Value="{ThemeResource CaptionTextBlockStyle }" />
+                                <Setter Property="IsTextScaleFactorEnabled" Value="True" />
+                            </Style>
+                            <!-- Style for Position slider used in Media Transport Controls -->
+                            <Style x:Key="MediaSliderStyle" TargetType="Slider">
+                                <Setter Property="Background" Value="{ThemeResource SliderTrackFill}" />
+                                <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
+                                <Setter Property="Foreground" Value="{ThemeResource SliderTrackValueFill}" />
+                                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+                                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+                                <Setter Property="ManipulationMode" Value="None" />
+                                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                                <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+                                <Setter Property="IsFocusEngagementEnabled" Value="True" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Slider">
+                                            <Grid Margin="{TemplateBinding Padding}">
+                                                <Grid.Resources>
+                                                    <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+                                                        <Setter Property="BorderThickness" Value="0" />
+                                                        <Setter Property="Background" Value="{ThemeResource SliderThumbBackground}" />
+                                                        <Setter Property="Foreground" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
+                                                        <Setter Property="Template">
+                                                            <Setter.Value>
+                                                                <ControlTemplate TargetType="Thumb">
+                                                                    <Ellipse x:Name="ellipse"
+								                                        Stroke="{TemplateBinding Background}"
+								                                        StrokeThickness="2"
+								                                        Fill="{TemplateBinding Foreground}" />
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </Style>
+                                                    <Style TargetType="ProgressBar" x:Key="MediaSliderProgressBarStyle">
+                                                        <Setter Property="Height" Value="{ThemeResource SliderTrackThemeHeight}" />
+                                                        <Setter Property="Minimum" Value="0" />
+                                                        <Setter Property="Maximum" Value="100" />
+                                                        <Setter Property="Foreground" Value="{ThemeResource SystemControlHighlightChromeAltLowBrush}" />
+                                                        <Setter Property="Background" Value="Transparent" />
+                                                        <Setter Property="BorderBrush" Value="Transparent" />
+                                                        <Setter Property="BorderThickness" Value="1" />
+                                                    </Style>
+                                                </Grid.Resources>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="*" />
+                                                </Grid.RowDefinitions>
+
+                                                <VisualStateManager.VisualStateGroups>
+                                                    <VisualStateGroup x:Name="CommonStates">
+                                                        <VisualState x:Name="Normal" />
+
+                                                        <VisualState x:Name="Pressed">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderContainerBackgroundPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillPressed}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+
+                                                        <VisualState x:Name="Disabled">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderHeaderForegroundDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTickBarFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTickBarFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTickBarFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTickBarFillDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderContainerBackgroundDisabled}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+
+                                                        <VisualState x:Name="PointerOver">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackFillPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SliderTrackValueFillPointerOver}" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                    </VisualStateGroup>
+                                                    <VisualStateGroup x:Name="FocusEngagementStates">
+                                                        <VisualState x:Name="FocusDisengaged" />
+                                                        <VisualState x:Name="FocusEngagedHorizontal">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                        <VisualState x:Name="FocusEngagedVertical">
+                                                            <Storyboard>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </VisualState>
+                                                    </VisualStateGroup>
+                                                </VisualStateManager.VisualStateGroups>
+                                                <ContentPresenter x:Name="HeaderContentPresenter"
+                                                    x:DeferLoadStrategy="Lazy"
+                                                    Visibility="Collapsed"
+                                                    Foreground="{ThemeResource SliderHeaderForeground}"
+                                                    Margin="{ThemeResource SliderHeaderThemeMargin}"
+                                                    Content="{TemplateBinding Header}"
+                                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                    FontWeight="{ThemeResource SliderHeaderThemeFontWeight}"
+                                                    TextWrapping="Wrap" />
+                                                <Grid x:Name="SliderContainer"
+                                                    Background="{ThemeResource SliderContainerBackground}"
+                                                    Grid.Row="1"
+                                                    Control.IsTemplateFocusTarget="True">
+                                                    <Grid x:Name="HorizontalTemplate" MinHeight="44">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="18" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="18" />
+                                                        </Grid.RowDefinitions>
+                                                        <Rectangle x:Name="HorizontalTrackRect"
+				                                            Fill="{TemplateBinding Background}"
+				                                            Height="{ThemeResource SliderTrackThemeHeight}"
+				                                            Grid.Row="1"
+				                                            Grid.ColumnSpan="3" />
+                                                        <ProgressBar x:Name="DownloadProgressIndicator"
+							                                Style="{StaticResource MediaSliderProgressBarStyle}"
+							                                Grid.Row="1"
+							                                Grid.ColumnSpan="3"
+							                                HorizontalAlignment="Stretch"
+							                                VerticalAlignment="Center" />
+                                                        <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" />
+                                                        <TickBar x:Name="TopTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderTickBarFill}"
+				                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+				                                            VerticalAlignment="Bottom"
+				                                            Margin="0,0,0,4"
+				                                            Grid.ColumnSpan="3" />
+                                                        <TickBar x:Name="HorizontalInlineTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+				                                            Height="{ThemeResource SliderTrackThemeHeight}"
+				                                            Grid.Row="1"
+				                                            Grid.ColumnSpan="3" />
+                                                        <TickBar x:Name="BottomTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderTickBarFill}"
+				                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+				                                            VerticalAlignment="Top"
+				                                            Margin="0,4,0,0"
+				                                            Grid.Row="2"
+				                                            Grid.ColumnSpan="3" />
+                                                        <Thumb x:Name="HorizontalThumb"
+							                                Style="{StaticResource SliderThumbStyle}"
+							                                Height="24"
+							                                Width="24"
+							                                Grid.Row="0"
+							                                Grid.RowSpan="3"
+							                                Grid.Column="1"
+							                                FocusVisualMargin="-14,-6,-14,-6"
+							                                AutomationProperties.AccessibilityView="Raw">
+                                                            <ToolTipService.ToolTip>
+                                                                <ToolTip x:Name="ThumbnailTooltip">
+                                                                    <ContentPresenter Content="{Binding}" />
+                                                                </ToolTip>
+                                                            </ToolTipService.ToolTip>
+                                                            <Thumb.DataContext>
+                                                                <Grid Height="112" Width="192">
+                                                                    <Image x:Name="ThumbnailImage" />
+                                                                    <Border Background="{ThemeResource SystemControlBackgroundBaseMediumBrush}"
+								                                VerticalAlignment="Bottom"
+								                                HorizontalAlignment="Left">
+                                                                        <TextBlock x:Name="TimeElapsedPreview"
+							                                      Margin="6,1,6,3"
+							                                      Style="{StaticResource BodyTextBlockStyle}"
+							                                      IsTextScaleFactorEnabled="True"
+							                                      Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
+                                                                    </Border>
+                                                                </Grid>
+                                                            </Thumb.DataContext>
+                                                        </Thumb>
+                                                    </Grid>
+                                                    <Grid x:Name="VerticalTemplate" MinWidth="44" Visibility="Collapsed">
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="18" />
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="18" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Rectangle x:Name="VerticalTrackRect"
+				                                            Fill="{TemplateBinding Background}"
+				                                            Width="{ThemeResource SliderTrackThemeHeight}"
+				                                            Grid.Column="1"
+				                                            Grid.RowSpan="3" />
+                                                        <Rectangle x:Name="VerticalDecreaseRect"
+				                                            Fill="{TemplateBinding Foreground}"
+				                                            Grid.Column="1"
+				                                            Grid.Row="2" />
+                                                        <TickBar x:Name="LeftTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderTickBarFill}"
+				                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+				                                            HorizontalAlignment="Right"
+				                                            Margin="0,0,4,0"
+				                                            Grid.RowSpan="3" />
+                                                        <TickBar x:Name="VerticalInlineTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+				                                            Width="{ThemeResource SliderTrackThemeHeight}"
+				                                            Grid.Column="1"
+				                                            Grid.RowSpan="3" />
+                                                        <TickBar x:Name="RightTickBar"
+				                                            Visibility="Collapsed"
+				                                            Fill="{ThemeResource SliderTickBarFill}"
+				                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+				                                            HorizontalAlignment="Left"
+				                                            Margin="4,0,0,0"
+				                                            Grid.Column="2"
+				                                            Grid.RowSpan="3" />
+                                                        <Thumb x:Name="VerticalThumb"
+				                                            Style="{StaticResource SliderThumbStyle}"
+				                                            DataContext="{TemplateBinding Value}"
+				                                            Width="24"
+				                                            Height="8"
+				                                            Grid.Row="1"
+				                                            Grid.Column="0"
+				                                            Grid.ColumnSpan="3"
+				                                            FocusVisualMargin="-6,-14,-6,-14"
+				                                            AutomationProperties.AccessibilityView="Raw" />
+                                                    </Grid>
+                                                </Grid>
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                            <!-- Style for Volume Flyout used in Media Transport Controls -->
+                            <Style x:Key="FlyoutStyle" TargetType="FlyoutPresenter">
+                                <Setter Property="Background" Value="{ThemeResource MediaTransportControlsFlyoutBackground}" />
+                                <Setter Property="Padding" Value="0" />
+                            </Style>
+                        </Grid.Resources>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <!-- ControlPanel Visibility states -->
+                            <VisualStateGroup x:Name="ControlPanelVisibilityStates">
+                                <VisualState x:Name="ControlPanelFadeIn">
+
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ControlPanel_ControlPanelVisibilityStates_Border">
+                                            <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="1" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetProperty="Y" Storyboard.TargetName="TranslateVertical" From="50" To="0.5" Duration="0:0:0.3" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="ControlPanelFadeOut">
+
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ControlPanel_ControlPanelVisibilityStates_Border">
+                                            <EasingDoubleKeyFrame KeyTime="0" Value="1" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:0.7" Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="ControlPanel_ControlPanelVisibilityStates_Border">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetProperty="Y" Storyboard.TargetName="TranslateVertical" From="0.5" To="50" Duration="0:0:0.7" />
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- ControlPanel Visibility states -->
+                            <!-- Media state visual states -->
+                            <VisualStateGroup x:Name="MediaStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Buffering">
+                                    <VisualState.Setters>
+                                        <Setter Target="BufferingProgressBar.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Loading">
+                                    <VisualState.Setters>
+                                        <Setter Target="BufferingProgressBar.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ProgressSlider"
+					                Storyboard.TargetProperty="Opacity"
+					                To="0"
+					                Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="MediaControlsCommandBar"
+					                Storyboard.TargetProperty="Opacity"
+					                To="0"
+					                Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Error">
+                                    <VisualState.Setters>
+                                        <Setter Target="ErrorBorder.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard />
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- Media state visual states -->
+                            <!-- Audio Selection Button visibility states -->
+                            <VisualStateGroup x:Name="AudioSelectionAvailablityStates">
+                                <VisualState x:Name="AudioSelectionAvailable">
+                                    <VisualState.Setters>
+                                        <Setter Target="AudioTracksSelectionButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="AudioSelectionUnavailable" />
+
+                            </VisualStateGroup>
+                            <!-- Video volume visibility states -->
+                            <!-- Closed Captioning Selection Button visibility states -->
+                            <VisualStateGroup x:Name="CCSelectionAvailablityStates">
+                                <VisualState x:Name="CCSelectionAvailable">
+                                    <VisualState.Setters>
+                                        <Setter Target="CCSelectionButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="CCSelectionUnavailable" />
+
+                            </VisualStateGroup>
+                            <!-- Closed Captioning  visibility states -->
+                            <!-- Focus states -->
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="FocusVisualWhite"
+					                Storyboard.TargetProperty="Opacity"
+					                To="1"
+					                Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="FocusVisualBlack"
+					                Storyboard.TargetProperty="Opacity"
+					                To="1"
+					                Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+
+                            </VisualStateGroup>
+                            <!-- Focus states -->
+                            <VisualStateGroup x:Name="MediaTransportControlMode">
+                                <VisualState x:Name="NormalMode" />
+                                <VisualState x:Name="CompactMode">
+                                    <VisualState.Setters>
+                                        <Setter Target="LeftSidePlayBorder.Visibility" Value="Visible" />
+                                        <Setter Target="TimeTextGrid.Visibility" Value="Collapsed" />
+                                        <Setter Target="MediaTransportControls_Command_Border.(Grid.Column)" Value="2" />
+                                        <Setter Target="MediaTransportControls_Command_Border.(Grid.Row)" Value="1" />
+                                        <Setter Target="MediaControlsCommandBar.Margin" Value="0" />
+                                        <Setter Target="PlayPauseButton.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- PlayPause states -->
+                            <VisualStateGroup x:Name="PlayPauseStates">
+                                <VisualState x:Name="PlayState" />
+                                <VisualState x:Name="PauseState">
+                                    <VisualState.Setters>
+                                        <Setter Target="PlayPauseSymbolLeft.Symbol" Value="Pause" />
+                                        <Setter Target="PlayPauseSymbol.Symbol" Value="Pause" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- VolumeMute states -->
+                            <VisualStateGroup x:Name="VolumeMuteStates">
+                                <VisualState x:Name="VolumeState" />
+                                <VisualState x:Name="MuteState">
+                                    <VisualState.Setters>
+                                        <Setter Target="AudioMuteSymbol.Symbol" Value="Mute" />
+                                        <Setter Target="VolumeMuteSymbol.Symbol" Value="Mute" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- FullWindow states -->
+                            <VisualStateGroup x:Name="FullWindowStates">
+                                <VisualState x:Name="NonFullWindowState">
+                                    <VisualState.Setters>
+                                        <Setter Target="FullWindowSymbol.Glyph" Value="&#xE740;" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="FullWindowState">
+                                    <VisualState.Setters>
+                                        <Setter Target="FullWindowSymbol.Glyph" Value="&#xE73F;" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <!-- Repeat states -->
+                            <VisualStateGroup x:Name="RepeatStates">
+                                <VisualState x:Name="RepeatNoneState" />
+                                <VisualState x:Name="RepeatOneState">
+                                    <VisualState.Setters>
+                                        <Setter Target="RepeatSymbol.Symbol" Value="RepeatOne" />
+                                        <Setter Target="RepeatButton.IsChecked" Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="RepeatAllState">
+                                    <VisualState.Setters>
+                                        <Setter Target="RepeatButton.IsChecked" Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                        <Border x:Name="ControlPanel_ControlPanelVisibilityStates_Border">
+                            <Grid x:Name="ControlPanelGrid"
+			              Background="{ThemeResource MediaTransportControlsPanelBackground}"
+			              VerticalAlignment="Bottom"
+			              RenderTransformOrigin="0.5,0.5">
+                                <Grid.RenderTransform>
+                                    <TranslateTransform x:Name="TranslateVertical" />
+                                </Grid.RenderTransform>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Border x:Name="ErrorBorder"
+				            Width="320"
+				            Height="96"
+				            Grid.ColumnSpan="3"
+				            HorizontalAlignment="Center"
+				            Background="{ThemeResource MediaTransportControlsPanelBackground}"
+				            Visibility="Collapsed">
+                                    <TextBlock x:Name="ErrorTextBlock"
+				              Style="{StaticResource MediaTextBlockStyle}"
+				              TextWrapping="WrapWholeWords"
+				              Margin="12" />
+                                </Border>
+                                <Border x:Name="MediaTransportControls_Timeline_Border" Grid.Column="1" Grid.Row="1">
+                                    <Grid x:Name="MediaTransportControls_Timeline_Grid">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+                                        <Slider x:Name="ProgressSlider"
+					                Style="{StaticResource MediaSliderStyle}"
+					                Margin="12,0"
+					                MinWidth="80"
+					                Height="33"
+					                VerticalAlignment="Center"
+					                IsThumbToolTipEnabled="False" />
+                                        <ProgressBar x:Name="BufferingProgressBar"
+					                Height="4"
+					                IsIndeterminate="True"
+					                IsHitTestVisible="False"
+					                VerticalAlignment="Top"
+					                Margin="0,2,0,0"
+					                Visibility="Collapsed" />
+                                        <Grid x:Name="TimeTextGrid"
+					                Margin="12,0"
+					                Grid.Row="1">
+                                            <TextBlock x:Name="TimeElapsedElement"
+					                  Style="{StaticResource MediaTextBlockStyle}"
+					                  Margin="0"
+					                  Text="00:00"
+					                  HorizontalAlignment="Left"
+					                  VerticalAlignment="Bottom"/>
+                                            <TextBlock x:Name="TimeRemainingElement"
+					                    Style="{StaticResource MediaTextBlockStyle}"
+					                    Text="00:00"
+					                    HorizontalAlignment="Right"
+					                    VerticalAlignment="Bottom" />
+                                        </Grid>
+                                    </Grid>
+                                </Border>
+                                <Border x:Name="LeftSidePlayBorder"
+				            Grid.Column="0"
+				            Grid.Row="1"
+				            Visibility="Collapsed">
+                                    <AppBarButton x:Name="PlayPauseButtonOnLeft"
+				              Margin="0"
+				              VerticalAlignment="Center"
+				              Style="{StaticResource AppBarButtonStyle}">
+                                        <AppBarButton.Icon>
+                                            <SymbolIcon x:Name="PlayPauseSymbolLeft" Symbol="Play" />
+                                        </AppBarButton.Icon>
+                                    </AppBarButton>
+                                </Border>
+                                <Border x:Name="MediaTransportControls_Command_Border"
+				            Grid.Column="1"
+				            Grid.Row="2">
+                                    <CommandBar x:Name="MediaControlsCommandBar" Margin="0,0" Style="{StaticResource CommandBarStyle}" IsDynamicOverflowEnabled="False">
+                                        <CommandBar.PrimaryCommands>
+                                            <AppBarButton x:Name='VolumeMuteButton'
+					                  Style='{StaticResource AppBarButtonStyle}'
+					                  MediaTransportControlsHelper.DropoutOrder='19'>
+                                                <AppBarButton.Flyout>
+                                                    <Flyout x:Name="VolumeFlyout"
+						                      FlyoutPresenterStyle="{StaticResource FlyoutStyle}"
+						                      ShouldConstrainToRootBounds="False">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <AppBarButton x:Name='AudioMuteButton'
+								                      Style='{StaticResource AppBarButtonStyle}'
+								                      VerticalAlignment='Center'
+								                      HorizontalAlignment='Center'
+								                      Margin='12'>
+                                                                <AppBarButton.Icon>
+                                                                    <SymbolIcon x:Name="AudioMuteSymbol" Symbol="Volume" />
+                                                                </AppBarButton.Icon>
+                                                            </AppBarButton>
+                                                            <Slider x:Name='VolumeSlider'
+						                                Value='50'
+						                                IsThumbToolTipEnabled='False'
+						                                Width='{ThemeResource MTCHorizontalVolumeSliderWidth}'
+						                                VerticalAlignment='Center'
+						                                HorizontalAlignment='Center'
+						                                Margin='0'/>
+                                                            <TextBlock x:Name='VolumeValue'
+						                              Style='{StaticResource MediaTextBlockStyle}'
+						                              Text="{Binding ElementName=VolumeSlider,Path=Value}"
+						                              HorizontalAlignment='Center'
+						                              VerticalAlignment='Center'
+						                              Margin='12'/>
+                                                        </StackPanel>
+                                                    </Flyout>
+                                                </AppBarButton.Flyout>
+                                                <AppBarButton.Icon>
+                                                    <SymbolIcon x:Name="VolumeMuteSymbol" Symbol="Volume" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='CCSelectionButton'
+					                    Style='{StaticResource AppBarButtonStyle}'
+					                    MediaTransportControlsHelper.DropoutOrder='15'
+					                    Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xED1E;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='AudioTracksSelectionButton'
+					                  Style='{StaticResource AppBarButtonStyle}'
+					                  MediaTransportControlsHelper.DropoutOrder='13'
+					                  Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xED1F;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarToggleButton x:Name='RepeatButton'
+                                                Style='{StaticResource AppBarToggleButtonStyle}'
+                                                MediaTransportControlsHelper.DropoutOrder='1'
+                                                Visibility='Collapsed'>
+                                                <AppBarToggleButton.Icon>
+                                                    <SymbolIcon x:Name="RepeatSymbol" Symbol="RepeatAll" />
+                                                </AppBarToggleButton.Icon>
+                                            </AppBarToggleButton>
+                                            <AppBarButton x:Name='PlaybackRateButton'
+                                                Style='{StaticResource AppBarButtonStyle}'
+                                                MediaTransportControlsHelper.DropoutOrder='10'
+                                                Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xEC57;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarSeparator x:Name='LeftSeparator'
+					                            Height='0'
+					                            Width ='0'
+					                            Margin='0,0' />
+                                            <AppBarButton x:Name='StopButton'
+					                            Icon='Stop'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='7'
+					                            Visibility='Collapsed'/>
+                                            <AppBarButton x:Name='SkipBackwardButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='5'
+					                            Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xED3C;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='PreviousTrackButton'
+					                            Icon='Previous'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='3'
+					                            Visibility='Collapsed'/>
+                                            <AppBarButton x:Name='RewindButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='1'
+					                            Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xEB9E;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='PlayPauseButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='23'>
+                                                <AppBarButton.Icon>
+                                                    <SymbolIcon x:Name="PlayPauseSymbol" Symbol="Play" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='FastForwardButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='1'
+					                            Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xEB9D;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='NextTrackButton'
+					                            Icon='Next'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='3'
+					                            Visibility='Collapsed'/>
+                                            <AppBarButton x:Name='SkipForwardButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='5'
+					                            Visibility='Collapsed'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xED3D;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarSeparator x:Name='RightSeparator'
+					                            Height='0'
+					                            Width ='0'
+					                            Margin='0,0' />
+                                          
+                                           
+                                            <AppBarButton x:Name='ZoomButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='9'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xE799;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='CastButton'
+					                            Style='{StaticResource AppBarButtonStyle}'
+					                            MediaTransportControlsHelper.DropoutOrder='11'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon Glyph="&#xEC15;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                            <AppBarButton x:Name='FullWindowButton'
+                                                  Style='{StaticResource AppBarButtonStyle}'
+                                                  MediaTransportControlsHelper.DropoutOrder='17'>
+                                                <AppBarButton.Icon>
+                                                    <FontIcon x:Name="FullWindowSymbol" Glyph="&#xE740;" />
+                                                </AppBarButton.Icon>
+                                            </AppBarButton>
+                                        </CommandBar.PrimaryCommands>
+                                    </CommandBar>
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.windows.cs
index 0c0462f3a4..9a6d50ef52 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.windows.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.windows.cs
@@ -1,20 +1,17 @@
+using System.Reflection;
 using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Primitives;
 using CommunityToolkit.Maui.Views;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Markup;
 using WinRT.Interop;
 using Application = Microsoft.Maui.Controls.Application;
-using Button = Microsoft.UI.Xaml.Controls.Button;
-using Colors = Microsoft.UI.Colors;
 using Grid = Microsoft.UI.Xaml.Controls.Grid;
 using Page = Microsoft.Maui.Controls.Page;
-using SolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
-using Thickness = Microsoft.UI.Xaml.Thickness;
 
 namespace CommunityToolkit.Maui.Core.Views;
 
@@ -26,12 +23,8 @@ public partial class MauiMediaElement : Grid, IDisposable
 	static readonly AppWindow appWindow = GetAppWindowForCurrentWindow();
 	readonly Popup popup = new();
 	readonly Grid fullScreenGrid = new();
-	readonly Grid buttonContainer;
-	readonly Button fullScreenButton;
 	readonly MediaPlayerElement mediaPlayerElement;
-	// Cannot be static readonly because we need to be able to add icon to multiple instances of the button
-	readonly FontIcon fullScreenIcon = new() { Glyph = "\uE740", FontFamily = new FontFamily("Segoe Fluent Icons") };
-	readonly FontIcon exitFullScreenIcon = new() { Glyph = "\uE73F", FontFamily = new FontFamily("Segoe Fluent Icons") };
+	readonly CustomTransportControls? customTransportControls;
 	bool doesNavigationBarExistBeforeFullScreen;
 	bool isDisposed;
 
@@ -41,33 +34,73 @@ public partial class MauiMediaElement : Grid, IDisposable
 	/// <param name="mediaPlayerElement"></param>
 	public MauiMediaElement(MediaPlayerElement mediaPlayerElement)
 	{
+		LoadResourceDictionary();
 		this.mediaPlayerElement = mediaPlayerElement;
+		customTransportControls = SetTransportControls();
+		Children.Add(this.mediaPlayerElement);
+	}
 
-		fullScreenButton = new Button
+	void LoadResourceDictionary()
+	{
+		var assembly = Assembly.GetExecutingAssembly();
+		using Stream? stream = assembly.GetManifestResourceStream("ResourceDictionary.windows.xaml");
+		if (stream is null)
 		{
-			Content = fullScreenIcon,
-			Background = new SolidColorBrush(Colors.Transparent),
-			Width = 45,
-			Height = 45
-		};
+			return;
+		}
+		using StreamReader reader = new(stream);
+		var xaml = reader.ReadToEnd();
+		var resourceDictionary = (Microsoft.UI.Xaml.ResourceDictionary)XamlReader.Load(xaml);
+		if (resourceDictionary is null)
+		{
+			return;
+		}
+		this.Resources.MergedDictionaries.Add(resourceDictionary);
+	}
+	void ApplyCustomStyle()
+	{
+		if (this.Resources.TryGetValue("customTransportcontrols", out object styleObj) &&
+			styleObj is Microsoft.UI.Xaml.Style customStyle && mediaPlayerElement is not null && mediaPlayerElement.TransportControls is not null)
+		{
+			mediaPlayerElement.TransportControls.Style = customStyle;
+		}
+	}
 
-		buttonContainer = new Grid
+	CustomTransportControls SetTransportControls()
+	{
+		mediaPlayerElement.TransportControls.IsEnabled = false;
+		var temp = new CustomTransportControls()
 		{
-			HorizontalAlignment = Microsoft.UI.Xaml.HorizontalAlignment.Right,
-			VerticalAlignment = Microsoft.UI.Xaml.VerticalAlignment.Top,
-			Visibility = mediaPlayerElement.TransportControls.Visibility,
-			Width = 45,
-			Height = 45,
-			Margin = new Thickness(0, 20, 30, 0)
+			IsZoomButtonVisible = true,
+			IsZoomEnabled = true,
+			IsVolumeButtonVisible = true,
+			IsVolumeEnabled = true,
+			IsSeekBarVisible = true,
+			IsSeekEnabled = true,
+			IsEnabled = true,
+			IsRepeatButtonVisible = true,
+			IsRepeatEnabled = true,
+			IsNextTrackButtonVisible = true,
+			IsPreviousTrackButtonVisible = true,
+			IsFastForwardButtonVisible = true,
+			IsFastForwardEnabled = true,
+			IsFastRewindButtonVisible = true,
+			IsFastRewindEnabled = true,
+			IsPlaybackRateButtonVisible = true,
+			IsPlaybackRateEnabled = true,
+			IsCompact = false,
 		};
-
-		fullScreenButton.Click += OnFullScreenButtonClick;
-		buttonContainer.Children.Add(fullScreenButton);
-
-		Children.Add(this.mediaPlayerElement);
-		Children.Add(buttonContainer);
-
-		mediaPlayerElement.PointerMoved += OnMediaPlayerElementPointerMoved;
+		temp.OnTemplateLoaded += (s, e) =>
+		{
+			if (temp.FullScreenButton is null)
+			{
+				return;
+			}
+			temp.FullScreenButton.Click += OnFullScreenButtonClick;
+		};
+		mediaPlayerElement.TransportControls = temp;
+		ApplyCustomStyle();
+		return temp;
 	}
 
 	/// <summary>
@@ -99,9 +132,10 @@ protected virtual void Dispose(bool disposing)
 		{
 			return;
 		}
-
-		fullScreenButton.Click -= OnFullScreenButtonClick;
-		mediaPlayerElement.PointerMoved -= OnMediaPlayerElementPointerMoved;
+		if (customTransportControls?.FullScreenButton is not null)
+		{
+			customTransportControls.FullScreenButton.Click -= OnFullScreenButtonClick;
+		}
 
 		if (disposing)
 		{
@@ -128,29 +162,9 @@ static AppWindow GetAppWindowForCurrentWindow()
 		return AppWindow.GetFromWindowId(id);
 	}
 
-	async void OnMediaPlayerElementPointerMoved(object sender, PointerRoutedEventArgs e)
-	{
-		e.Handled = true;
-		buttonContainer.Visibility = mediaPlayerElement.TransportControls.Visibility;
-
-		if (mediaPlayerElement.TransportControls.Visibility == Microsoft.UI.Xaml.Visibility.Collapsed)
-		{
-			buttonContainer.Visibility = mediaPlayerElement.TransportControls.Visibility;
-			return;
-		}
-
-		mediaPlayerElement.PointerMoved -= OnMediaPlayerElementPointerMoved;
-		buttonContainer.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
-		await Task.Delay(TimeSpan.FromSeconds(5));
-
-		buttonContainer.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
-		mediaPlayerElement.PointerMoved += OnMediaPlayerElementPointerMoved;
-	}
-
 	void OnFullScreenButtonClick(object sender, RoutedEventArgs e)
 	{
 		var currentPage = CurrentPage;
-
 		if (appWindow.Presenter.Kind is AppWindowPresenterKind.FullScreen)
 		{
 			appWindow.SetPresenter(AppWindowPresenterKind.Default);
@@ -162,9 +176,7 @@ void OnFullScreenButtonClick(object sender, RoutedEventArgs e)
 				popup.Child = null;
 				fullScreenGrid.Children.Clear();
 			}
-			fullScreenButton.Content = fullScreenIcon;
 			Children.Add(mediaPlayerElement);
-			Children.Add(buttonContainer);
 
 			var parent = mediaPlayerElement.Parent as FrameworkElement;
 			mediaPlayerElement.Width = parent?.Width ?? mediaPlayerElement.Width;
@@ -181,9 +193,7 @@ void OnFullScreenButtonClick(object sender, RoutedEventArgs e)
 			mediaPlayerElement.Height = displayInfo.Height / displayInfo.Density;
 
 			Children.Clear();
-			fullScreenButton.Content = exitFullScreenIcon;
 			fullScreenGrid.Children.Add(mediaPlayerElement);
-			fullScreenGrid.Children.Add(buttonContainer);
 
 			popup.XamlRoot = mediaPlayerElement.XamlRoot;
 			popup.HorizontalOffset = 0;
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
index 485314cec3..a62a32b9ad 100644
--- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
@@ -60,7 +60,9 @@ public PlatformMediaElement CreatePlatformView()
 		Player.MediaPlayer.VolumeChanged += OnMediaElementVolumeChanged;
 		Player.MediaPlayer.IsMutedChanged += OnMediaElementIsMutedChanged;
 
+		Player.MediaPlayer.SystemMediaTransportControls.IsEnabled = false;
 		systemMediaControls = Player.MediaPlayer.SystemMediaTransportControls;
+
 		return Player;
 	}
 
@@ -250,12 +252,11 @@ protected virtual partial void PlatformUpdateShouldKeepScreenOn()
 
 	protected virtual partial void PlatformUpdateShouldMute()
 	{
-		if (Player?.MediaPlayer is null)
+		if (Player is null)
 		{
 			return;
 		}
-
-		Player.MediaPlayer.IsMuted = MediaElement.ShouldMute;
+		Dispatcher.Dispatch(() => Player.MediaPlayer.IsMuted = MediaElement.ShouldMute);
 	}
 
 	protected virtual async partial ValueTask PlatformUpdateSource()

From 00f64ee5c0c8004f69500db3539765355fe9f8aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:52:19 -0800
Subject: [PATCH 37/39] Bump FluentAssertions from 8.0.0 to 8.0.1 in /samples
 (#2464)

Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/fluentassertions/fluentassertions/releases)
- [Changelog](https://github.com/fluentassertions/fluentassertions/blob/main/AcceptApiChanges.ps1)
- [Commits](https://github.com/fluentassertions/fluentassertions/compare/8.0.0...8.0.1)

---
updated-dependencies:
- dependency-name: FluentAssertions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../CommunityToolkit.Maui.Analyzers.UnitTests.csproj            | 2 +-
 .../CommunityToolkit.Maui.UnitTests.csproj                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index 0a24dcfce9..20c5766db2 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.0.1" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index 158e359f99..10fa0064f3 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.0.1" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

From 6f1677712fbd90cb819d40c729467a8a3006e9e0 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:54:03 -0800
Subject: [PATCH 38/39] Add Tizen as a `SupportedPlatform`

---
 Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1685894f51..240ae64a1e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -190,6 +190,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <SupportedPlatform Include="Tizen" />
     <InternalsVisibleTo Include="CommunityToolkit.Maui.UnitTests"/>
     <InternalsVisibleTo Include="CommunityToolkit.Maui.Analyzers.UnitTests"/>
   </ItemGroup>

From fbfd456d4ce00bba77a7ec47539dfa39fb6dc682 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 22 Jan 2025 20:11:53 -0800
Subject: [PATCH 39/39] [Housekeeping] Add Benchmarks to GitHub Actions (#2452)

---
 .github/workflows/benchmarks.yml   | 65 ++++++++++++++++++++++++
 .github/workflows/dotnet-build.yml | 80 ++++++++++++++++++++++++------
 2 files changed, 130 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/benchmarks.yml

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
new file mode 100644
index 0000000000..505cb261af
--- /dev/null
+++ b/.github/workflows/benchmarks.yml
@@ -0,0 +1,65 @@
+name: Benchmarks
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+    paths-ignore:
+      - README.md
+  pull_request:
+    branches:
+      - '*'
+
+env:
+  LATEST_NET_VERSION: '9.0.x'
+  PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
+
+jobs:
+  run_benchmarks:
+    name: Run Benchmarks
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, macos-15]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: runner.os == 'macOS'
+        with:
+          xcode-version: latest-stable
+
+      - name: Install Latest Version of .NET, v${{ env.LATEST_NET_VERSION }}
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ env.LATEST_NET_VERSION }}
+          dotnet-quality: 'ga'
+
+      - name: Install .NET MAUI Workload
+        run: |
+          dotnet workload install maui
+          dotnet workload update
+
+      - name: Install Tizen Workload
+        run: |
+          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
+          .\workload-install.ps1
+        shell: pwsh
+
+      - name: Display dotnet info
+        run: dotnet --info
+
+      - name: Run Benchmarks
+        run: dotnet run --project ${{ env.PathToCommunityToolkitAnalyzersBenchmarkCsproj }} -c Release -- -a ${{ runner.temp }}
+
+      - name: Publish Benchmarks
+        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Benchmarks
+          path: |
+            ${{ runner.temp }}/**/*.md
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 1bf69e094f..d556bbbaac 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -1,4 +1,4 @@
-name: .NET
+name: Build
 
 on:
   push:
@@ -42,7 +42,7 @@ env:
   PathToCommunityToolkitCameraAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes/CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
-  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
+  PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
   CommunityToolkitSampleApp_Xcode_Version: '16.2'
   CommunityToolkitLibrary_Xcode_Version: '16.2'
 
@@ -60,15 +60,20 @@ jobs:
       - name: Set Xcode version
         if: runner.os == 'macOS'
         run: |
+          echo Installed Xcode Versions:
+          ls -al  /Applications | grep Xcode
           sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitSampleApp_Xcode_Version }}.app/Contents/Developer
 
-      - name: Install Latest .NET SDK
-        uses: actions/setup-dotnet@v3
+      - name: Install Latest .NET SDK, v${{ env.LATEST_NET_VERSION }}
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.LATEST_NET_VERSION }}
+          dotnet-quality: 'ga'
 
       - name: Install .NET MAUI Workload
-        run: dotnet workload install maui
+        run: |
+          dotnet workload install maui
+          dotnet workload update
 
       - name: Install Tizen Workload
         run: |
@@ -85,6 +90,8 @@ jobs:
   build_library:
     name: Build Library
     runs-on: ${{ matrix.os }}
+    env:
+      VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: 1100 # Fixes "The active test run was aborted. Reason: Test host process crashed" 
     strategy:
       matrix:
         os: [windows-latest, macos-15]
@@ -119,15 +126,20 @@ jobs:
       - name: Set Xcode version
         if: runner.os == 'macOS'
         run: |
+          echo Installed Xcode Versions:
+          ls -al  /Applications | grep Xcode
           sudo xcode-select --switch /Applications/Xcode_${{ env.CommunityToolkitLibrary_Xcode_Version }}.app/Contents/Developer
 
-      - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3
+      - name: Install .NET SDK v${{ env.TOOLKIT_NET_VERSION }}
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+          dotnet-quality: 'ga'
 
       - name: Install .NET MAUI Workload
-        run: dotnet workload install maui --skip-sign-check --source https://api.nuget.org/v3/index.json
+        run: |
+          dotnet workload install maui
+          dotnet workload update
 
       - name: Install Tizen Workload
         run: |
@@ -138,10 +150,46 @@ jobs:
       - name: Display dotnet info
         run: dotnet --info
 
-      - name: Build CommunityToolkit.Maui
-        run: dotnet build -c Release ${{ env.PathToLibrarySolution }}
+      - name: 'Build CommunityToolkit.Maui.Analyzers'
+        run: dotnet build ${{ env.PathToCommunityToolkitAnalyzersCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.Analyzers.CodeFixes'
+        run: dotnet build ${{ env.PathToCommunityToolkitAnalyzersCodeFixCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.Camera.Analyzers'
+        run: dotnet build ${{ env.PathToCommunityToolkitCameraAnalyzersCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.Camera.Analyzers.CodeFixes'
+        run: dotnet build ${{ env.PathToCommunityToolkitCameraAnalyzersCodeFixCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.MediaElement.Analyzers'
+        run: dotnet build ${{ env.PathToCommunityToolkitMediaElementAnalyzersCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes'
+        run: dotnet build ${{ env.PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj }} -c Release
 
-      - name: Run CommunityToolkit.Maui.UnitTests
+      - name: 'Build CommunityToolkit.Maui.SourceGenerators'
+        run: dotnet build ${{ env.PathToCommunityToolkitSourceGeneratorsCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.SourceGenerators.Internal'
+        run: dotnet build ${{ env.PathToCommunityToolkitSourceGeneratorsInternalCsproj }} -c Release
+
+      - name: 'Build CommunityToolkit.Maui.Camera'
+        run: dotnet build ${{ env.PathToCommunityToolkitCameraCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersionCamera }} -p:Version=${{ env.NugetPackageVersion }}
+
+      - name: 'Build CommunityToolkit.Maui.MediaElement'
+        run: dotnet build ${{ env.PathToCommunityToolkitMediaElementCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersionMediaElement }} -p:Version=${{ env.NugetPackageVersion }}
+
+      - name: 'Build CommunityToolkit.Maui.Maps'
+        run: dotnet build ${{ env.PathToCommunityToolkitMapsCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersionMaps }} -p:Version=${{ env.NugetPackageVersion }}
+
+      - name: 'Build CommunityToolkit.Maui.Core'
+        run: dotnet build ${{ env.PathToCommunityToolkitCoreCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}
+
+      - name: 'Build CommunityToolkit.Maui'
+        run: dotnet build ${{ env.PathToLibrarySolution }} -c Release -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }} 
+
+      - name: Run All Unit Tests
         run: dotnet test -c Release ${{ env.PathToLibrarySolution }} --settings ".runsettings" --collect "XPlat code coverage" --logger trx --results-directory ${{ runner.temp }}
 
       - name: Publish Test Results
@@ -198,10 +246,11 @@ jobs:
       id-token: write # Required for requesting the JWT
 
     steps:
-      - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3
+      - name: Install .NET SDK v${{ env.TOOLKIT_NET_VERSION }}
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+          dotnet-quality: 'ga'
 
       - name: Download NuGet List
         uses: actions/download-artifact@v4
@@ -251,9 +300,10 @@ jobs:
 
     steps:
       - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
+          dotnet-quality: 'ga'
 
       - name: Download signed packages for ${{ matrix.platform }}
         uses: actions/download-artifact@v4
@@ -267,4 +317,4 @@ jobs:
           **/*.nupkg
           --source https://api.nuget.org/v3/index.json
           --api-key ${{ secrets.NUGET_PACKAGE_PUSH_TOKEN }}
-          --skip-duplicate
+          --skip-duplicate
\ No newline at end of file