From feb15710aa5040fc74236936323f3473e856b950 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sun, 12 Jan 2025 12:35:34 +0100
Subject: [PATCH 1/7] [iOS] Improve status bar

---
 .../Behaviors/StatusBarBehaviorPage.xaml      |  2 +
 .../Platform/StatusBar/StatusBar.ios.cs       | 17 +++++-
 .../StatusBar/StatusBarBehavior.shared.cs     |  6 +-
 .../iOSSpecific/StatusBar.cs                  | 59 +++++++++++++++++++
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
index f86bf5f884..50a07c6163 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
@@ -6,6 +6,8 @@
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
     xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Behaviors"
+    xmlns:ios="clr-namespace:CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific;assembly=CommunityToolkit.Maui"
+    ios:StatusBar.UseSafeArea="True"
     Title="StatusBarBehavior"
     x:DataType="vm:StatusBarBehaviorViewModel"
     x:TypeArguments="vm:StatusBarBehaviorViewModel"
diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index a4403260aa..72d45f983b 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -11,7 +11,7 @@ static partial class StatusBar
 	/// <summary>
 	/// Method to update the status bar size.
 	/// </summary>
-	public static void UpdateBarSize()
+	public static void UpdateBarSize(bool useSafeArea)
 	{
 		if (OperatingSystem.IsIOSVersionAtLeast(13))
 		{
@@ -27,7 +27,14 @@ public static void UpdateBarSize()
 
 				statusBar ??= new UIView(statusBarFrame.Value);
 				statusBar.Tag = statusBarTag;
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
+				if (useSafeArea)
+				{
+					statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
+				}
+				else
+				{
+					statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
+				}
 				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
 				foreach (var statusBarSubView in statusBarSubViews)
 				{
@@ -68,11 +75,15 @@ static void PlatformSetColor(Color color)
 
 				// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
 				// window.ViewWithTag(tag) can return null
+				var statusBarSize = statusBar?.Frame.Size;
 				statusBar ??= new UIView(statusBarFrame.Value);
 				statusBar.Tag = statusBarTag;
 				statusBar.BackgroundColor = uiColor;
 				statusBar.TintColor = uiColor;
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
+				if (statusBarSize is null)
+				{
+					statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
+				}
 				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
 				foreach (var statusBarSubView in statusBarSubViews)
 				{
diff --git a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
index 507af7c4c1..85bcfc84b6 100644
--- a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
+++ b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
@@ -119,7 +119,11 @@ protected override void OnDetachedFrom(Page bindable, object platformView)
 #if IOS
 	static void OnPageSizeChanged(object? sender, EventArgs e)
 	{
-		StatusBar.UpdateBarSize();
+		if(sender is not Page page)
+		{
+			return;
+		}
+		StatusBar.UpdateBarSize(PlatformConfiguration.iOSSpecific.StatusBar.GetUseSafeArea(page));
 	}
 #endif
 
diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs
new file mode 100644
index 0000000000..d5ae302688
--- /dev/null
+++ b/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs
@@ -0,0 +1,59 @@
+using System.Runtime.Versioning;
+using MiOS = Microsoft.Maui.Controls.PlatformConfiguration.iOS;
+using MauiElement = Microsoft.Maui.Controls.Page;
+
+namespace CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific;
+
+/// <summary>
+/// Provides platform-specific configuration properties for the iOS StatusBar bar.
+/// </summary>
+[SupportedOSPlatform("ios")]
+public static class StatusBar
+{
+	/// <summary>
+	/// Identifies the UseSafeArea bindable property.
+	/// </summary>
+	public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.CreateAttached("UseSafeArea", typeof(bool), typeof(StatusBar), true);
+
+	/// <summary>
+	/// Gets the UseSafeArea of the navigation bar.
+	/// </summary>
+	/// <param name="element">The bindable object.</param>
+	/// <returns>The UseSafeArea value.</returns>
+	public static bool GetUseSafeArea(BindableObject element)
+	{
+		return (bool)element.GetValue(UseSafeAreaProperty);
+	}
+
+	/// <summary>
+	/// Sets the UseSafeArea of the navigation bar.
+	/// </summary>
+	/// <param name="element">The bindable object.</param>
+	/// <param name="value">The UseSafeArea to set.</param>
+	public static void SetUseSafeArea(BindableObject element, bool value)
+	{
+		element.SetValue(UseSafeAreaProperty, value);
+	}
+
+	/// <summary>
+	/// Sets the UseSafeArea of the navigation bar.
+	/// </summary>
+	/// <param name="config">The platform element configuration.</param>
+	/// <param name="value">The UseSafeArea to set.</param>
+	/// <returns>The platform element configuration.</returns>
+	public static IPlatformElementConfiguration<MiOS, MauiElement> SetUseSafeArea(this IPlatformElementConfiguration<MiOS, MauiElement> config, bool value)
+	{
+		SetUseSafeArea(config.Element, value);
+		return config;
+	}
+
+	/// <summary>
+	/// Gets the UseSafeArea of the navigation bar.
+	/// </summary>
+	/// <param name="config">The platform element configuration.</param>
+	/// <returns>The UseSafeArea value</returns>
+	public static bool GetUseSafeArea(this IPlatformElementConfiguration<MiOS, MauiElement> config)
+	{
+		return GetUseSafeArea(config.Element);
+	}
+}
\ No newline at end of file

From a5da5b110c6894cd370ca13e9520aa5e0385443a Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:15:45 -0800
Subject: [PATCH 2/7] Use
 `Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea`,
 Remove `CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific.StatusBar`,
 Remove `OperatingSystem.IsIOSVersionAtLeast(13))` (Toolkit now supports iOS
 15+)

---
 .../Pages/Base/BasePage.cs                    |  7 +--
 .../Behaviors/StatusBarBehaviorPage.xaml      |  6 +-
 .../Platform/StatusBar/StatusBar.ios.cs       | 55 +++++++----------
 .../StatusBar/StatusBarBehavior.shared.cs     | 35 +++++------
 .../iOSSpecific/StatusBar.cs                  | 59 -------------------
 5 files changed, 43 insertions(+), 119 deletions(-)
 delete mode 100644 src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
index e659b1568e..c88679bddc 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Base/BasePage.cs
@@ -3,12 +3,9 @@
 
 namespace CommunityToolkit.Maui.Sample.Pages;
 
-public abstract class BasePage<TViewModel> : BasePage where TViewModel : BaseViewModel
+public abstract class BasePage<TViewModel>(TViewModel viewModel) : BasePage(viewModel)
+	where TViewModel : BaseViewModel
 {
-	protected BasePage(TViewModel viewModel) : base(viewModel)
-	{
-	}
-
 	public new TViewModel BindingContext => (TViewModel)base.BindingContext;
 }
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
index 50a07c6163..7698437c54 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/StatusBarBehaviorPage.xaml
@@ -6,8 +6,8 @@
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
     xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Behaviors"
-    xmlns:ios="clr-namespace:CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific;assembly=CommunityToolkit.Maui"
-    ios:StatusBar.UseSafeArea="True"
+    xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
+    ios:Page.UseSafeArea="True"
     Title="StatusBarBehavior"
     x:DataType="vm:StatusBarBehaviorViewModel"
     x:TypeArguments="vm:StatusBarBehaviorViewModel"
@@ -83,7 +83,7 @@
 
     <ScrollView Padding="{StaticResource ContentPadding}">
 
-        <VerticalStackLayout Padding="15,0" Spacing="30">
+        <VerticalStackLayout Padding="15,0" Spacing="30" IgnoreSafeArea="False">
 
             <Label Text="Slide to change StatusBar color" />
 
diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 72d45f983b..9fc301bf30 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -11,49 +11,33 @@ static partial class StatusBar
 	/// <summary>
 	/// Method to update the status bar size.
 	/// </summary>
-	public static void UpdateBarSize(bool useSafeArea)
+	public static void SetBarSize(bool isUsingSafeArea)
 	{
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
+		var statusBarTag = new IntPtr(38482);
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var statusBarTag = new IntPtr(38482);
-			foreach (var window in UIApplication.SharedApplication.Windows)
+			var statusBar = window.ViewWithTag(statusBarTag);
+			var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
+			if (statusBarFrame is null)
 			{
-				var statusBar = window.ViewWithTag(statusBarTag);
-				var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
-				if (statusBarFrame is null)
-				{
-					continue;
-				}
-
-				statusBar ??= new UIView(statusBarFrame.Value);
-				statusBar.Tag = statusBarTag;
-				if (useSafeArea)
-				{
-					statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
-				}
-				else
-				{
-					statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
-				}
-				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
-				foreach (var statusBarSubView in statusBarSubViews)
-				{
-					statusBarSubView.RemoveFromSuperview();
-				}
+				continue;
+			}
 
-				window.AddSubview(statusBar);
+			statusBar ??= new UIView(statusBarFrame.Value);
+			statusBar.Tag = statusBarTag;
+			statusBar.Frame = isUsingSafeArea
+				? new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top)
+				: UIApplication.SharedApplication.StatusBarFrame;
 
-				TryUpdateStatusBarAppearance(window);
-			}
-		}
-		else
-		{
-			if (UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) is UIView statusBar)
+			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
+			foreach (var statusBarSubView in statusBarSubViews)
 			{
-				statusBar.Frame = UIApplication.SharedApplication.StatusBarFrame;
+				statusBarSubView.RemoveFromSuperview();
 			}
 
-			TryUpdateStatusBarAppearance();
+			window.AddSubview(statusBar);
+
+			TryUpdateStatusBarAppearance(window);
 		}
 	}
 
