Revert formatting-only changes to focus on functional changes

Reverted formatting changes (indentation, whitespace) from files that had no functional changes:
- EditTextExtensions.cs
- ViewExtensions.cs
- PickerExtensions.cs
- SearchViewExtensions.cs
- StepperHandlerManager.cs
- MauiPageControl.cs
- MauiSwipeView.cs
- MauiWebView.cs
- IHandleWindowInsets.cs
- ShellToolbarTracker.cs
- ShellFlyoutTemplatedContentRenderer.cs

Kept functional change in SafeAreaExtensions.cs (MauiWindowInsetListener.FindListenerForView) while reverting formatting changes.

This makes the PR focused on functional changes only, with formatting changes deferred to a separate PR.

Co-authored-by: PureWeen <[email protected]>

Author: Copilot

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

@@ -85,7 +85,7 @@ void OnFlyoutStateChanging(object sender, AndroidX.DrawerLayout.Widget.DrawerLay
 		// - Keep this minimal.
 		// - Will be replaced by the planned comprehensive window insets solution.
 		// - Do not extend; add new logic to the forthcoming implementation instead.
-		internal class WindowsListener : MauiWindowInsetListener, IOnApplyWindowInsetsListener
+		internal class WindowsListener : Java.Lang.Object, IOnApplyWindowInsetsListener
 		{
 			private WeakReference<ImageView> _bgImageRef;
 			private WeakReference<AView> _flyoutViewRef;
@@ -100,10 +100,10 @@ public AView FlyoutView
 
 					return null;
 				}
-				set
-				{
+                set
+                {
 					_flyoutViewRef = new WeakReference<AView>(value);
-				}
+                }
 			}
 			public AView FooterView
 			{
@@ -114,68 +114,62 @@ public AView FooterView
 
 					return null;
 				}
-				set
-				{
+                set
+                {
 					_footerViewRef = new WeakReference<AView>(value);
-				}
+                }
 			}
 
 			public WindowsListener(ImageView bgImage)
 			{
 				_bgImageRef = new WeakReference<ImageView>(bgImage);
 			}
 
-			public override WindowInsetsCompat OnApplyWindowInsets(AView v, WindowInsetsCompat insets)
+			public WindowInsetsCompat OnApplyWindowInsets(AView v, WindowInsetsCompat insets)
 			{
 				if (insets == null || v == null)
 					return insets;
 
-				if (v is CoordinatorLayout)
-				{
-					// The flyout overlaps the status bar so we don't really care about insetting it
-					var systemBars = insets.GetInsets(WindowInsetsCompat.Type.SystemBars());
-					var displayCutout = insets.GetInsets(WindowInsetsCompat.Type.DisplayCutout());
-					var topInset = Math.Max(systemBars?.Top ?? 0, displayCutout?.Top ?? 0);
-					var bottomInset = Math.Max(systemBars?.Bottom ?? 0, displayCutout?.Bottom ?? 0);
-					var appbarLayout = v.FindDescendantView<AppBarLayout>((v) => true);
+				// The flyout overlaps the status bar so we don't really care about insetting it
+				var systemBars = insets.GetInsets(WindowInsetsCompat.Type.SystemBars());
+				var displayCutout = insets.GetInsets(WindowInsetsCompat.Type.DisplayCutout());
+				var topInset = Math.Max(systemBars?.Top ?? 0, displayCutout?.Top ?? 0);
+				var bottomInset = Math.Max(systemBars?.Bottom ?? 0, displayCutout?.Bottom ?? 0);
+				var appbarLayout = v.FindDescendantView<AppBarLayout>((v) => true);
 
-					int flyoutViewBottomInset = 0;
-
-					if (FooterView is not null)
-					{
-						v.SetPadding(0, 0, 0, bottomInset);
-						flyoutViewBottomInset = 0;
-					}
-					else
-					{
-						flyoutViewBottomInset = bottomInset;
-						v.SetPadding(0, 0, 0, 0);
-					}
-
-					if (appbarLayout.MeasuredHeight > 0)
-					{
-						FlyoutView?.SetPadding(0, 0, 0, flyoutViewBottomInset);
-						appbarLayout?.SetPadding(0, topInset, 0, 0);
-					}
-					else
-					{
-						FlyoutView?.SetPadding(0, topInset, 0, flyoutViewBottomInset);
-						appbarLayout?.SetPadding(0, 0, 0, 0);
-					}
+				int flyoutViewBottomInset = 0;
 
-					if (_bgImageRef != null && _bgImageRef.TryGetTarget(out var bgImage) && bgImage != null)
-					{
-						bgImage.SetPadding(0, topInset, 0, bottomInset);
-					}
+				if (FooterView is not null)
+				{
+					v.SetPadding(0, 0, 0, bottomInset);
+					flyoutViewBottomInset = 0;
+				}
+                else
+                {
+					flyoutViewBottomInset = bottomInset;
+					v.SetPadding(0, 0, 0, 0);
+                }
 
-					return WindowInsetsCompat.Consumed;
+				if (appbarLayout.MeasuredHeight > 0)
+				{
+					FlyoutView?.SetPadding(0, 0, 0, flyoutViewBottomInset);
+					appbarLayout?.SetPadding(0, topInset, 0, 0);
 				}
+				else
+				{
+					FlyoutView?.SetPadding(0, topInset, 0, flyoutViewBottomInset);
+					appbarLayout?.SetPadding(0, 0, 0, 0);
+                }
 
+				if (_bgImageRef != null && _bgImageRef.TryGetTarget(out var bgImage) && bgImage != null)
+				{
+					bgImage.SetPadding(0, topInset, 0, bottomInset);
+				}
 
-				return base.OnApplyWindowInsets(v, insets);
+				return WindowInsetsCompat.Consumed;
 			}
 		}
