Merge branch 'main' into FixCamerPermissionsBug

ne0rrmatrix · web-flow · commit 46688c0d11aa · 2026-03-26T07:11:44.000-07:00
diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -60,7 +60,7 @@
 
     <PackageReference Include="Microsoft.Maui.Controls" Version="*" />
     <PackageReference Include="CommunityToolkit.Maui.Markup" Version="7.0.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
   </ItemGroup>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
@@ -1,4 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
+
 <pages:BasePage
     x:Class="CommunityToolkit.Maui.Sample.Pages.Behaviors.StatusBarBehaviorPage"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
@@ -118,9 +119,9 @@
                 Value="{Binding BlueSliderValue}" />
             <HorizontalStackLayout>
                 <Label Text="Alpha: " />
-                <Label Text="{Binding AlphaSliderValue}"/>
+                <Label Text="{Binding AlphaSliderValue}" />
             </HorizontalStackLayout>
-           
+
             <Stepper
                 HorizontalOptions="Start"
                 Margin="20,0"
@@ -130,36 +131,47 @@
                 Value="{Binding AlphaSliderValue}" />
 
             <Label Text="Select StatusBar and NavigationBar style" />
-            
-            <HorizontalStackLayout Spacing="15">
 
-                
-
-                <RadioButton
-                    Content="Default"
-                    IsChecked="{Binding IsDefaultChecked}"
-                    VerticalOptions="Center" />
+            <HorizontalStackLayout Spacing="15">
+                <RadioButton IsChecked="{Binding IsDefaultChecked}"
+                             VerticalOptions="Center">
+                    <RadioButton.Content>
+                        <Label
+                            Margin="10,0,0,0"
+                            Text="Default"
+                            VerticalOptions="Center"
+                            VerticalTextAlignment="Center" />
+                    </RadioButton.Content>
+                </RadioButton>
 
-                <RadioButton VerticalOptions="Center" IsChecked="{Binding IsLightContentChecked}">
+                <RadioButton IsChecked="{Binding IsLightContentChecked}"
+                             VerticalOptions="Center">
                     <RadioButton.Content>
-                        <Label Text="Light Content" Margin="10,0,0,0" VerticalTextAlignment="Center"
-                               VerticalOptions="Center" />
+                        <Label
+                            Margin="10,0,0,0"
+                            Text="Light&#10;Content"
+                            VerticalOptions="Center"
+                            VerticalTextAlignment="Center" />
                     </RadioButton.Content>
                 </RadioButton>
 
-                <RadioButton IsChecked="{Binding IsDarkContentChecked}">
+                <RadioButton IsChecked="{Binding IsDarkContentChecked}"
+                             VerticalOptions="Center">
                     <RadioButton.Content>
-                        <Label Text="Dark Content" Margin="10,0,0,0" VerticalTextAlignment="Center"
-                               VerticalOptions="Center" />
+                        <Label
+                            Margin="10,0,0,0"
+                            Text="Dark&#10;Content"
+                            VerticalOptions="Center"
+                            VerticalTextAlignment="Center" />
                     </RadioButton.Content>
                 </RadioButton>
 
             </HorizontalStackLayout>
-            
+
             <Button
                 x:Name="ModalPageButton"
                 HorizontalOptions="Center"
-                VerticalOptions="Center"/>
+                VerticalOptions="Center" />
         </VerticalStackLayout>
     </ScrollView>
 </pages:BasePage>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/PlatformSpecific/NavigationBarPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/PlatformSpecific/NavigationBarPage.xaml
@@ -108,8 +108,8 @@
 				ThumbColor="Blue"
 				Value="{Binding BlueSliderValue}" />
 
-			<VerticalStackLayout Spacing="15">
-				<Label Text="Select NavigationBar style" />
+			<Label Text="Select NavigationBar style" />
+			<HorizontalStackLayout Spacing="15">
 
 				<RadioButton IsChecked="{Binding IsDefaultChecked}" VerticalOptions="Center">
 					<RadioButton.Content>
@@ -125,7 +125,7 @@
 					<RadioButton.Content>
 						<Label
 							Margin="10,0,0,0"
-							Text="Light Content"
+							Text="Light&#10;Content"
 							VerticalOptions="Center"
 							VerticalTextAlignment="Center" />
 					</RadioButton.Content>
@@ -135,12 +135,12 @@
 					<RadioButton.Content>
 						<Label
 							Margin="10,0,0,0"
-							Text="Dark Content"
+							Text="Dark&#10;Content"
 							VerticalOptions="Center"
 							VerticalTextAlignment="Center" />
 					</RadioButton.Content>
 				</RadioButton>
