From 27d10b1d3286307af7c378f38a74dec1e8f30280 Mon Sep 17 00:00:00 2001
From: Ieuan Walker <ieuan.walker007@gmail.com>
Date: Thu, 1 Jul 2021 17:53:08 +0100
Subject: [PATCH] fix

---
 Demo/App/MainPage.xaml                         |  8 +++-----
 Scr/StateButton.Android/StateButtonRenderer.cs | 15 ++++++++++++++-
 Scr/StateButton.iOS/StateButtonRenderer.cs     |  2 ++
 Scr/StateButton/StateButton.csproj             |  5 +++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Demo/App/MainPage.xaml b/Demo/App/MainPage.xaml
index daa6e1f..4bce074 100644
--- a/Demo/App/MainPage.xaml
+++ b/Demo/App/MainPage.xaml
@@ -13,8 +13,7 @@
             <!--  Events  -->
             <Label FontSize="Large" Text="Events" />
             <Label FontSize="Medium" Text="Clicked" />
-            <stateButton:StateButton AutomationProperties.HelpText="Button"
-                                     AutomationProperties.IsInAccessibleTree="True"
+            <stateButton:StateButton AutomationProperties.IsInAccessibleTree="True"
                                      AutomationProperties.Name="Test"
                                      Clicked="StateButton_OnClicked"
                                      HorizontalOptions="Center">
@@ -90,7 +89,6 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-
             <!--  Commands  -->
             <Label FontSize="Large" Text="Commands" />
             <Label FontSize="Medium" Text="Clicked" />
@@ -195,7 +193,6 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-
             <!--  Complex  -->
             <Label FontSize="Large" Text="Complex" />
             <stateButton:StateButton Clicked="Card_OnClicked" HorizontalOptions="Fill">
@@ -233,12 +230,14 @@
                             <Image Source="https://instabug.com/blog/wp-content/uploads/2018/10/Oct_Articles_01_Xamarin.png" />
                             <Label x:Name="Description"
                                    Margin="20,0"
+                                   AutomationProperties.IsInAccessibleTree="True"
                                    FontSize="Default"
                                    HorizontalOptions="Center"
                                    LineBreakMode="TailTruncation"
                                    MaxLines="3"
                                    Text="I'm baby vape jean shorts hammock air plant gluten-free thundercats, DIY kale chips master cleanse kickstarter vinyl cronut iceland. Coloring book cold-pressed cray authentic seitan. Snackwave bicycle rights ramps hoodie shaman readymade. Kitsch venmo hella pug, chillwave squid four dollar toast hashtag." />
                             <Label Margin="20,0,20,10"
+                                   AutomationProperties.IsInAccessibleTree="True"
                                    HorizontalOptions="End"
                                    HorizontalTextAlignment="End"
                                    Text="See more..."
@@ -286,7 +285,6 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-
             <!--  Experiment  -->
             <Label FontSize="Large" Text="Experiment" />
             <stateButton:StateButton HorizontalOptions="Fill">
diff --git a/Scr/StateButton.Android/StateButtonRenderer.cs b/Scr/StateButton.Android/StateButtonRenderer.cs
index 0e2a0a8..ded9c13 100644
--- a/Scr/StateButton.Android/StateButtonRenderer.cs
+++ b/Scr/StateButton.Android/StateButtonRenderer.cs
@@ -4,7 +4,8 @@
 using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
-using View = Xamarin.Forms.View;
+using Android.Views.Accessibility;
+using AndroidView = Android.Views;
 
 [assembly: ExportRenderer(typeof(StateButton.StateButton), typeof(StateButtonRenderer))]
 
@@ -14,6 +15,7 @@ public class StateButtonRenderer : FrameRenderer
     {
         public StateButtonRenderer(Context context) : base(context)
         {
+            SetAccessibilityDelegate(new MyAccessibilityDelegate());
         }
 
         protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
@@ -65,5 +67,16 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
                 }
             };
         }
+
+        private class MyAccessibilityDelegate : AccessibilityDelegate
+        {
+            public override void OnInitializeAccessibilityNodeInfo(AndroidView.View host, AccessibilityNodeInfo info)
+            {
+                base.OnInitializeAccessibilityNodeInfo(host, info);
+                info.ClassName = "android.widget.Button";
+                info.Clickable = true;
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Scr/StateButton.iOS/StateButtonRenderer.cs b/Scr/StateButton.iOS/StateButtonRenderer.cs
index 4d7920a..a34cd86 100644
--- a/Scr/StateButton.iOS/StateButtonRenderer.cs
+++ b/Scr/StateButton.iOS/StateButtonRenderer.cs
@@ -19,6 +19,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
         {
             base.OnElementChanged(e);
 
+            AccessibilityTraits = UIAccessibilityTrait.Button;
+
             if (e.OldElement != null) return;
 
             if (!e.NewElement.GestureRecognizers.Any())
diff --git a/Scr/StateButton/StateButton.csproj b/Scr/StateButton/StateButton.csproj
index bbd150a..ca1836a 100644
--- a/Scr/StateButton/StateButton.csproj
+++ b/Scr/StateButton/StateButton.csproj
@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    
     <LangVersion>8.0</LangVersion>
     <!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>