[Android] - Implement WindowInsetListener for per coordinator layout

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellContentFragment.cs

@@ -9,6 +9,7 @@
 using AndroidX.Core.View;
 using AndroidX.Fragment.App;
 using Google.Android.Material.AppBar;
+using Microsoft.Maui.Platform;
 using AndroidAnimation = Android.Views.Animations.Animation;
 using AnimationSet = Android.Views.Animations.AnimationSet;
 using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
@@ -73,6 +74,8 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
 		IShellToolbarTracker _toolbarTracker;
 		bool _disposed;
 		bool _destroyed;
+		GlobalWindowInsetListener _localInsetListener;
+		CoordinatorLayout _managedCoordinatorLayout;
 
 		public ShellContentFragment(IShellContext shellContext, ShellContent shellContent)
 		{
@@ -135,6 +138,13 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
 
 			_root = inflater.Inflate(Controls.Resource.Layout.shellcontent, null).JavaCast<CoordinatorLayout>();
 
+			// Set up the CoordinatorLayout with a local inset listener
+			if (_root is CoordinatorLayout rootLayout)
+			{
+				_localInsetListener = new GlobalWindowInsetListener();
+				_managedCoordinatorLayout = rootLayout;
+				_root = GlobalWindowInsetListener.SetupCoordinatorLayoutWithLocalListener(rootLayout, _localInsetListener);
+			}
 			var shellContentMauiContext = _shellContext.Shell.Handler.MauiContext.MakeScoped(layoutInflater: inflater, fragmentManager: ChildFragmentManager);
 
 			Maui.IElement parentElement = (_shellContent as Maui.IElement) ?? _page;
@@ -143,9 +153,6 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
 			_toolbar = (AToolbar)shellToolbar.ToPlatform(shellContentMauiContext);
 
 			var appBar = _root.FindViewById<AppBarLayout>(Resource.Id.shellcontent_appbar);
-
-			GlobalWindowInsetListenerExtensions.TrySetGlobalWindowInsetListener(_root, this.Context);
-
 			appBar.AddView(_toolbar);
 			_viewhandler = _page.ToHandler(shellContentMauiContext);
 
@@ -183,6 +190,12 @@ void Destroy()
 			// to avoid the navigation `TaskCompletionSource` to be stuck forever.
 			AnimationFinished?.Invoke(this, EventArgs.Empty);
 
+			// Clean up the coordinator layout and local listener first
+			if (_managedCoordinatorLayout is not null && _localInsetListener is not null)
+			{
+				GlobalWindowInsetListener.RemoveCoordinatorLayoutWithLocalListener(_managedCoordinatorLayout, _localInsetListener);
+			}
+
 			(_shellContext?.Shell as IShellController)?.RemoveAppearanceObserver(this);
 
 			if (_shellContent != null)
@@ -214,6 +227,8 @@ void Destroy()
 			_viewhandler = null;
 			_shellContent = null;
 			_shellPageContainer = null;
+			_localInsetListener = null;
+			_managedCoordinatorLayout = null;
 		}
 
 		protected override void Dispose(bool disposing)

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSectionRenderer.cs

@@ -15,6 +15,8 @@
 using AndroidX.ViewPager2.Widget;
 using Google.Android.Material.Tabs;
 using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Platform;
+using Google.Android.Material.AppBar;
 using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
 using AView = Android.Views.View;
 
@@ -75,6 +77,8 @@ void AView.IOnClickListener.OnClick(AView v)
 		IShellToolbarTracker _toolbarTracker;
 		ViewPager2 _viewPager;
 		bool _disposed;
+		GlobalWindowInsetListener _localInsetListener;
+		CoordinatorLayout _managedCoordinatorLayout;
 		IShellController ShellController => _shellContext.Shell;
 		public event EventHandler AnimationFinished;
 		Fragment IShellObservableFragment.Fragment => this;