@@ -84,6 +68,7 @@ static void PlatformSetColor(Color color)
 				{
 					statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
 				}
+
 				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
 				foreach (var statusBarSubView in statusBarSubViews)
 				{
diff --git a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
index 85bcfc84b6..521342b6cd 100644
--- a/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
+++ b/src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/StatusBar/StatusBarBehavior.shared.cs
@@ -78,52 +78,53 @@ public StatusBarApplyOn ApplyOn
 
 	/// <inheritdoc /> 
 #if IOS
-	protected override void OnAttachedTo(Page bindable, UIKit.UIView platformView)
+	protected override void OnAttachedTo(Page page, UIKit.UIView platformView)
 #elif ANDROID
-	protected override void OnAttachedTo(Page bindable, Android.Views.View platformView)
+	protected override void OnAttachedTo(Page page, Android.Views.View platformView)
 #else
-	protected override void OnAttachedTo(Page bindable, object platformView)
+	protected override void OnAttachedTo(Page page, object platformView)
 #endif
 	{
-		base.OnAttachedTo(bindable, platformView);
+		base.OnAttachedTo(page, platformView);
 
 		if (ApplyOn is StatusBarApplyOn.OnBehaviorAttachedTo)
 		{
+#if IOS
+			StatusBar.SetBarSize(Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea(page));
+#endif
+
 			StatusBar.SetColor(StatusBarColor);
 			StatusBar.SetStyle(StatusBarStyle);
 		}
 
-		bindable.NavigatedTo += OnPageNavigatedTo;
+		page.NavigatedTo += OnPageNavigatedTo;
 #if IOS
-		bindable.SizeChanged += OnPageSizeChanged;
+		page.SizeChanged += OnPageSizeChanged;
 #endif
 	}
 
 	/// <inheritdoc /> 
 #if IOS
-	protected override void OnDetachedFrom(Page bindable, UIKit.UIView platformView)
+	protected override void OnDetachedFrom(Page page, UIKit.UIView platformView)
 #elif ANDROID
-	protected override void OnDetachedFrom(Page bindable, Android.Views.View platformView)
+	protected override void OnDetachedFrom(Page page, Android.Views.View platformView)
 #else
-	protected override void OnDetachedFrom(Page bindable, object platformView)
+	protected override void OnDetachedFrom(Page page, object platformView)
 #endif
 	{
 #if IOS
-		bindable.SizeChanged -= OnPageSizeChanged;
+		page.SizeChanged -= OnPageSizeChanged;
 #endif
-		base.OnDetachedFrom(bindable, platformView);
+		base.OnDetachedFrom(page, platformView);
 
-		bindable.NavigatedTo -= OnPageNavigatedTo;
+		page.NavigatedTo -= OnPageNavigatedTo;
 	}
 
 #if IOS
 	static void OnPageSizeChanged(object? sender, EventArgs e)
 	{
-		if(sender is not Page page)
-		{
-			return;
-		}
-		StatusBar.UpdateBarSize(PlatformConfiguration.iOSSpecific.StatusBar.GetUseSafeArea(page));
+		ArgumentNullException.ThrowIfNull(sender);
+		StatusBar.SetBarSize(Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.GetUseSafeArea((Page)sender));
 	}
 #endif
 
diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs
deleted file mode 100644
index d5ae302688..0000000000
--- a/src/CommunityToolkit.Maui/PlatformConfiguration/iOSSpecific/StatusBar.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Runtime.Versioning;
-using MiOS = Microsoft.Maui.Controls.PlatformConfiguration.iOS;
-using MauiElement = Microsoft.Maui.Controls.Page;
-
-namespace CommunityToolkit.Maui.PlatformConfiguration.iOSSpecific;
-
-/// <summary>
-/// Provides platform-specific configuration properties for the iOS StatusBar bar.
-/// </summary>
-[SupportedOSPlatform("ios")]
-public static class StatusBar
-{
-	/// <summary>
-	/// Identifies the UseSafeArea bindable property.
-	/// </summary>
-	public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.CreateAttached("UseSafeArea", typeof(bool), typeof(StatusBar), true);
-
-	/// <summary>
-	/// Gets the UseSafeArea of the navigation bar.
-	/// </summary>
-	/// <param name="element">The bindable object.</param>
-	/// <returns>The UseSafeArea value.</returns>
-	public static bool GetUseSafeArea(BindableObject element)
-	{
-		return (bool)element.GetValue(UseSafeAreaProperty);
-	}
-
-	/// <summary>
-	/// Sets the UseSafeArea of the navigation bar.
-	/// </summary>
-	/// <param name="element">The bindable object.</param>
-	/// <param name="value">The UseSafeArea to set.</param>
-	public static void SetUseSafeArea(BindableObject element, bool value)
-	{
-		element.SetValue(UseSafeAreaProperty, value);
-	}
-
-	/// <summary>
-	/// Sets the UseSafeArea of the navigation bar.
-	/// </summary>
-	/// <param name="config">The platform element configuration.</param>
-	/// <param name="value">The UseSafeArea to set.</param>
-	/// <returns>The platform element configuration.</returns>
-	public static IPlatformElementConfiguration<MiOS, MauiElement> SetUseSafeArea(this IPlatformElementConfiguration<MiOS, MauiElement> config, bool value)
-	{
-		SetUseSafeArea(config.Element, value);
-		return config;
-	}
-
-	/// <summary>
-	/// Gets the UseSafeArea of the navigation bar.
-	/// </summary>
-	/// <param name="config">The platform element configuration.</param>
-	/// <returns>The UseSafeArea value</returns>
-	public static bool GetUseSafeArea(this IPlatformElementConfiguration<MiOS, MauiElement> config)
-	{
-		return GetUseSafeArea(config.Element);
-	}
-}
\ No newline at end of file

From 75093d9a121d3f1d0493e06a9c16746e33f224d8 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:19:34 -0800
Subject: [PATCH 3/7] Remove iOS 13 check (Toolkit only supports iOS 15+)

---
 .../Platform/StatusBar/StatusBar.ios.cs       | 65 ++++++++-----------
 1 file changed, 26 insertions(+), 39 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 9fc301bf30..97bc167203 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -44,51 +44,38 @@ public static void SetBarSize(bool isUsingSafeArea)
 	static void PlatformSetColor(Color color)
 	{
 		var uiColor = color.ToPlatform();
-
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
+		
+		var statusBarTag = new IntPtr(38482);
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var statusBarTag = new IntPtr(38482);
-			foreach (var window in UIApplication.SharedApplication.Windows)
+			var statusBar = window.ViewWithTag(statusBarTag);
+			var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
+			if (statusBarFrame is null)
 			{
-				var statusBar = window.ViewWithTag(statusBarTag);
-				var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
-				if (statusBarFrame is null)
-				{
-					continue;
-				}
-
-				// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
-				// window.ViewWithTag(tag) can return null
-				var statusBarSize = statusBar?.Frame.Size;
-				statusBar ??= new UIView(statusBarFrame.Value);
-				statusBar.Tag = statusBarTag;
-				statusBar.BackgroundColor = uiColor;
-				statusBar.TintColor = uiColor;
-				if (statusBarSize is null)
-				{
-					statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
-				}
-
-				var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
-				foreach (var statusBarSubView in statusBarSubViews)
-				{
-					statusBarSubView.RemoveFromSuperview();
-				}
-
-				window.AddSubview(statusBar);
-
-				TryUpdateStatusBarAppearance(window);
+				continue;
 			}
-		}
-		else
-		{
-			if (UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) is UIView statusBar
-				&& statusBar.RespondsToSelector(new ObjCRuntime.Selector("setBackgroundColor:")))
+
+			// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
+			// window.ViewWithTag(tag) can return null
+			var statusBarSize = statusBar?.Frame.Size;
+			statusBar ??= new UIView(statusBarFrame.Value);
+			statusBar.Tag = statusBarTag;
+			statusBar.BackgroundColor = uiColor;
+			statusBar.TintColor = uiColor;
+			if (statusBarSize is null)
+			{
+				statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
+			}
+
+			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
+			foreach (var statusBarSubView in statusBarSubViews)
 			{
-				statusBar.BackgroundColor = uiColor;
+				statusBarSubView.RemoveFromSuperview();
 			}
 
-			TryUpdateStatusBarAppearance();
+			window.AddSubview(statusBar);
+
+			TryUpdateStatusBarAppearance(window);
 		}
 	}
 

