more changes

Author: NirmalKumarYuvaraj

src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs

@@ -1,4 +1,5 @@
 using Android.Views;
+using AndroidX.Core.View;
 using Microsoft.Maui.Graphics;
 using static Microsoft.Maui.Layouts.LayoutExtensions;
 
@@ -225,6 +226,12 @@ static void InsertInsetView(IScrollViewHandler handler, IScrollView scrollView,
 				Tag = InsetPanelTag
 			};
 
+			// replace the one that's part of contentviewgroup for now
+			ViewCompat.SetOnApplyWindowInsetsListener(paddingShim, null);
+
+			// Setting this here on the scrollview and that's where we apply insets
+			ViewCompat.SetOnApplyWindowInsetsListener(handler.PlatformView, new WindowsListener());
+
 			handler.PlatformView.RemoveAllViews();
 			paddingShim.AddView(nativeContent);
 			handler.PlatformView.SetContent(paddingShim);
@@ -265,4 +272,17 @@ Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double he
 		Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds) =>
 			(VirtualView as ICrossPlatformLayout)?.CrossPlatformArrange(bounds) ?? Size.Zero;
 	}
+
+	internal class WindowsListener : Java.Lang.Object, IOnApplyWindowInsetsListener
+	{
+		public WindowInsetsCompat? OnApplyWindowInsets(View? v, WindowInsetsCompat? insets)
+		{
+			// I'm not sure the best way to apply insets here. Need to test more
+			// 1) if the user has set all safeareaedges to all or container do we just set fitToSystenWindow on scrollview?
+			// 2) do we just apply padding to the scrollview and call that good?
+			// 3) we probably need
+
+			return WindowInsetsCompat.Consumed;
+		}
+	}
 }

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

@@ -28,7 +28,7 @@ public static void MapContent(IWindowHandler handler, IWindow window)
 			_ = handler.MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
 
 			var rootView = CreateRootViewFromContent(handler, window);
-			ViewCompat.SetOnApplyWindowInsetsListener(rootView, new WindowsListener());
+			//ViewCompat.SetOnApplyWindowInsetsListener(rootView, new WindowsListener());
 			handler.PlatformView.SetContentView(rootView);
 		}
 

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

@@ -7,6 +7,7 @@
 using AndroidX.Core.View;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Graphics.Platform;
+using Rectangle = Microsoft.Maui.Graphics.Rect;
 
 namespace Microsoft.Maui.Platform
 {
@@ -93,15 +94,23 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 			var deviceIndependentWidth = widthMeasureSpec.ToDouble(_context);
 			var deviceIndependentHeight = heightMeasureSpec.ToDouble(_context);
 
+			// Account for padding in available space
+			var paddingLeft = _context.FromPixels(PaddingLeft);
+			var paddingTop = _context.FromPixels(PaddingTop);
+			var paddingRight = _context.FromPixels(PaddingRight);
+			var paddingBottom = _context.FromPixels(PaddingBottom);
+
+			var availableWidth = Math.Max(0, deviceIndependentWidth - paddingLeft - paddingRight);
+			var availableHeight = Math.Max(0, deviceIndependentHeight - paddingTop - paddingBottom);
+
 			var widthMode = MeasureSpec.GetMode(widthMeasureSpec);
 			var heightMode = MeasureSpec.GetMode(heightMeasureSpec);
-			// TODO make measure sync with safearea
-			var measure = CrossPlatformMeasure(deviceIndependentWidth, deviceIndependentHeight);
+			var measure = CrossPlatformMeasure(availableWidth, availableHeight);
 
 			// If the measure spec was exact, we should return the explicit size value, even if the content
 			// measure came out to a different size
-			var width = widthMode == MeasureSpecMode.Exactly ? deviceIndependentWidth : measure.Width;
-			var height = heightMode == MeasureSpecMode.Exactly ? deviceIndependentHeight : measure.Height;
+			var width = widthMode == MeasureSpecMode.Exactly ? deviceIndependentWidth : measure.Width + paddingLeft + paddingRight;
+			var height = heightMode == MeasureSpecMode.Exactly ? deviceIndependentHeight : measure.Height + paddingTop + paddingBottom;
 
 			var platformWidth = _context.ToPixels(width);
 			var platformHeight = _context.ToPixels(height);
@@ -121,11 +130,18 @@ protected override void OnLayout(bool changed, int left, int top, int right, int
 			}
 
 			var destination = _context.ToCrossPlatformRectInReferenceFrame(left, top, right, bottom);
-			// Apply safe area adjustments if needed
-			if (_safeAreaHandler.RespondsToSafeArea())
-			{
-				destination = _safeAreaHandler.AdjustForSafeArea(destination);
-			}
+
+			// Account for padding in layout bounds
+			var paddingLeft = _context.FromPixels(PaddingLeft);
+			var paddingTop = _context.FromPixels(PaddingTop);
+			var paddingRight = _context.FromPixels(PaddingRight);
+			var paddingBottom = _context.FromPixels(PaddingBottom);
+
+			destination = new Rectangle(
+				destination.X + paddingLeft,
+				destination.Y + paddingTop,
+				Math.Max(0, destination.Width - paddingLeft - paddingRight),
+				Math.Max(0, destination.Height - paddingTop - paddingBottom));
 
 			CrossPlatformArrange(destination);
 		}

