Skip to content

Remove Mac Catalyst version detection workaround #29112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PureWeen merged 1 commit into from
Apr 22, 2025
Merged

Remove Mac Catalyst version detection workaround #29112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ void UpdateTabBarHidden()
if (ShellItemController == null)
return;

if (OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18() || OperatingSystem.IsIOSVersionAtLeast(18))
if (OperatingSystem.IsMacCatalystVersionAtLeast(18) || OperatingSystem.IsIOSVersionAtLeast(18))
{
TabBarHidden = !ShellItemController.ShowTabs;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ protected virtual void UpdateTabBarVisible()

var tabBarVisible = (Page.FindParentOfType<ShellItem>() as IShellItemController)?.ShowTabs ?? Shell.GetTabBarIsVisible(Page);
// In iOS 18, the tab bar visibility is effectively managed by the TabBarHidden property in ShellItemRenderer.
if (!(OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18() || OperatingSystem.IsIOSVersionAtLeast(18)))
if (!(OperatingSystem.IsMacCatalystVersionAtLeast(18) || OperatingSystem.IsIOSVersionAtLeast(18)))
{
ViewController.HidesBottomBarWhenPushed = !tabBarVisible;
}
Expand Down
22 changes: 0 additions & 22 deletions src/Core/src/OperatingSystemMacCatalyst18Workaround.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/TabbedViewExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal static class TabbedViewExtensions
internal static void DisableiOS18ToolbarTabs(this UITabBarController tabBarController)
{
// Should apply to iOS and Catalyst
if (OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18()) //https://github.com/xamarin/xamarin-macios/issues/21390
if (OperatingSystem.IsMacCatalystVersionAtLeast(18))
{
tabBarController.TraitOverrides.HorizontalSizeClass = UIUserInterfaceSizeClass.Compact;
tabBarController.Mode = UITabBarControllerMode.TabSidebar;
Expand Down
Loading