@@ -101,7 +105,12 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
 			var context = Context;
 			var root = PlatformInterop.CreateShellCoordinatorLayout(context);
 			var appbar = PlatformInterop.CreateShellAppBar(context, Resource.Attribute.appBarLayoutStyle, root);
-			GlobalWindowInsetListenerExtensions.TrySetGlobalWindowInsetListener(root, this.Context);
+
+			// Set up the CoordinatorLayout with a local inset listener
+			_localInsetListener = new GlobalWindowInsetListener();
+			_managedCoordinatorLayout = root;
+			root = GlobalWindowInsetListener.SetupCoordinatorLayoutWithLocalListener(root, _localInsetListener);
+
 			int actionBarHeight = context.GetActionBarHeight();
 
 			var shellToolbar = new Toolbar(shellSection);
@@ -194,6 +203,12 @@ void Destroy()
 		{
 			if (_rootView != null)
 			{
+				// Clean up the coordinator layout and local listener first
+				if (_managedCoordinatorLayout is not null && _localInsetListener is not null)
+				{
+					GlobalWindowInsetListener.RemoveCoordinatorLayoutWithLocalListener(_managedCoordinatorLayout, _localInsetListener);
+				}
+
 				UnhookEvents();
 
 				_shellContext?.Shell?.Toolbar?.Handler?.DisconnectHandler();
@@ -220,6 +235,8 @@ void Destroy()
 			_toolbar = null;
 			_viewPager = null;
 			_rootView = null;
+			_localInsetListener = null;
+			_managedCoordinatorLayout = null;
 
 		}
 

src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs

@@ -206,7 +206,6 @@ internal class ModalFragment : DialogFragment
 			Page _modal;
 			IMauiContext _mauiWindowContext;
 			NavigationRootManager? _navigationRootManager;
-			GlobalWindowInsetListener? _modalInsetListener;
 			static readonly ColorDrawable TransparentColorDrawable = new(AColor.Transparent);
 			bool _pendingAnimation = true;
 
@@ -313,15 +312,6 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup? container
 				var rootView = _navigationRootManager?.RootView ??
 					throw new InvalidOperationException("Root view not initialized");
 
-				var context = rootView.Context ?? inflater.Context;
-				if (context is not null)
-				{
-					// Modal pages get their own separate GlobalWindowInsetListener instance
-					// This prevents cross-contamination with the main window's inset tracking
-					_modalInsetListener = new GlobalWindowInsetListener();
-					ViewCompat.SetOnApplyWindowInsetsListener(rootView, _modalInsetListener);
-				}
-
 				if (IsAnimated)
 				{
 					_ = new GenericGlobalLayoutListener((listener, view) =>
@@ -376,20 +366,6 @@ public override void OnDismiss(IDialogInterface dialog)
 					_modal.Toolbar.Handler = null;
 				}
 
-				// Clean up the modal's separate GlobalWindowInsetListener
-				if (_modalInsetListener is not null)
-				{
-					_modalInsetListener.ResetAllViews();
-					_modalInsetListener.Dispose();
-					_modalInsetListener = null;
-				}
-
-				var rootView = _navigationRootManager?.RootView;
-				if (rootView is not null)
-				{
-					ViewCompat.SetOnApplyWindowInsetsListener(rootView, null);
-				}
-
 				_modal.Handler = null;
 				_modal = null!;
 				_mauiWindowContext = null!;

src/Core/src/Handlers/View/ViewHandler.Android.cs

@@ -1,6 +1,7 @@
 using System;
 using Android.Views;
 using AndroidX.Core.View;
+using Microsoft.Maui.Platform;
 using PlatformView = Android.Views.View;
 
 namespace Microsoft.Maui.Handlers
@@ -260,27 +261,32 @@ internal static void MapSafeAreaEdges(IViewHandler handler, IView view)
 			{
 				return;
 			}
-			
-			if (handler.MauiContext?.Context is null || handler.PlatformView is not PlatformView platformView)
+
+			if (handler.MauiContext?.Context is null || handler.PlatformView is not View platformView)
 			{
 				return;
 			}
 
-			switch (platformView)
+			// Use our static registry approach to find and reset the appropriate listener
+			var listener = GlobalWindowInsetListener.FindListenerForView(platformView);
+
+			// Check for specific view group types that handle safe area
+			if (handler.PlatformView is ContentViewGroup cvg)
+			{
+				listener?.ResetAppliedSafeAreas(cvg);
+				cvg.MarkSafeAreaEdgeConfigurationChanged();
+			}
+			else if (handler.PlatformView is LayoutViewGroup lvg)
 			{
-				case ContentViewGroup cvg:
-        			handler.MauiContext.Context.GetGlobalWindowInsetListener()?.ResetAppliedSafeAreas(cvg);
-					cvg.MarkSafeAreaEdgeConfigurationChanged();
-					break;
-				case LayoutViewGroup lvg:
-        			handler.MauiContext.Context.GetGlobalWindowInsetListener()?.ResetAppliedSafeAreas(lvg);
-					lvg.MarkSafeAreaEdgeConfigurationChanged();
-					break;
-				case MauiScrollView msv:
-        			handler.MauiContext.Context.GetGlobalWindowInsetListener()?.ResetAppliedSafeAreas(msv);
-					msv.MarkSafeAreaEdgeConfigurationChanged();
-					break;
+				listener?.ResetAppliedSafeAreas(lvg);
+				lvg.MarkSafeAreaEdgeConfigurationChanged();
 			}
+			else if (handler.PlatformView is MauiScrollView msv)
+			{
+				listener?.ResetAppliedSafeAreas(msv);
+				msv.MarkSafeAreaEdgeConfigurationChanged();
+			}
+
 			view.InvalidateMeasure();
 		}
 	}