src/Core/src/Platform/Android/LayoutViewGroup.cs

@@ -102,15 +102,23 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 			var deviceIndependentWidth = widthMeasureSpec.ToDouble(_context);
 			var deviceIndependentHeight = heightMeasureSpec.ToDouble(_context);
 
+			// Account for padding in available space
+			var paddingLeft = _context.FromPixels(PaddingLeft);
+			var paddingTop = _context.FromPixels(PaddingTop);
+			var paddingRight = _context.FromPixels(PaddingRight);
+			var paddingBottom = _context.FromPixels(PaddingBottom);
+
+			var availableWidth = Math.Max(0, deviceIndependentWidth - paddingLeft - paddingRight);
+			var availableHeight = Math.Max(0, deviceIndependentHeight - paddingTop - paddingBottom);
+
 			var widthMode = MeasureSpec.GetMode(widthMeasureSpec);
 			var heightMode = MeasureSpec.GetMode(heightMeasureSpec);
-			// TODO make measure sync with safearea
-			var measure = CrossPlatformMeasure(deviceIndependentWidth, deviceIndependentHeight);
+			var measure = CrossPlatformMeasure(availableWidth, availableHeight);
 
 			// If the measure spec was exact, we should return the explicit size value, even if the content
 			// measure came out to a different size
-			var width = widthMode == MeasureSpecMode.Exactly ? deviceIndependentWidth : measure.Width;
-			var height = heightMode == MeasureSpecMode.Exactly ? deviceIndependentHeight : measure.Height;
+			var width = widthMode == MeasureSpecMode.Exactly ? deviceIndependentWidth : measure.Width + paddingLeft + paddingRight;
+			var height = heightMode == MeasureSpecMode.Exactly ? deviceIndependentHeight : measure.Height + paddingTop + paddingBottom;
 
 			var platformWidth = _context.ToPixels(width);
 			var platformHeight = _context.ToPixels(height);
@@ -134,11 +142,17 @@ protected override void OnLayout(bool changed, int l, int t, int r, int b)
 
 			var destination = _context.ToCrossPlatformRectInReferenceFrame(l, t, r, b);
 
-			// Apply safe area adjustments if needed
-			if (_safeAreaHandler.RespondsToSafeArea())
-			{
-				destination = _safeAreaHandler.AdjustForSafeArea(destination);
-			}
+			// Account for padding in layout bounds
+			var paddingLeft = _context.FromPixels(PaddingLeft);
+			var paddingTop = _context.FromPixels(PaddingTop);
+			var paddingRight = _context.FromPixels(PaddingRight);
+			var paddingBottom = _context.FromPixels(PaddingBottom);
+
+			destination = new Rectangle(
+				destination.X + paddingLeft,
+				destination.Y + paddingTop,
+				Math.Max(0, destination.Width - paddingLeft - paddingRight),
+				Math.Max(0, destination.Height - paddingTop - paddingBottom));
 
 			CrossPlatformArrange(destination);
 

src/Core/src/Platform/Android/SafeAreaHandler.cs