-			</VerticalStackLayout>
+			</HorizontalStackLayout>
 		</VerticalStackLayout>
 	</ScrollView>
 </pages:BasePage>
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/StatusBarBehaviorViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/StatusBarBehaviorViewModel.cs
@@ -5,54 +5,54 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Behaviors;
 
 public partial class StatusBarBehaviorViewModel : BaseViewModel
 {
+	public Color StatusBarColor => Color.FromRgba(RedSliderValue, GreenSliderValue, BlueSliderValue, AlphaSliderValue);
+
+	public StatusBarStyle StatusBarStyle
+	{
+		get
+		{
+			if (IsDefaultChecked)
+			{
+				return StatusBarStyle.Default;
+			}
+			if (IsLightContentChecked)
+			{
+				return StatusBarStyle.LightContent;
+			}
+			if (IsDarkContentChecked)
+			{
+				return StatusBarStyle.DarkContent;
+			}
+
+			throw new NotSupportedException($"{nameof(StatusBarStyle)} type is not supported.");
+		}
+	}
+
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarColor))]
-	public partial double RedSliderValue { get; set; }
+	public partial double RedSliderValue { get; set; } = 0.5;
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarColor))]
-	public partial double GreenSliderValue { get; set; }
+	public partial double GreenSliderValue { get; set; } = 0.5;
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarColor))]
-	public partial double BlueSliderValue { get; set; }
+	public partial double BlueSliderValue { get; set; } = 0.5;
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarColor))]
 	public partial double AlphaSliderValue { get; set; } = 1;
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarStyle))]
-	public partial bool IsLightContentChecked { get; set; } = true;
+	public partial bool IsLightContentChecked { get; set; }
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarStyle))]
-	public partial bool IsDarkContentChecked { get; set; } = true;
+	public partial bool IsDarkContentChecked { get; set; }
 
 	[ObservableProperty]
 	[NotifyPropertyChangedFor(nameof(StatusBarStyle))]
 	public partial bool IsDefaultChecked { get; set; } = true;