-
+		
 		protected virtual void LoadView(IShellContext shellContext)
 		{
 			var context = shellContext.AndroidContext;
@@ -208,7 +202,7 @@ protected virtual void LoadView(IShellContext shellContext)
 			};
 
 			_windowsListener = new WindowsListener(_bgImage);
-			MauiWindowInsetListener.SetupViewWithLocalListener(coordinator, _windowsListener);
+			ViewCompat.SetOnApplyWindowInsetsListener(coordinator, _windowsListener);
 
 			UpdateFlyoutHeaderBehavior();
 			_shellContext.Shell.PropertyChanged += OnShellPropertyChanged;
@@ -724,12 +718,6 @@ public void OnOffsetChanged(AppBarLayout appBarLayout, int verticalOffset)
 
 		internal void Disconnect()
 		{
-
-			if (_rootView is CoordinatorLayout coordinator)
-			{
-				MauiWindowInsetListener.RemoveViewWithLocalListener(coordinator);
-			}
-
 			if (_shellContext?.Shell != null)
 				_shellContext.Shell.PropertyChanged -= OnShellPropertyChanged;
 
@@ -738,12 +726,14 @@ internal void Disconnect()
 
 			_flyoutHeader = null;
 
-			_footerView?.View = null;
+			if (_footerView != null)
+				_footerView.View = null;
 
 			_headerView?.Disconnect();
 			DisconnectRecyclerView();
 
-			_contentView?.View = null;
+			if (_contentView != null)
+				_contentView.View = null;
 		}
 
 		protected override void Dispose(bool disposing)
@@ -774,7 +764,8 @@ protected override void Dispose(bool disposing)
 				if (_headerView != null)
 					_headerView.LayoutChange -= OnHeaderViewLayoutChange;
 
-				_contentView?.View = null;
+				if (_contentView != null)
+					_contentView.View = null;
 
 				_flyoutContentView?.Dispose();
 				_headerView?.Dispose();

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

@@ -474,7 +474,8 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
 				defaultDrawerArrowDrawable = true;
 			}
 