From a8c1d0ec4f1b66f94f696b32f9f23fcd0f56b9b2 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:26:36 -0800
Subject: [PATCH 4/7] Don't modify StatusBar Frame in `PlatformSetColor`

---
 .../Platform/StatusBar/StatusBar.ios.cs       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 97bc167203..3fbc8f8579 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -25,9 +25,7 @@ public static void SetBarSize(bool isUsingSafeArea)
 
 			statusBar ??= new UIView(statusBarFrame.Value);
 			statusBar.Tag = statusBarTag;
-			statusBar.Frame = isUsingSafeArea
-				? new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top)
-				: UIApplication.SharedApplication.StatusBarFrame;
+			statusBar.Frame = GetStatusBarFrame(statusBar, window, isUsingSafeArea);
 
 			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
 			foreach (var statusBarSubView in statusBarSubViews)
@@ -54,18 +52,11 @@ static void PlatformSetColor(Color color)
 			{
 				continue;
 			}
-
-			// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
-			// window.ViewWithTag(tag) can return null
-			var statusBarSize = statusBar?.Frame.Size;
+			
 			statusBar ??= new UIView(statusBarFrame.Value);
 			statusBar.Tag = statusBarTag;
 			statusBar.BackgroundColor = uiColor;
 			statusBar.TintColor = uiColor;
