Disable NSToolbar Tabs (#25137) (#25700)

PureWeen · web-flow · commit bd614274484c · 2024-11-07T06:22:58.000-06:00
* Disable NSToolbar Tabs

* - fix OS check

* - fix tabbedview extentions PR

* - bump targets

* - add missing file

* - add if/def for NET18.0 target

* - add catalyst check

* - switch to newer APIs for iOS and catalyst 18+

* - if/def for iOS18
# Conflicts:
#	src/Core/src/Platform/iOS/TabbedViewExtensions.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
@@ -439,7 +439,14 @@ void UpdateTabBarHidden()
 			if (ShellItemController == null)
 				return;
 
-			TabBar.Hidden = !ShellItemController.ShowTabs;
+			if (OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18() || OperatingSystem.IsIOSVersionAtLeast(18))
+			{
+				TabBarHidden = !ShellItemController.ShowTabs;
+			}
+			else
+			{
+				TabBar.Hidden = !ShellItemController.ShowTabs;
+			}
 		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/TabbedViewExtensions.cs b/src/Core/src/Platform/iOS/TabbedViewExtensions.cs
@@ -17,8 +17,6 @@ internal static void DisableiOS18ToolbarTabs(this UITabBarController tabBarContr
 			{
 				tabBarController.TraitOverrides.HorizontalSizeClass = UIUserInterfaceSizeClass.Compact;
 				tabBarController.Mode = UITabBarControllerMode.TabSidebar;
-				tabBarController.Sidebar.Hidden = true;
-				tabBarController.TabBarHidden = true;
 			}
 			else if (OperatingSystem.IsIOSVersionAtLeast(18, 0) && UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad)
 			{

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,14 @@ void UpdateTabBarHidden()`
`439`	`439`	`if (ShellItemController == null)`
`440`	`440`	`return;`
`441`	`441`
`442`		`- TabBar.Hidden = !ShellItemController.ShowTabs;`
	`442`	`+ if (OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18() \|\| OperatingSystem.IsIOSVersionAtLeast(18))`
	`443`	`+ {`
	`444`	`+ TabBarHidden = !ShellItemController.ShowTabs;`
	`445`	`+ }`
	`446`	`+ else`
	`447`	`+ {`
	`448`	`+ TabBar.Hidden = !ShellItemController.ShowTabs;`
	`449`	`+ }`
`443`	`450`	`}`
`444`	`451`	`}`
`445`	`452`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ internal static void DisableiOS18ToolbarTabs(this UITabBarController tabBarContr`
`17`	`17`	`{`
`18`	`18`	`tabBarController.TraitOverrides.HorizontalSizeClass = UIUserInterfaceSizeClass.Compact;`
`19`	`19`	`tabBarController.Mode = UITabBarControllerMode.TabSidebar;`
`20`		`- tabBarController.Sidebar.Hidden = true;`
`21`		`- tabBarController.TabBarHidden = true;`
`22`	`20`	`}`
`23`	`21`	`else if (OperatingSystem.IsIOSVersionAtLeast(18, 0) && UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad)`
`24`	`22`	`{`