-			icon?.Progress = (CanNavigateBack) ? 1 : 0;
+			if (icon != null)
+				icon.Progress = (CanNavigateBack) ? 1 : 0;
 
 			if (command != null || CanNavigateBack)
 			{

src/Core/src/Platform/Android/EditTextExtensions.cs

@@ -414,7 +414,7 @@ internal static bool HandleClearButtonTouched(this EditText? platformView, Touch
 		// Android.Graphics.Rect has a Containts(x,y) method, but it only takes `int` and the coordinates from
 		// the motion event are `float`. The we use GetX() and GetY() so our coordinates are relative to the
 		// bounds of the EditText.
-		static bool RectContainsMotionEvent(global::Android.Graphics.Rect rect, MotionEvent motionEvent)
+		static bool RectContainsMotionEvent(global::Android.Graphics.Rect  rect, MotionEvent motionEvent)
 		{
 			var x = motionEvent.GetX();
 

src/Core/src/Platform/Android/IHandleWindowInsets.cs

@@ -3,23 +3,23 @@
 
 namespace Microsoft.Maui.Platform
 {
-	/// <summary>
-	/// Interface for views that need to handle their own window insets behavior
-	/// </summary>
-	internal interface IHandleWindowInsets
-	{
-		/// <summary>
-		/// Handles window insets for this view
-		/// </summary>
-		/// <param name="view">The view receiving the insets</param>
-		/// <param name="insets">The window insets</param>
-		/// <returns>The processed window insets</returns>
-		WindowInsetsCompat? HandleWindowInsets(AView view, WindowInsetsCompat insets);
+    /// <summary>
+    /// Interface for views that need to handle their own window insets behavior
+    /// </summary>
+    internal interface IHandleWindowInsets
+    {
+        /// <summary>
+        /// Handles window insets for this view
+        /// </summary>
+        /// <param name="view">The view receiving the insets</param>
+        /// <param name="insets">The window insets</param>
+        /// <returns>The processed window insets</returns>
+        WindowInsetsCompat? HandleWindowInsets(AView view, WindowInsetsCompat insets);
 
-		/// <summary>
-		/// Resets any previously applied insets on this view
-		/// </summary>
-		/// <param name="view">The view to reset</param>
-		void ResetWindowInsets(AView view);
-	}
+        /// <summary>
+        /// Resets any previously applied insets on this view
+        /// </summary>
+        /// <param name="view">The view to reset</param>
+        void ResetWindowInsets(AView view);
+    }
 }

src/Core/src/Platform/Android/MauiPageControl.cs

@@ -154,7 +154,9 @@ void UpdateShapes()
 			shape.SetIntrinsicHeight((int)Context.ToPixels(indicatorSize));
 			shape.SetIntrinsicWidth((int)Context.ToPixels(indicatorSize));
 
-			shape.Paint?.Color = color;
+			if (shape.Paint != null)
+#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-android/issues/6962
+				shape.Paint.Color = color;
 #pragma warning restore CA1416
 
 			return shape;

src/Core/src/Platform/Android/MauiSwipeView.cs

@@ -1320,7 +1320,8 @@ static void ExecuteSwipeItem(ISwipeItem item)
 
 		void EnableParentGesture(bool isGestureEnabled)
 		{
-			_viewPagerParent?.EnableGesture = isGestureEnabled;
+			if (_viewPagerParent != null)
+				_viewPagerParent.EnableGesture = isGestureEnabled;
 		}
 
 		internal void OnOpenRequested(SwipeViewOpenRequest e)

src/Core/src/Platform/Android/MauiWebView.cs

@@ -17,7 +17,8 @@ public MauiWebView(WebViewHandler handler, Context context) : base(context)
 
 		void IWebViewDelegate.LoadHtml(string? html, string? baseUrl)
 		{
-			_handler?.CurrentNavigationEvent = WebNavigationEvent.NewPage;
+			if (_handler != null)
+				_handler.CurrentNavigationEvent = WebNavigationEvent.NewPage;
 
 			LoadDataWithBaseURL(baseUrl ?? AssetBaseUrl, html ?? string.Empty, "text/html", "UTF-8", null);
 		}
@@ -26,7 +27,10 @@ void IWebViewDelegate.LoadUrl(string? url)
 		{
 			if (!_handler.NavigatingCanceled(url))
 			{
-				_handler?.CurrentNavigationEvent = WebNavigationEvent.NewPage;
+				if (_handler != null)
+				{
+					_handler.CurrentNavigationEvent = WebNavigationEvent.NewPage;
+				}
 
 				if (url is not null && !url.StartsWith('/') && !Uri.TryCreate(url, UriKind.Absolute, out _))
 				{

src/Core/src/Platform/Android/PickerExtensions.cs

@@ -57,7 +57,8 @@ internal static void UpdateFlowDirection(this AppCompatAlertDialog alertDialog,
 			// Propagate the MauiPicker LayoutDirection to the AlertDialog
 			var dv = alertDialog.Window?.DecorView;
 
-			dv?.LayoutDirection = platformLayoutDirection;
+			if (dv is not null)
+				dv.LayoutDirection = platformLayoutDirection;
 
 			var lv = alertDialog?.ListView;