src/Core/src/Handlers/Window/WindowHandler.Android.cs

@@ -5,6 +5,7 @@
 using AndroidX.Core.View;
 using AndroidX.Window.Layout;
 using Google.Android.Material.AppBar;
+using Microsoft.Maui.Platform;
 using AView = Android.Views.View;
 using AColor = Android.Graphics.Color;
 using Android.Content.Res;
@@ -99,6 +100,10 @@ private protected override void OnDisconnectHandler(object platformView)
 
 			if (_rootManager != null)
 				_rootManager.RootViewChanged -= OnRootViewChanged;
+
+			// The MauiCoordinatorLayout will automatically unregister from the static registry
+			// when it's detached from the window, but we can ensure cleanup here as well
+			_rootManager = null;
 		}
 
 		void OnRootViewChanged(object? sender, EventArgs e)
@@ -125,7 +130,12 @@ internal static void DisconnectHandler(NavigationRootManager? navigationRootMana
 
 			var rootManager = handler.MauiContext.GetNavigationRootManager();
 			rootManager.Connect(window.Content);
-			return rootManager.RootView;
+
+			// The NavigationRootManager creates a MauiCoordinatorLayout which automatically
+			// registers its GlobalWindowInsetListener in the static registry for child views to use
+			var rootView = rootManager.RootView;
+
+			return rootView;
 		}
 
 		void UpdateVirtualViewFrame(Activity activity)

src/Core/src/Platform/Android/ContentViewGroup.cs

@@ -155,7 +155,7 @@ protected override void OnConfigurationChanged(Configuration? newConfig)
 		{
 			base.OnConfigurationChanged(newConfig);
 
-			Context?.GetGlobalWindowInsetListener()?.ResetView(this);
+			GlobalWindowInsetListener.FindListenerForView(this)?.ResetView(this);
 			_didSafeAreaEdgeConfigurationChange = true;
 		}
 
@@ -231,7 +231,7 @@ internal IBorderStroke? Clip
 			{
 				_originalPadding = (PaddingLeft, PaddingTop, PaddingRight, PaddingBottom);
 				_hasStoredOriginalPadding = true;
-			}			
+			}
 
 			return SafeAreaExtensions.ApplyAdjustedSafeAreaInsetsPx(insets, CrossPlatformLayout, _context, view);
 		}