diff --git a/Flex.Android/CustomRenderers/GestureFrameRenderer.cs b/Flex.Android/CustomRenderers/GestureFrameRenderer.cs index 01ec11e..614e0c8 100644 --- 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 e) diff --git a/Flex.Demo.iOS/Flex.Demo.iOS.csproj b/Flex.Demo.iOS/Flex.Demo.iOS.csproj index a8aa67f..452c48e 100644 --- a/Flex.Demo.iOS/Flex.Demo.iOS.csproj +++ b/Flex.Demo.iOS/Flex.Demo.iOS.csproj @@ -135,6 +135,8 @@ {43DD689A-3918-43EB-B654-8E1C54F23C72} Flex.iOS + false + false {4FBE2794-BD54-4C5E-B95A-46B2D5606C5F} @@ -153,7 +155,6 @@ - diff --git a/Flex.Demo/Flex.Demo.csproj b/Flex.Demo/Flex.Demo.csproj index c7c8cf3..004aa9e 100644 --- a/Flex.Demo/Flex.Demo.csproj +++ b/Flex.Demo/Flex.Demo.csproj @@ -9,10 +9,4 @@ - - - - - - \ No newline at end of file diff --git a/Flex.Demo/FlexDemoPage.xaml b/Flex.Demo/FlexDemoPage.xaml index 07fa8bb..929b6ff 100644 --- 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 @@