Merge pull request #95 from IeuanWalker/master

Accessibility
robinmanuelthiel · Jul 5, 2021 · e532b11 · e532b11
2 parents 21c1beb + 565d30d
commit e532b11
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 11 deletions.
diff --git a/Flex.Android/CustomRenderers/GestureFrameRenderer.cs b/Flex.Android/CustomRenderers/GestureFrameRenderer.cs
@@ -6,6 +6,8 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using Flex.Controls;
+using AndroidView = Android.Views;
+using Android.Views.Accessibility;
 
 [assembly: ExportRenderer(typeof(GestureFrame), typeof(GestureFrameRenderer))]
 namespace Flex.Android.CustomRenderers
@@ -14,6 +16,17 @@ public class GestureFrameRenderer : Xamarin.Forms.Platform.Android.AppCompat.Fra
     {
         public GestureFrameRenderer(Context context) : base(context)
         {
+            SetAccessibilityDelegate(new GestureFrameRendererAccessibilityDelegate());
+        }
+
+        private class GestureFrameRendererAccessibilityDelegate : AccessibilityDelegate
+        {
+            public override void OnInitializeAccessibilityNodeInfo(AndroidView.View host, AccessibilityNodeInfo info)
+            {
+                base.OnInitializeAccessibilityNodeInfo(host, info);
+                info.ClassName = "android.widget.Button";
+                info.Clickable = true;
+            }
         }
 
         protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)

diff --git a/Flex.Demo.iOS/Flex.Demo.iOS.csproj b/Flex.Demo.iOS/Flex.Demo.iOS.csproj
@@ -135,6 +135,8 @@
     <ProjectReference Include="..\Flex.iOS\Flex.iOS.csproj">
       <Project>{43DD689A-3918-43EB-B654-8E1C54F23C72}</Project>
       <Name>Flex.iOS</Name>
+      <IsAppExtension>false</IsAppExtension>
+      <IsWatchApp>false</IsWatchApp>
     </ProjectReference>
     <ProjectReference Include="..\Flex\Flex.csproj">
       <Project>{4FBE2794-BD54-4C5E-B95A-46B2D5606C5F}</Project>
@@ -153,7 +155,6 @@
     <BundleResource Include="Resources\right.png" />
     <BundleResource Include="Resources\right%402x.png" />
     <BundleResource Include="Resources\right%403x.png" />
-    <BundleResource Include="Resources\arrow.svg" />
     <BundleResource Include="Resources\lightbulb.png" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Flex.Demo/Flex.Demo.csproj b/Flex.Demo/Flex.Demo.csproj
@@ -9,10 +9,4 @@
     <ItemGroup>
       <ProjectReference Include="..\Flex\Flex.csproj" />
     </ItemGroup>
-    <ItemGroup>
-      <None Remove="lightbulb.png" />
-    </ItemGroup>
-    <ItemGroup>
-      <Content Include="lightbulb.png" />
-    </ItemGroup>
 </Project>
diff --git a/Flex.Demo/FlexDemoPage.xaml b/Flex.Demo/FlexDemoPage.xaml
@@ -54,6 +54,7 @@
                 IconPadding="0"
                 CornerRadius="38"
                 Icon="lightbulb.png"
+                AccessibleName="Light bulb"
                 ForegroundColor="#ffffff"
                 HighlightForegroundColor="#49516F"
                 BackgroundColor="#6279B8"
@@ -72,7 +73,7 @@
             <!-- Small Buttons -->
             <Label Text="Small Buttons" HorizontalTextAlignment="Center" HorizontalOptions="Center"/>
             <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Start">
-                <flex:FlexButton                    
+                <flex:FlexButton
                     WidthRequest="40"
                     HeightRequest="40"
                     CornerRadius="20"

diff --git a/Flex.UWP/CutomRenderers/GestureFrameRenderer.cs b/Flex.UWP/CutomRenderers/GestureFrameRenderer.cs
@@ -12,6 +12,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
 using Flex.Controls;
+using Windows.UI.Xaml.Automation.Peers;
 
 [assembly: ExportRenderer(typeof(GestureFrame), typeof(GestureFrameRenderer))]
 namespace Flex.UWP.CustomRenderers
@@ -33,6 +34,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.F
         {
             base.OnElementChanged(e);
 
+            Control.SetAutomationPropertiesAccessibilityView(e.NewElement, AccessibilityView.Control);
+
             if (e.OldElement == null)
             {
                 FixFormsBackgroundColor(e.NewElement);

diff --git a/Flex.iOS/CustomRenderers/GestureFrameRenderer.cs b/Flex.iOS/CustomRenderers/GestureFrameRenderer.cs
@@ -31,6 +31,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
         {
             base.OnElementChanged(e);
 
+            AccessibilityTraits = UIAccessibilityTrait.Button;
+
             if (e.OldElement == null)
             {
                 // Fix Xamarin.Forms Frame BackgroundColor Bug (https://github.com/xamarin/Xamarin.Forms/issues/2218)

diff --git a/Flex/Controls/FlexButton.xaml.cs b/Flex/Controls/FlexButton.xaml.cs
@@ -178,6 +178,14 @@ public bool HasShadow
             set => SetValue(HasShadowProperty, value);
         }
 
+        public static readonly BindableProperty AccessibleNameProperty = BindableProperty.Create(nameof(AccessibleName), typeof(string), typeof(FlexButton), null);
+        public string AccessibleName
+        {
+            get => (string)GetValue(AccessibleNameProperty);
+            set => SetValue(AccessibleNameProperty, value);
+        }
+
+
         #endregion
 
         #region Commands
@@ -249,7 +257,6 @@ protected override void OnBindingContextChanged()
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            var test = 0f;
             if (propertyName == PaddingProperty.PropertyName)
             {
                 userChangedPadding = true;
@@ -358,6 +365,9 @@ void SetButtonMode()
                 mode = ButtonMode.TextOnly;
             }
 
+            // Set Accessibility Name
+            AutomationProperties.SetName(Border, AccessibleName ?? Text);
+
             if (ButtonIcon == null || ButtonText == null)
                 return;
 

diff --git a/Nuget/Forms.Controls.FlexButton.nuspec b/Nuget/Forms.Controls.FlexButton.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata minClientVersion="">
     <id>Forms.Controls.FlexButton</id>
-    <version>0.13.0</version>
+    <version>0.14.0</version>
     <title>FlexButton for Xamarin.Forms</title>
     <authors>Robin-Manuel Thiel</authors>
     <owners>Robin-Manuel Thiel</owners>
@@ -12,7 +12,7 @@
     <icon>images/Logo-150.png</icon>
     <description>Flexible button control for Xamarin.Forms</description>
     <summary>Flexible button control for Xamarin.Forms</summary>
-    <releaseNotes>Update to Xamarin.Forms 4.8</releaseNotes>
+    <releaseNotes>Add Accessiblity Options</releaseNotes>
     <copyright></copyright>
     <language></language>
     <tags>flex xamarin.forms control button flexbutton xamarin flexible pill</tags>

diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ Take a look a the [Demo Project](/Flex.Demo) in this repository for a full sampl
 | `IconTintEnabled` | `true` | Enables tinting of the icon (Set to false, if your icon is colorized) |
 | `HasShadow` | `false` | Enables Xamarin.Forms Frame's Shadow around the button |
 | `MaxLines` | `1` | Maximum number of lines for test. Set it to `-1` for flexible amount of lines |
+| `AccessibleName` | `string.Empty` | Accessibility Name for Automation |
 
 | Event | Description |
 |------------------|---------|