Skip to content

Obsolete iOS Compatibility AccessibilityExtensions #27593

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
jfversluis merged 2 commits into from
Feb 7, 2025
Merged

Obsolete iOS Compatibility AccessibilityExtensions #27593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7073746
Obsolete iOS Compatibility AccessibilityExtensions
jfversluis Feb 6, 2025
04dddd1
Fix obsoletes
jfversluis Feb 6, 2025
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: 2 additions & 0 deletions src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,8 +984,10 @@ internal static void SetFlyoutLeftBarButton(UIViewController containerController
if (FlyoutPage != null && !string.IsNullOrEmpty(FlyoutPage.AutomationId))
SetAutomationId(containerController.NavigationItem.LeftBarButtonItem, $"btn_{FlyoutPage.AutomationId}");

#pragma warning disable CS0618 // Type or member is obsolete
containerController.NavigationItem.LeftBarButtonItem.SetAccessibilityHint(FlyoutPage);
containerController.NavigationItem.LeftBarButtonItem.SetAccessibilityLabel(FlyoutPage);
#pragma warning restore CS0618 // Type or member is obsolete
});

void OnItemTapped(object sender, EventArgs e)
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -386,8 +386,10 @@ void UpdateLeftToolbarItems()

if (image != null)
{
#pragma warning disable CS0618 // Type or member is obsolete
NavigationItem.LeftBarButtonItem.SetAccessibilityHint(image);
NavigationItem.LeftBarButtonItem.SetAccessibilityLabel(image);
#pragma warning restore CS0618 // Type or member is obsolete
}
}
});
Expand Down
10 changes: 6 additions & 4 deletions src/Controls/src/Core/Compatibility/iOS/Extensions/AccessibilityExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ public static void SetAccessibilityProperties(this NativeView nativeViewElement,
return;

nativeViewElement.AccessibilityIdentifier = element?.AutomationId;
#pragma warning disable CS0618 // Type or member is obsolete
SetAccessibilityLabel(nativeViewElement, element);
SetAccessibilityHint(nativeViewElement, element);
#pragma warning restore CS0618 // Type or member is obsolete
SetIsAccessibilityElement(nativeViewElement, element);
SetAccessibilityElementsHidden(nativeViewElement, element);
}

// TODO OBSOLETE FOR NET10
[Obsolete("Use Microsoft.Maui.Platform.UpdateSemantics")]
public static string SetAccessibilityHint(this NativeView Control, Element Element, string _defaultAccessibilityHint = null)
{
if (Element == null || Control == null)
Expand All @@ -43,7 +45,7 @@ public static string SetAccessibilityHint(this NativeView Control, Element Eleme
return _defaultAccessibilityHint;
}

// TODO OBSOLETE FOR NET10
[Obsolete("Use Microsoft.Maui.Platform.UpdateSemantics")]
public static string SetAccessibilityLabel(this NativeView Control, Element Element, string _defaultAccessibilityLabel = null)
{
if (Element == null || Control == null)
Expand All @@ -66,7 +68,7 @@ public static string SetAccessibilityLabel(this NativeView Control, Element Elem
return _defaultAccessibilityLabel;
}

// TODO OBSOLETE FOR NET10
[Obsolete("Use Microsoft.Maui.Platform.UpdateSemantics")]
public static string SetAccessibilityHint(this UIBarItem Control, Element Element, string _defaultAccessibilityHint = null)
{
if (Element == null || Control == null)
Expand All @@ -90,7 +92,7 @@ public static string SetAccessibilityHint(this UIBarItem Control, Element Elemen

}

// TODO OBSOLETE FOR NET10
[Obsolete("Use Microsoft.Maui.Platform.UpdateSemantics")]
public static string SetAccessibilityLabel(this UIBarItem Control, Element Element, string _defaultAccessibilityLabel = null)
{
if (Element == null || Control == null)
Expand Down
6 changes: 5 additions & 1 deletion src/Controls/src/Core/Compatibility/iOS/Extensions/ToolbarItemExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ public PrimaryToolbarItem(ToolbarItem item, bool forceName)
if (item != null && !string.IsNullOrEmpty(item.AutomationId))
AccessibilityIdentifier = item.AutomationId;

#pragma warning disable CS0618 // Type or member is obsolete
this.SetAccessibilityHint(item);
this.SetAccessibilityLabel(item);
#pragma warning restore CS0618 // Type or member is obsolete
}

void OnClicked(object sender, EventArgs e)
Expand Down Expand Up @@ -154,8 +156,10 @@ public SecondaryToolbarItem(ToolbarItem item) : base(new SecondaryToolbarItemCon
if (item != null && !string.IsNullOrEmpty(item.AutomationId))
AccessibilityIdentifier = item.AutomationId;

#pragma warning disable CS0618 // Type or member is obsolete
this.SetAccessibilityHint(item);
this.SetAccessibilityLabel(item);
#pragma warning restore CS0618 // Type or member is obsolete
}

void OnClicked(object sender, EventArgs e)
Expand Down Expand Up @@ -188,8 +192,8 @@ void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
else if (e.PropertyName == AutomationProperties.HelpTextProperty.PropertyName)
this.SetAccessibilityHint(item);
else if (e.PropertyName == AutomationProperties.NameProperty.PropertyName)
#pragma warning restore CS0618 // Type or member is obsolete
this.SetAccessibilityLabel(item);
#pragma warning restore CS0618 // Type or member is obsolete
}

void UpdateIcon(ToolbarItem item)
Expand Down