Improved accessibility (#7)

* Update * update
IeuanWalker · Apr 6, 2023 · 525fb34 · 525fb34
1 parent 254f07f
commit 525fb34
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 22 deletions.
diff --git a/Demo/Controls/Examples/CustomButton.xaml b/Demo/Controls/Examples/CustomButton.xaml
@@ -7,7 +7,8 @@
         <ControlTemplate>
             <stateButton:StateButton Padding="20,20"
                                      BackgroundColor="#0071FF"
-                                     Clicked="StateButton_Clicked">
+                                     Clicked="StateButton_Clicked"
+                                     SemanticProperties.Description="{TemplateBinding Text}">
                 <stateButton:StateButton.StrokeShape>
                     <RoundRectangle CornerRadius="25" />
                 </stateButton:StateButton.StrokeShape>

diff --git a/Demo/Controls/Examples/Example6.xaml b/Demo/Controls/Examples/Example6.xaml
@@ -5,7 +5,7 @@
              xmlns:stateButton="clr-namespace:IeuanWalker.Maui.StateButton;assembly=IeuanWalker.Maui.StateButton">
     <ContentView.ControlTemplate>
         <ControlTemplate>
-            <stateButton:StateButton Grid.Column="0"
+            <stateButton:StateButton Grid.Column="0" 
                                      BackgroundColor="#7B66FF"
                                      Clicked="StateButton_Clicked"
                                      ClickedCommand="{TemplateBinding ClickedCommand}"
@@ -17,7 +17,9 @@
                                      PressedCommandParameter="{TemplateBinding PressedCommandParameter}"
                                      Released="StateButton_Released"
                                      ReleasedCommand="{TemplateBinding ReleasedCommand}"
-                                     ReleasedCommandParameter="{TemplateBinding ReleasedCommandParameter}">
+                                     ReleasedCommandParameter="{TemplateBinding ReleasedCommandParameter}"
+                                     SemanticProperties.Description="{TemplateBinding Text}"
+                                     SemanticProperties.Hint="{TemplateBinding AccessibilityHint}">
                 <stateButton:StateButton.StrokeShape>
                     <RoundRectangle CornerRadius="5" />
                 </stateButton:StateButton.StrokeShape>

diff --git a/Demo/Controls/Examples/Example6.xaml.cs b/Demo/Controls/Examples/Example6.xaml.cs
@@ -10,6 +10,12 @@ public string Text
 		get => (string)GetValue(TextProperty);
 		set => SetValue(TextProperty, value);
 	}
+	public static readonly BindableProperty AccessibilityHintProperty = BindableProperty.Create(nameof(AccessibilityHint), typeof(string), typeof(CustomButton), string.Empty);
+	public string AccessibilityHint
+	{
+		get => (string)GetValue(AccessibilityHintProperty);
+		set => SetValue(AccessibilityHintProperty, value);
+	}
 
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="ClickedCommand"/> property.

diff --git a/Demo/Pages/AccessibilityTestPage.xaml b/Demo/Pages/AccessibilityTestPage.xaml
@@ -11,12 +11,22 @@
 
             <Label Style="{StaticResource sectionHeading}" Text="Standard button" />
             <Button Text="Test" />
-            <controls:Example6 SemanticProperties.Description="Test" Text="Test" />
+            <controls:Example6 Text="Test" />
 
             <Label Style="{StaticResource sectionHeading}" Text="With hint" />
-            <Button SemanticProperties.Hint="Reload list of contacts" Text="Reload" />
-            <controls:Example6 SemanticProperties.Description="Reload"
-                               SemanticProperties.Hint="Reload list of contacts"
+            <Button SemanticProperties.Description="Reload"
+                    SemanticProperties.Hint="Reload list of contacts"
+                    Text="Reload" />
+            <controls:Example6 AccessibilityHint="Reload list of contacts" Text="Reload" />
+
+            <Label Style="{StaticResource sectionHeading}" Text="With hint and events" />
+            <Button Clicked="Button_Clicked"
+                    SemanticProperties.Hint="Reload list of contacts"
+                    Text="Reload" />
+            <controls:Example6 AccessibilityHint="Reload list of contacts"
+                               Clicked="Button_Clicked"
+                               Pressed="Example6_Pressed"
+                               Released="Example6_Released"
                                Text="Reload" />
         </VerticalStackLayout>
     </ContentPage.Content>

diff --git a/Demo/Pages/AccessibilityTestPage.xaml.cs b/Demo/Pages/AccessibilityTestPage.xaml.cs
@@ -7,12 +7,17 @@ public AccessibilityTestPage()
 		InitializeComponent();
 	}
 
-	async void StateButton_Clicked(object sender, EventArgs e)
+	async void Button_Clicked(object sender, EventArgs e)
 	{
 		await DisplayAlert("Clicked", string.Empty, "OK");
 	}
 
-	async void StateButton_Released(object sender, EventArgs e)
+	async void Example6_Pressed(object sender, EventArgs e)
+	{
+		await DisplayAlert("Pressed", string.Empty, "OK");
+	}
+
+	async void Example6_Released(object sender, EventArgs e)
 	{
 		await DisplayAlert("Release", string.Empty, "OK");
 	}

diff --git a/Scr/Platform/CustomContentView.iOS.cs b/Scr/Platform/CustomContentView.iOS.cs
@@ -15,6 +15,8 @@ public CustomContentView(IBorderView virtualView)
 		AddGestureRecognizer(new UITapGestureRecognizer(_stateButton.InvokeClicked));
 	}
 
+	public override bool CanBecomeFocused => true;
+
 	public override void TouchesMoved(NSSet touches, UIEvent? evt)
 	{
 		_stateButton.InvokeReleased();

diff --git a/Scr/Platform/CustomContentViewGroup.Android.cs b/Scr/Platform/CustomContentViewGroup.Android.cs
@@ -15,8 +15,8 @@ public CustomContentViewGroup(Context context, IBorderView virtualView) : base(c
 	{
 		_stateButton = (StateButton)virtualView;
 
-		//! important - this is what makes the switch accessible via keyboard navigation
-		Focusable = true;
+		Clickable = true;
+		Click += (sender, e) => _stateButton.InvokeClicked();
 
 		Touch += (sender, te) =>
 		{
@@ -63,17 +63,6 @@ public CustomContentViewGroup(Context context, IBorderView virtualView) : base(c
 
 	public override ICharSequence? AccessibilityClassNameFormatted => new String("android.widget.Button");
 
-	public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo? info)
-	{
-		if (info is not null)
-		{
-			info.Focusable = true;
-			info.Clickable = true;
-		}
-
-		base.OnInitializeAccessibilityNodeInfo(info);
-	}
-
 	public override bool OnKeyUp([GeneratedEnum] Keycode keyCode, KeyEvent? e)
 	{
 		if (keyCode == Keycode.Space || keyCode == Keycode.Enter)

diff --git a/Scr/StateButton.xaml b/Scr/StateButton.xaml
@@ -2,5 +2,6 @@
 <Border x:Class="IeuanWalker.Maui.StateButton.StateButton"
         xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
         xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+        AutomationProperties.IsInAccessibleTree="True"
         BackgroundColor="Transparent"
         Stroke="Transparent" />