@@ -26,20 +26,20 @@ internal class SafeAreaHandler(View owner, Context context, Func<ICrossPlatformL
     bool? _scrollViewDescendant;
 
     internal IOnApplyWindowInsetsListener GetWindowInsetsListener() =>
-        new WindowInsetsListener(this, () => _owner.RequestLayout());
+        new WindowInsetsListener(this);
 
     /// <summary>
     /// Forces a re-application of window insets when safe area configuration changes.
     /// This ensures OnApplyWindowInsets is called before measure and arrange.
     /// </summary>
     internal void InvalidateWindowInsets()
     {
-        if (_lastReceivedInsets is not null)
+        /*if (_lastReceivedInsets is not null)
         {
             // Re-apply the last received insets to trigger OnApplyWindowInsets
             ViewCompat.DispatchApplyWindowInsets(_owner, _lastReceivedInsets);
         }
-        else
+        else*/
         {
             // Request fresh insets from the system
             ViewCompat.RequestApplyInsets(_owner);
@@ -164,10 +164,10 @@ bool ValidateSafeArea()
     internal void UpdateSafeAreaConfiguration()
     {
         // Clear cached ScrollView descendant check
-        _scrollViewDescendant = null;
+        // _scrollViewDescendant = null;
 
         // Force re-calculation of safe area
-        var oldSafeArea = _safeArea;
+        // var oldSafeArea = _safeArea;
         _safeArea = GetAdjustedSafeAreaInsets();
 
         // Always invalidate insets when configuration changes, regardless of whether
@@ -194,10 +194,9 @@ internal static bool HasAnyRegions(ISafeAreaView2 sav2)
     /// <summary>
     /// WindowInsets listener for ContentViewGroup and LayoutViewGroup.
     /// </summary>
-    public class WindowInsetsListener(SafeAreaHandler handler, Action requestLayout) : Java.Lang.Object, IOnApplyWindowInsetsListener
+    public class WindowInsetsListener(SafeAreaHandler handler) : Java.Lang.Object, IOnApplyWindowInsetsListener
     {
         readonly WeakReference<SafeAreaHandler> _handlerRef = new(handler ?? throw new ArgumentNullException(nameof(handler)));
-        readonly WeakReference<Action> _requestLayoutRef = new(requestLayout ?? throw new ArgumentNullException(nameof(requestLayout)));
 
         public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
         {
@@ -208,7 +207,7 @@ public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
             }
 
             // Get handler and requestLayout from weak references
-            if (!_handlerRef.TryGetTarget(out var handler) || !_requestLayoutRef.TryGetTarget(out var requestLayout))
+            if (!_handlerRef.TryGetTarget(out var handler))
             {
                 // Handler or requestLayout has been garbage collected, return insets unchanged
                 return insets;
@@ -223,40 +222,35 @@ public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
 
             handler.UpdateKeyboardState(keyboardInsets, isKeyboardShowing);
 
-            // Request layout if keyboard state changed
-            if (wasKeyboardShowing != isKeyboardShowing)
-            {
-                requestLayout();
-            }
+            var viewInsets = handler.GetAdjustedSafeAreaInsets();
+            var context = handler._context;
 
-            requestLayout();
+            v.SetPadding((int)context.ToPixels(viewInsets.Left), (int)context.ToPixels(viewInsets.Top), (int)context.ToPixels(viewInsets.Right), (int)context.ToPixels(viewInsets.Bottom));
 
-            var crossPlatformLayout = handler._getCrossPlatformLayout();
 
-            // Use RespondsToSafeArea to check if this view should handle safe area
-            if (!handler.RespondsToSafeArea())
+            // This is just a quick hack to demonstrate the idea
+            // in the real implementation you would check each of these insets against the relative SafeAreaRegions
+            // and just specify which range is consumed or not
+            if (viewInsets.Top > 0 || viewInsets.Bottom > 0 || viewInsets.Left > 0 || viewInsets.Right > 0)
             {
-                // For deeper descendants of ScrollView, consume all insets to prevent double-application
-                return ConsumeAllInsets(insets);
-            }
 
-            if (handler._getCrossPlatformLayout() is ISafeAreaView2 sav2 && HasAnyRegions(sav2))
-            {
-                return ConsumeAllInsets(insets);
+                // This is also somewhat of a hack, AFAICT you need to reset the padding on all children that were previouslly consuming the insets
+                // There's probably a more efficient way to do this
+                // One approach here could be for us to just make one global SafeAreaHandler that gets applied to every view
+                // and then that handler would have a tracking list of views so it could know where to dispatch and reset.
+                var descendant = v.FindDescendantView<ViewGroup>((view) => view is ICrossPlatformLayoutBacking && view != v);
+                descendant?.DispatchApplyWindowInsets(WindowInsets.Consumed);
+
+                while (descendant != null)
+                {
+                    descendant = descendant.FindDescendantView<ViewGroup>((view) => view is ICrossPlatformLayoutBacking && view != descendant);
+                    descendant?.DispatchApplyWindowInsets(WindowInsets.Consumed);
+                }
+
+                return WindowInsetsCompat.Consumed;
             }
 
-            // This view is not a ScrollView descendant, pass insets through unchanged
             return insets;
         }
-
-        static WindowInsetsCompat ConsumeAllInsets(WindowInsetsCompat insets)
-        {
-            // Consume all insets to prevent safe area handling for ScrollView descendants
-            return new WindowInsetsCompat.Builder(insets)
-                .SetInsets(WindowInsetsCompat.Type.SystemBars(), AndroidX.Core.Graphics.Insets.None)
-                .SetInsets(WindowInsetsCompat.Type.DisplayCutout(), AndroidX.Core.Graphics.Insets.None)
-                .SetInsets(WindowInsetsCompat.Type.Ime(), AndroidX.Core.Graphics.Insets.None)
-                .Build();
-        }
     }
-}
+}

src/Core/src/Platform/Android/ViewGroupExtensions.cs

@@ -57,7 +57,7 @@ public static bool TryGetFirstChildOfType<T>(this AViewGroup viewGroup, [NotNull
 
 		internal static T? GetChildAt<T>(this AView view, int index) where T : AView
 		{
-			if (view is AViewGroup viewGroup && viewGroup.ChildCount < index)
+			if (view is AViewGroup viewGroup && index < viewGroup.ChildCount)
 				return (T?)viewGroup.GetChildAt(index);
 
 			return null;