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/Interfaces/IDialogFragmentService.android.cs

@@ -0,0 +1,21 @@
+using Android.Content;
+using Android.Views;
+
+namespace CommunityToolkit.Maui.Core;
+
+public interface IDialogFragmentService
+{
+	void OnFragmentAttached(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, Context context);
+	void OnFragmentCreated(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle? savedInstanceState);
+	void OnFragmentDestroyed(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentDetached(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentPaused(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentPreAttached(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, Context context);
+	void OnFragmentPreCreated(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle? savedInstanceState);
+	void OnFragmentResumed(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentSaveInstanceState(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle outState);
+	void OnFragmentStarted(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentStopped(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+	void OnFragmentViewCreated(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f, View v, Bundle? savedInstanceState);
+	void OnFragmentViewDestroyed(AndroidX.Fragment.App.FragmentManager fm, AndroidX.Fragment.App.Fragment f);
+}

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.Core/Services/DialogFragmentService.android.cs

@@ -0,0 +1,149 @@
+using System.Diagnostics.CodeAnalysis;
+using Android.Content;
+using Android.Views;
+using AndroidX.AppCompat.App;
+using DialogFragment = AndroidX.Fragment.App.DialogFragment;
+using Fragment = AndroidX.Fragment.App.Fragment;
+using FragmentManager = AndroidX.Fragment.App.FragmentManager;
+
+namespace CommunityToolkit.Maui.Core.Services;
+
+sealed partial class DialogFragmentService : IDialogFragmentService
+{
+	public void OnFragmentAttached(FragmentManager fm, Fragment f, Context context)
+	{
+	}
+
+	public void OnFragmentCreated(FragmentManager fm, Fragment f, Bundle? savedInstanceState)
+	{
+	}
+
+	public void OnFragmentDestroyed(FragmentManager fm, Fragment f)
+	{
+	}
+
+	public void OnFragmentDetached(FragmentManager fm, Fragment f)
+	{
+	}
+
+	public void OnFragmentPaused(FragmentManager fm, Fragment f)
+	{
+	}
+
+	public void OnFragmentPreAttached(FragmentManager fm, Fragment f, Context context)
+	{
+	}
+
+	public void OnFragmentPreCreated(FragmentManager fm, Fragment f, Bundle? savedInstanceState)
+	{
+	}
+
+	public void OnFragmentResumed(FragmentManager fm, Fragment f)
+	{
+	}
+
+	public void OnFragmentSaveInstanceState(FragmentManager fm, Fragment f, Bundle outState)
+	{
+	}
+
+	public void OnFragmentStarted(FragmentManager fm, Fragment f)
+	{
+		if (!TryConvertToDialogFragment(f, out var dialogFragment) || Microsoft.Maui.ApplicationModel.Platform.CurrentActivity is not AppCompatActivity activity)
+		{
+			return;
+		}
+
+		HandleStatusBarColor(dialogFragment, activity);
+	}
+
+	static void HandleStatusBarColor(DialogFragment dialogFragment, AppCompatActivity activity)
+	{
+		if (activity.Window is null)
+		{
+			return;
+		}
+
+		var statusBarColor = activity.Window.StatusBarColor;
+		var platformColor = new Android.Graphics.Color(statusBarColor);
+		if (dialogFragment.Dialog?.Window is not Window dialogWindow)
+		{
+			throw new InvalidOperationException("Dialog window cannot be null");
+		}
+
+		var isColorTransparent = platformColor == Android.Graphics.Color.Transparent;
+
+		if (OperatingSystem.IsAndroidVersionAtLeast(30))
+		{
+			var windowInsetsController = dialogWindow.InsetsController;
+			var appearance = activity.Window.InsetsController?.SystemBarsAppearance;
+
+			if (windowInsetsController is null)
+			{
+				System.Diagnostics.Trace.WriteLine("WindowInsetsController is null, cannot set system bars appearance.");
+				return;
+			}
+
+			if (appearance.HasValue)
+			{
+				windowInsetsController.SetSystemBarsAppearance(appearance.Value, appearance.Value);
+			}
+			else
+			{
+				windowInsetsController.SetSystemBarsAppearance(
+						isColorTransparent ? 0 : (int)WindowInsetsControllerAppearance.LightStatusBars,
+						(int)WindowInsetsControllerAppearance.LightStatusBars);
+			}
+
+			dialogWindow.SetStatusBarColor(platformColor);
+
+			if (!OperatingSystem.IsAndroidVersionAtLeast(35))
+			{
+				dialogWindow.SetDecorFitsSystemWindows(!isColorTransparent);
+			}
+			else
+			{
+				AndroidX.Core.View.WindowCompat.SetDecorFitsSystemWindows(dialogWindow, !isColorTransparent);
+			}
+		}
+		else
+		{
+			dialogWindow.SetStatusBarColor(platformColor);
+
+			if (isColorTransparent)
+			{
+				dialogWindow.ClearFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
+				dialogWindow.SetFlags(WindowManagerFlags.LayoutNoLimits, WindowManagerFlags.LayoutNoLimits);
+			}
+			else
+			{
+				dialogWindow.ClearFlags(WindowManagerFlags.LayoutNoLimits);
+				dialogWindow.SetFlags(WindowManagerFlags.DrawsSystemBarBackgrounds, WindowManagerFlags.DrawsSystemBarBackgrounds);
+			}
+		}
+	}
+
+	public void OnFragmentStopped(FragmentManager fm, Fragment f)
+	{
+	}
+
+	public void OnFragmentViewCreated(FragmentManager fm, Fragment f, Android.Views.View v, Bundle? savedInstanceState)
+	{
+	}
+
+	public void OnFragmentViewDestroyed(FragmentManager fm, Fragment f)
+	{
+	}
+
+	static bool TryConvertToDialogFragment(Fragment fragment, [NotNullWhen(true)] out DialogFragment? dialogFragment)
+	{
+		dialogFragment = null;
+
+		if (fragment is not DialogFragment dialog)
+		{
+			return false;
+		}
+
+		dialogFragment = dialog;
+		return true;
+	}
+}

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

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

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

@@ -0,0 +1,87 @@
+using Android.Content;
+using FragmentManager = AndroidX.Fragment.App.FragmentManager;
+
+namespace CommunityToolkit.Maui.Core.Services;
+
+sealed class FragmentLifecycleManager(IDialogFragmentService dialogFragmentService) : FragmentManager.FragmentLifecycleCallbacks
+{
+	readonly IDialogFragmentService dialogFragmentService = dialogFragmentService;
+
+	public override void OnFragmentAttached(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Context context)
+	{
+		base.OnFragmentAttached(fm, f, context);
+		dialogFragmentService.OnFragmentAttached(fm, f, context);
+	}
+
+	public override void OnFragmentCreated(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle? savedInstanceState)
+	{
+		base.OnFragmentCreated(fm, f, savedInstanceState);
+		dialogFragmentService.OnFragmentCreated(fm, f, savedInstanceState);
+	}
+
+	public override void OnFragmentDestroyed(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentDestroyed(fm, f);
+		dialogFragmentService.OnFragmentDestroyed(fm, f);
+	}
+
+	public override void OnFragmentDetached(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentDetached(fm, f);
+		dialogFragmentService.OnFragmentDetached(fm, f);
+	}
+
+	public override void OnFragmentPaused(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentPaused(fm, f);
+		dialogFragmentService.OnFragmentPaused(fm, f);
+	}
+
+	public override void OnFragmentPreAttached(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Context context)
+	{
+		base.OnFragmentPreAttached(fm, f, context);
+		dialogFragmentService.OnFragmentPreAttached(fm, f, context);
+	}
+
+	public override void OnFragmentPreCreated(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle? savedInstanceState)
+	{
+		base.OnFragmentPreCreated(fm, f, savedInstanceState);
+		dialogFragmentService.OnFragmentPreCreated(fm, f, savedInstanceState);
+	}
+
+	public override void OnFragmentResumed(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentResumed(fm, f);
+		dialogFragmentService.OnFragmentResumed(fm, f);
+	}
+
+	public override void OnFragmentSaveInstanceState(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Bundle outState)
+	{
+		base.OnFragmentSaveInstanceState(fm, f, outState);
+		dialogFragmentService.OnFragmentSaveInstanceState(fm, f, outState);
+	}
+
+	public override void OnFragmentStarted(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentStarted(fm, f);
+		dialogFragmentService.OnFragmentStarted(fm, f);
+	}
+
+	public override void OnFragmentStopped(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentStopped(fm, f);
+		dialogFragmentService.OnFragmentStopped(fm, f);
+	}
+
+	public override void OnFragmentViewCreated(FragmentManager fm, AndroidX.Fragment.App.Fragment f, Android.Views.View v, Bundle? savedInstanceState)
+	{
+		base.OnFragmentViewCreated(fm, f, v, savedInstanceState);
+		dialogFragmentService.OnFragmentViewCreated(fm, f, v, savedInstanceState);
+	}
+
+	public override void OnFragmentViewDestroyed(FragmentManager fm, AndroidX.Fragment.App.Fragment f)
+	{
+		base.OnFragmentViewDestroyed(fm, f);
+		dialogFragmentService.OnFragmentViewDestroyed(fm, f);
+	}
+}

src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs

@@ -16,17 +16,17 @@ 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"/></returns>
-	public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder, Action<Options>? options = default)
+	public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder, Action<Options>? options = null)
 	{
 		// Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
 		builder.UseMauiCommunityToolkitCore(null);
 
-		builder.Services.AddSingleton<IPopupService, PopupService>();
-
 		// Invokes options for both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
 		options?.Invoke(new Options(builder));
 
-		builder.ConfigureMauiHandlers(h =>
+		builder.Services.AddSingleton<IPopupService, PopupService>();
+
+		builder.ConfigureMauiHandlers(static h =>
 		{
 			h.AddHandler<DrawingView, DrawingViewHandler>();
 			h.AddHandler<Popup, PopupHandler>();