Fix statusBar color changes on modal pages

src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs

@@ -1,4 +1,10 @@
-namespace CommunityToolkit.Maui.Core;
+using System.Diagnostics;
+using CommunityToolkit.Maui.Core.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Platform;
+
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// <see cref="MauiAppBuilder"/> Extensions
@@ -11,9 +17,44 @@ public static class AppBuilderExtensions
 	/// <param name="builder"><see cref="MauiAppBuilder"/> generated by <see cref="MauiApp"/> </param>
 	/// <param name="options"><see cref="Options"/></param>
 	/// <returns><see cref="MauiAppBuilder"/> initialized for <see cref="CommunityToolkit.Maui.Core"/></returns>
-	public static MauiAppBuilder UseMauiCommunityToolkitCore(this MauiAppBuilder builder, Action<Options>? options = default)
+	public static MauiAppBuilder UseMauiCommunityToolkitCore(this MauiAppBuilder builder, Action<Options>? options = null)
 	{
 		options?.Invoke(new Options());
+
+#if ANDROID
+        if (Options.ShouldUseStatusBarBehaviorOnAndroidModalPage)
+        {
+            builder.Services.AddSingleton<IDialogFragmentService, DialogFragmentService>();
+
+			builder.ConfigureLifecycleEvents(static lifecycleBuilder =>
+			{
+				lifecycleBuilder.AddAndroid(static androidBuilder =>
+				{
+					androidBuilder.OnCreate(static (activity, _) =>
+					{
+						if (activity is not AndroidX.AppCompat.App.AppCompatActivity componentActivity)
+						{
+							Trace.WriteLine($"Unable to Modify Android StatusBar On ModalPage: Activity {activity.LocalClassName} must be an {nameof(AndroidX.AppCompat.App.AppCompatActivity)}");
+							return;
+						}
+
+						if (componentActivity.GetFragmentManager() is not AndroidX.Fragment.App.FragmentManager fragmentManager)
+						{
+							Trace.WriteLine($"Unable to Modify Android StatusBar On ModalPage: Unable to retrieve fragment manager from {nameof(AndroidX.AppCompat.App.AppCompatActivity)}");
+							return;
+						}
+
+						var dialogFragmentService = IPlatformApplication.Current?.Services.GetRequiredService<IDialogFragmentService>() 
+						                            ?? throw new InvalidOperationException($"Unable to retrieve {nameof(IDialogFragmentService)}");
+
+
+						fragmentManager.RegisterFragmentLifecycleCallbacks(new FragmentLifecycleManager(dialogFragmentService), false);
+					});
+				});
+			});
+        }
+#endif
+
 		return builder;
 	}
 }

src/CommunityToolkit.Maui.Core/Options.cs

@@ -5,4 +5,14 @@ namespace CommunityToolkit.Maui.Core;
 /// </summary>
 public class Options
 {
+    internal static bool ShouldUseStatusBarBehaviorOnAndroidModalPage { get; private set; } = true;
+
+    /// <summary>
+    /// Enables the use of the DialogFragment Lifecycle service for Android.
+    /// </summary>
+    /// <param name="value">true if yes or false if you want to implement your own.</param>
+    /// <remarks>
+    /// Default value is true.
+    /// </remarks>
+    public void SetShouldUseStatusBarBehaviorOnAndroidModalPage(bool value) => ShouldUseStatusBarBehaviorOnAndroidModalPage = value;
 }

src/CommunityToolkit.Maui/Services/DialogFragmentService.android.cs → src/CommunityToolkit.Maui.Core/Services/DialogFragmentService.android.cs

@@ -1,15 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Android.Content;
-using Android.OS;
 using Android.Views;
 using AndroidX.AppCompat.App;
-using CommunityToolkit.Maui.Core;
-using Debug = System.Diagnostics.Debug;
 using DialogFragment = AndroidX.Fragment.App.DialogFragment;
 using Fragment = AndroidX.Fragment.App.Fragment;
 using FragmentManager = AndroidX.Fragment.App.FragmentManager;
 
-namespace CommunityToolkit.Maui.Services;
+namespace CommunityToolkit.Maui.Core.Services;
 
 sealed partial class DialogFragmentService : IDialogFragmentService
 {
@@ -51,7 +48,7 @@ public void OnFragmentSaveInstanceState(FragmentManager fm, Fragment f, Bundle o
 
 	public void OnFragmentStarted(FragmentManager fm, Fragment f)
 	{
-		if (!IsDialogFragment(f, out var dialogFragment) || Platform.CurrentActivity is not AppCompatActivity activity)
+		if (!TryConvertToDialogFragment(f, out var dialogFragment) || Microsoft.Maui.ApplicationModel.Platform.CurrentActivity is not AppCompatActivity activity)
 		{
 			return;
 		}
@@ -68,18 +65,16 @@ static void HandleStatusBarColor(DialogFragment dialogFragment, AppCompatActivit
 
 		var statusBarColor = activity.Window.StatusBarColor;
 		var platformColor = new Android.Graphics.Color(statusBarColor);
-		var dialog = dialogFragment.Dialog;
-
-		Debug.Assert(dialog is not null);
-		Debug.Assert(dialog.Window is not null);
-
-		var window = dialog.Window;
+		if (dialogFragment.Dialog?.Window is not Window dialogWindow)
+		{
+			throw new InvalidOperationException("Dialog window cannot be null");
+		}
 
-		bool isColorTransparent = platformColor == Android.Graphics.Color.Transparent;
+		var isColorTransparent = platformColor == Android.Graphics.Color.Transparent;
 
 		if (OperatingSystem.IsAndroidVersionAtLeast(30))
 		{
-			var windowInsetsController = window.InsetsController;
+			var windowInsetsController = dialogWindow.InsetsController;
 			var appearance = activity.Window.InsetsController?.SystemBarsAppearance;
 
 			if (windowInsetsController is null)
@@ -98,29 +93,31 @@ static void HandleStatusBarColor(DialogFragment dialogFragment, AppCompatActivit
 						isColorTransparent ? 0 : (int)WindowInsetsControllerAppearance.LightStatusBars,
 						(int)WindowInsetsControllerAppearance.LightStatusBars);
 			}
-			window.SetStatusBarColor(platformColor);
+
+			dialogWindow.SetStatusBarColor(platformColor);
+
 			if (!OperatingSystem.IsAndroidVersionAtLeast(35))
 			{
-				window.SetDecorFitsSystemWindows(!isColorTransparent);
+				dialogWindow.SetDecorFitsSystemWindows(!isColorTransparent);
 			}
 			else
 			{
-				AndroidX.Core.View.WindowCompat.SetDecorFitsSystemWindows(window, !isColorTransparent);
+				AndroidX.Core.View.WindowCompat.SetDecorFitsSystemWindows(dialogWindow, !isColorTransparent);
 			}
 		}
 		else
 		{
-			dialog.Window.SetStatusBarColor(platformColor);
+			dialogWindow.SetStatusBarColor(platformColor);
 
 			if (isColorTransparent)
 			{
-				window.ClearFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
-				window.SetFlags(WindowManagerFlags.LayoutNoLimits, WindowManagerFlags.LayoutNoLimits);
+				dialogWindow.ClearFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
+				dialogWindow.SetFlags(WindowManagerFlags.LayoutNoLimits, WindowManagerFlags.LayoutNoLimits);
 			}
 			else
 			{
-				window.ClearFlags(WindowManagerFlags.LayoutNoLimits);
-				window.SetFlags(WindowManagerFlags.DrawsSystemBarBackgrounds, WindowManagerFlags.DrawsSystemBarBackgrounds);
+				dialogWindow.ClearFlags(WindowManagerFlags.LayoutNoLimits);
+				dialogWindow.SetFlags(WindowManagerFlags.DrawsSystemBarBackgrounds, WindowManagerFlags.DrawsSystemBarBackgrounds);
 			}
 		}
 	}
@@ -137,14 +134,16 @@ public void OnFragmentViewDestroyed(FragmentManager fm, Fragment f)
 	{
 	}
 
-	static bool IsDialogFragment(Fragment fragment, [NotNullWhen(true)] out DialogFragment? dialogFragment)
+	static bool TryConvertToDialogFragment(Fragment fragment, [NotNullWhen(true)] out DialogFragment? dialogFragment)
 	{
 		dialogFragment = null;
-		if (fragment is DialogFragment dialog)
+
+		if (fragment is not DialogFragment dialog)
 		{
-			dialogFragment = dialog;
-			return true;
+			return false;
 		}
-		return false;
+
+		dialogFragment = dialog;
+		return true;
 	}
 }

src/CommunityToolkit.Maui/Services/DialogFragmentService.shared.cs → src/CommunityToolkit.Maui.Core/Services/DialogFragmentService.shared.cs

@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Maui.Services;
+namespace CommunityToolkit.Maui.Core.Services;
 
 sealed partial class DialogFragmentService
 {

src/CommunityToolkit.Maui/Services/MCTFragmentLifecycle.android.cs → src/CommunityToolkit.Maui.Core/Services/FragmentLifecycleManager.android.cs

@@ -1,9 +1,7 @@
 using Android.Content;
-using Android.OS;
-using CommunityToolkit.Maui.Core;
 using FragmentManager = AndroidX.Fragment.App.FragmentManager;
 
-namespace CommunityToolkit.Maui.Services;
+namespace CommunityToolkit.Maui.Core.Services;
 
 sealed class FragmentLifecycleManager(IDialogFragmentService dialogFragmentService) : FragmentManager.FragmentLifecycleCallbacks
 {

src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs

@@ -2,7 +2,6 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Core.Handlers;
 using CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
-using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.Views;
 using Microsoft.Maui.LifecycleEvents;
 using Microsoft.Maui.Platform;
@@ -28,40 +27,6 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
         // Invokes options for both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
         options?.Invoke(new Options(builder));
 
-#if ANDROID
-        if (Options.ShouldUseStatusBarBehaviorOnAndroidModalPage)
-        {
-            builder.Services.AddSingleton<IDialogFragmentService, DialogFragmentService>();
-
-			builder.ConfigureLifecycleEvents(static lifecycleBuilder =>
-			{
-				lifecycleBuilder.AddAndroid(static androidBuilder =>
-				{
-					androidBuilder.OnCreate(static (activity, _) =>
-					{
-						if (activity is not AndroidX.AppCompat.App.AppCompatActivity componentActivity)
-						{
-							Trace.WriteLine($"Unable to Modify Android StatusBar On ModalPage: Activity {activity.LocalClassName} must be an {nameof(AndroidX.AppCompat.App.AppCompatActivity)}");
-							return;
-						}
-
-						if (componentActivity.GetFragmentManager() is not AndroidX.Fragment.App.FragmentManager fragmentManager)
-						{
-							Trace.WriteLine($"Unable to Modify Android StatusBar On ModalPage: Unable to retrieve fragment manager from {nameof(AndroidX.AppCompat.App.AppCompatActivity)}");
-							return;
-						}
-
-						var dialogFragmentService = IPlatformApplication.Current?.Services.GetRequiredService<IDialogFragmentService>() 
-						                            ?? throw new InvalidOperationException($"Unable to retrieve {nameof(IDialogFragmentService)}");
-
-
-						fragmentManager.RegisterFragmentLifecycleCallbacks(new FragmentLifecycleManager(dialogFragmentService), false);
-					});
-				});
-			});
-        }
-#endif
-
         builder.Services.AddSingleton<IPopupService, PopupService>();
 
         builder.ConfigureMauiHandlers(static h =>

src/CommunityToolkit.Maui/Options.cs

@@ -17,8 +17,7 @@ internal Options(in MauiAppBuilder builder) : this()
 	{
 		this.builder = builder;
 	}
-
-	internal static bool ShouldUseStatusBarBehaviorOnAndroidModalPage { get; private set; } = true;
+
 	internal static bool ShouldSuppressExceptionsInAnimations { get; private set; }
 	internal static bool ShouldSuppressExceptionsInConverters { get; private set; }
 	internal static bool ShouldSuppressExceptionsInBehaviors { get; private set; }
@@ -48,15 +47,6 @@ internal Options(in MauiAppBuilder builder) : this()
 	/// </remarks>
 	public void SetShouldSuppressExceptionsInBehaviors(bool value) => ShouldSuppressExceptionsInBehaviors = value;
 
-	/// <summary>
-	/// Enables the use of the DialogFragment Lifecycle service for Android.
-	/// </summary>
-	/// <param name="value">true if yes or false if you want to implement your own.</param>
-	/// <remarks>
-	/// Default value is true.
-	/// </remarks>
-	public void SetShouldUseStatusBarBehaviorOnAndroidModalPage(bool value) => ShouldUseStatusBarBehaviorOnAndroidModalPage = value;
-
 	/// <summary>
 	/// Enables <see cref="Alerts.Snackbar"/> for Windows
 	/// </summary>