-
-	public Color StatusBarColor => Color.FromRgba(RedSliderValue, GreenSliderValue, BlueSliderValue, AlphaSliderValue);
-
-	public StatusBarStyle StatusBarStyle
-	{
-		get
-		{
-			if (IsDefaultChecked)
-			{
-				return StatusBarStyle.Default;
-			}
-			if (IsLightContentChecked)
-			{
-				return StatusBarStyle.LightContent;
-			}
-			if (IsDarkContentChecked)
-			{
-				return StatusBarStyle.DarkContent;
-			}
-
-			throw new NotSupportedException($"{nameof(StatusBarStyle)} {StatusBarStyle} is not supported.");
-		}
-	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Extensions/WindowExtensions.android.cs b/src/CommunityToolkit.Maui.Core/Extensions/WindowExtensions.android.cs
@@ -1,4 +1,7 @@
 ﻿using Android.Views;
+using Microsoft.Maui.Platform;
+using Activity = Android.App.Activity;
+using DialogFragment = AndroidX.Fragment.App.DialogFragment;
 
 namespace CommunityToolkit.Maui.Core.Extensions;
 
@@ -8,16 +11,34 @@ namespace CommunityToolkit.Maui.Core.Extensions;
 public static class AndroidWindowExtensions
 {
 	/// <summary>
-	/// Gets the current window associated with the specified activity.
+	/// Gets the current visible window associated with the specified activity.
 	/// </summary>
 	/// <param name="activity">The activity.</param>
 	/// <returns>The current window.</returns>
 	/// <exception cref="InvalidOperationException">Thrown when the activity window is null.</exception>
 	public static Window GetCurrentWindow(this Activity activity)
 	{
-		var window = activity.Window ?? throw new InvalidOperationException($"{nameof(activity.Window)} cannot be null");
-		window.ClearFlags(WindowManagerFlags.TranslucentStatus);
-		window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
-		return window;
+		Window? currentWindow = null;
+
+		var fragmentManager = activity.GetFragmentManager();
+		if (fragmentManager is not null && fragmentManager.Fragments.OfType<DialogFragment>().Any())
+		{
+			var fragments = fragmentManager.Fragments;
+			for (var i = fragments.Count - 1; i >= 0; i--)
+			{
+				if (fragments[i] is DialogFragment { Dialog: { IsShowing: true, Window: not null }, IsVisible: true } dialogFragment)
+				{
+					currentWindow = dialogFragment.Dialog.Window;
+					break;
+				}
+			}
+		}
+
+		currentWindow ??= activity.Window ?? throw new InvalidOperationException($"{nameof(activity.Window)} cannot be null");
+
+		currentWindow.ClearFlags(WindowManagerFlags.TranslucentStatus);
+		currentWindow.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
+		
+		return currentWindow;
 	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.android.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.android.cs
@@ -35,57 +35,58 @@ static void PlatformSetColor(Color color)
 			return;
 		}
 
-		if (Activity.Window is not null)
+		if (Activity.GetCurrentWindow() is not Window { DecorView.RootView: not null } window)
 		{
-			var platformColor = color.ToPlatform();
+			return;
+		}
 
-			if (OperatingSystem.IsAndroidVersionAtLeast(35))
-			{
-				const string statusBarOverlayTag = "StatusBarOverlay";
+		var platformColor = color.ToPlatform();
 
-				var window = Activity.GetCurrentWindow();
+		if (OperatingSystem.IsAndroidVersionAtLeast(35))
+		{
+			const string statusBarOverlayTag = "StatusBarOverlay";
 
-				var decorGroup = (ViewGroup)window.DecorView;
-				var statusBarOverlay = decorGroup.FindViewWithTag(statusBarOverlayTag);
+			var decorGroup = (ViewGroup)window.DecorView.RootView;
+			var statusBarOverlay = decorGroup.FindViewWithTag(statusBarOverlayTag);
 
-				if (statusBarOverlay is null)
-				{
-					var statusBarHeight = Activity.Resources?.GetIdentifier("status_bar_height", "dimen", "android") ?? 0;
-					var statusBarPixelSize = statusBarHeight > 0 ? Activity.Resources?.GetDimensionPixelSize(statusBarHeight) ?? 0 : 0;
+			if (statusBarOverlay is null)
+			{
+				var statusBarHeight = Activity.Resources?.GetIdentifier("status_bar_height", "dimen", "android") ?? 0;
+				var statusBarPixelSize = statusBarHeight > 0 ? Activity.Resources?.GetDimensionPixelSize(statusBarHeight) ?? 0 : 0;
 
-					statusBarOverlay = new(Activity)
+				statusBarOverlay = new(Activity)
+				{
+					LayoutParameters = new FrameLayout.LayoutParams(Android.Views.ViewGroup.LayoutParams.MatchParent, statusBarPixelSize + 3)
 					{
-						LayoutParameters = new FrameLayout.LayoutParams(Android.Views.ViewGroup.LayoutParams.MatchParent, statusBarPixelSize + 3)
-						{
-							Gravity = GravityFlags.Top
-						}
-					};
-
-					decorGroup.AddView(statusBarOverlay);
-					statusBarOverlay.SetZ(0);
-				}
+						Gravity = GravityFlags.Top
+					}
+				};
 
-				statusBarOverlay.SetBackgroundColor(platformColor);
-			}
-			else
-			{
-				Activity.Window.SetStatusBarColor(platformColor);
+				statusBarOverlay.Tag = statusBarOverlayTag;
+				decorGroup.AddView(statusBarOverlay);
+				statusBarOverlay.SetZ(0);
 			}
 
-			bool isColorTransparent = platformColor == PlatformColor.Transparent;
-			if (isColorTransparent)
-			{
-				Activity.Window.ClearFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
-				Activity.Window.SetFlags(WindowManagerFlags.LayoutNoLimits, WindowManagerFlags.LayoutNoLimits);
-			}
-			else
-			{
-				Activity.Window.ClearFlags(WindowManagerFlags.LayoutNoLimits);
-				Activity.Window.SetFlags(WindowManagerFlags.DrawsSystemBarBackgrounds, WindowManagerFlags.DrawsSystemBarBackgrounds);
-			}
+			statusBarOverlay.SetBackgroundColor(platformColor);
+		}
+		else
+		{
+			window.SetStatusBarColor(platformColor);
+		}
 
-			WindowCompat.SetDecorFitsSystemWindows(Activity.Window, !isColorTransparent);
+		bool isColorTransparent = platformColor == PlatformColor.Transparent;
+		if (isColorTransparent)
+		{
+			window.ClearFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
+			window.SetFlags(WindowManagerFlags.LayoutNoLimits, WindowManagerFlags.LayoutNoLimits);
 		}
+		else
+		{
+			window.ClearFlags(WindowManagerFlags.LayoutNoLimits);
+			window.SetFlags(WindowManagerFlags.DrawsSystemBarBackgrounds, WindowManagerFlags.DrawsSystemBarBackgrounds);
+		}
+
+		WindowCompat.SetDecorFitsSystemWindows(window, !isColorTransparent);
 	}
 
 	static void PlatformSetStyle(StatusBarStyle style)
@@ -98,23 +99,23 @@ static void PlatformSetStyle(StatusBarStyle style)
 		switch (style)
 		{
 			case StatusBarStyle.DarkContent:
-				SetStatusBarAppearance(Activity, true);
+				SetStatusBarAppearance(true);
 				break;
 
 			case StatusBarStyle.Default:
 			case StatusBarStyle.LightContent:
-				SetStatusBarAppearance(Activity, false);
+				SetStatusBarAppearance(false);
 				break;
 
 			default:
 				throw new NotSupportedException($"{nameof(StatusBarStyle)} {style} is not yet supported on Android");
 		}
 	}
 
-	static void SetStatusBarAppearance(Activity activity, bool isLightStatusBars)
+	static void SetStatusBarAppearance(bool isLightStatusBars)
 	{
-		var window = activity.GetCurrentWindow();
-		if (WindowCompat.GetInsetsController(window, window.DecorView) is WindowInsetsControllerCompat windowController)
+		if (Activity.GetCurrentWindow() is Window window
+		    && WindowCompat.GetInsetsController(window, window.DecorView) is WindowInsetsControllerCompat windowController)
 		{
 			windowController.AppearanceLightStatusBars = isLightStatusBars;
 		}
diff --git a/src/CommunityToolkit.Maui/Extensions/PropertyChangedEventArgsExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/PropertyChangedEventArgsExtensions.shared.cs