-			if (statusBarSize is null)
-			{
-				statusBar.Frame = new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top);
-			}
 
 			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
 			foreach (var statusBarSubView in statusBarSubViews)
@@ -79,6 +70,13 @@ static void PlatformSetColor(Color color)
 		}
 	}
 
+	static CGRect GetStatusBarFrame(in UIView statusBar, in UIWindow window, bool isUsingSafeArea)
+	{
+		return isUsingSafeArea
+			? new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top)
+			: UIApplication.SharedApplication.StatusBarFrame;
+	}
+
 	static void PlatformSetStyle(StatusBarStyle statusBarStyle)
 	{
 		var uiStyle = statusBarStyle switch

From b7839d24274427971ae363468db4df821f606be6 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:27:02 -0800
Subject: [PATCH 5/7] Remove iOS 13 code (Toolkit support iOS 15+

---
 .../Platform/StatusBar/StatusBar.ios.cs        | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 3fbc8f8579..8c0b4ad31a 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -94,22 +94,14 @@ static void PlatformSetStyle(StatusBarStyle statusBarStyle)
 
 	static bool TryUpdateStatusBarAppearance()
 	{
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
-		{
-			var didUpdateAllStatusBars = true;
-
-			foreach (var window in UIApplication.SharedApplication.Windows)
-			{
-				didUpdateAllStatusBars &= TryUpdateStatusBarAppearance(window);
-			}
+		var didUpdateAllStatusBars = true;
 
-			return didUpdateAllStatusBars;
-		}
-		else
+		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var window = UIApplication.SharedApplication.KeyWindow;
-			return TryUpdateStatusBarAppearance(window);
+			didUpdateAllStatusBars &= TryUpdateStatusBarAppearance(window);
 		}
+
+		return didUpdateAllStatusBars;
 	}
 
 	static bool TryUpdateStatusBarAppearance(UIWindow? window)

From 13e318ee3aa97fcaa6e11c5c59b552c8009e1111 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:42:12 -0800
Subject: [PATCH 6/7] Refactor

---
 .../Platform/StatusBar/StatusBar.ios.cs       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
index 8c0b4ad31a..82066d006d 100644
--- a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.ios.cs
@@ -13,21 +13,20 @@ static partial class StatusBar
 	/// </summary>
 	public static void SetBarSize(bool isUsingSafeArea)
 	{
-		var statusBarTag = new IntPtr(38482);
+		var communityToolkitStatusBarTag = new IntPtr(38482);
 		foreach (var window in UIApplication.SharedApplication.Windows)
 		{
-			var statusBar = window.ViewWithTag(statusBarTag);
 			var statusBarFrame = window.WindowScene?.StatusBarManager?.StatusBarFrame;
 			if (statusBarFrame is null)
 			{
 				continue;
 			}
 
-			statusBar ??= new UIView(statusBarFrame.Value);
-			statusBar.Tag = statusBarTag;
-			statusBar.Frame = GetStatusBarFrame(statusBar, window, isUsingSafeArea);
+			var statusBar = window.ViewWithTag(communityToolkitStatusBarTag) ?? new UIView(statusBarFrame.Value);
+			statusBar.Tag = communityToolkitStatusBarTag;
+			statusBar.Frame = GetStatusBarFrame(window, isUsingSafeArea);
 
-			var statusBarSubViews = window.Subviews.Where(x => x.Tag == statusBarTag).ToList();
+			var statusBarSubViews = window.Subviews.Where(x => x.Tag == communityToolkitStatusBarTag).ToList();
 			foreach (var statusBarSubView in statusBarSubViews)
 			{
 				statusBarSubView.RemoveFromSuperview();
@@ -70,11 +69,13 @@ static void PlatformSetColor(Color color)
 		}
 	}
 
-	static CGRect GetStatusBarFrame(in UIView statusBar, in UIWindow window, bool isUsingSafeArea)
+	static CGRect GetStatusBarFrame(in UIWindow window, in bool isUsingSafeArea)
 	{
+		var statusBarFrame = UIApplication.SharedApplication.StatusBarFrame;
+		
 		return isUsingSafeArea
-			? new CGRect(statusBar.Frame.X, statusBar.Frame.Y, statusBar.Frame.Width, window.SafeAreaInsets.Top)
-			: UIApplication.SharedApplication.StatusBarFrame;
+			? new CGRect(statusBarFrame.X, statusBarFrame.Y, statusBarFrame.Width, window.SafeAreaInsets.Top)
+			: statusBarFrame;
 	}
 
 	static void PlatformSetStyle(StatusBarStyle statusBarStyle)

From 0c5863d91100d175b3368db76212f53b5827cdbb Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:43:10 -0800
Subject: [PATCH 7/7] Update azure-pipelines.yml

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4bd5000e1f..5b0b683223 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,7 +29,7 @@ variables:
   PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
   DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
   CommunityToolkitSampleApp_Xcode_Version: '16.2'
-  CommunityToolkitLibrary_Xcode_Version: '16.1'
+  CommunityToolkitLibrary_Xcode_Version: '16.2'
 
 trigger:
   branches: