Merge pull request #683 from IeuanWalker/develop

Android page title accessibility issue

Author: martijn00

Rg.Plugins.Popup/Platforms/Android/Impl/PopupPlatformDroid.cs

@@ -1,22 +1,18 @@
 using System;
-using System.Text;
 using System.Threading.Tasks;
 
 using Android.App;
-using Android.Content;
 using Android.OS;
 using Android.Provider;
 using Android.Runtime;
 using Android.Views;
-using Android.Views.Accessibility;
 using Android.Widget;
 
 using Rg.Plugins.Popup.Contracts;
 using Rg.Plugins.Popup.Droid.Extensions;
 using Rg.Plugins.Popup.Droid.Impl;
 using Rg.Plugins.Popup.Exceptions;
 using Rg.Plugins.Popup.Pages;
-using Rg.Plugins.Popup.Services;
 
 using Xamarin.Forms;
 
@@ -69,6 +65,25 @@ static void HandleAccessibilityWorkaround(PopupPage page)
                         XApplication.Current.MainPage.Navigation.ModalStack[modalCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.NoHideDescendants;
                     }
 
+                    DisableFocusableInTouchMode(XApplication.Current.MainPage.GetOrCreateRenderer().View.Parent);
+                }
+            }
+
+            static void DisableFocusableInTouchMode(IViewParent? parent)
+            {
+                var view = parent;
+                string className = $"{view?.GetType().Name}";
+
+                while (!className.Contains("PlatformRenderer") && view != null)
+                {
+                    view = view.Parent;
+                    className = $"{view?.GetType().Name}";
+                }
+
+                if (view is Android.Views.View androidView)
+                {
+                    androidView.Focusable = false;
+                    androidView.FocusableInTouchMode = false;
                 }
             }
         }

Samples/Demo/Pages/UserAnimationPage.xaml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
+<rg:PopupPage x:Class="Demo.Pages.UserAnimationPage"
+              xmlns="http://xamarin.com/schemas/2014/forms"
               xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-              xmlns:rg="http://rotorgames.com"
               xmlns:animations="clr-namespace:Demo.Animations;assembly=Demo"
-              x:Class="Demo.Pages.UserAnimationPage">
-  <rg:PopupPage.Animation>
-    <animations:UserAnimation/>
-  </rg:PopupPage.Animation>
-  <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
-    <Frame BackgroundColor="Silver">
-      <StackLayout Spacing="20">
-        <Label HorizontalOptions="Center" Text="User Animation" FontSize="16"></Label>
-        <Button Text="Close" Clicked="OnClose"></Button>
-      </StackLayout>
-    </Frame>
-  </StackLayout>
+              xmlns:rg="http://rotorgames.com"
+              AndroidTalkbackAccessibilityWorkaround="True">
+    <rg:PopupPage.Animation>
+        <animations:UserAnimation />
+    </rg:PopupPage.Animation>
+    <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+        <Frame BackgroundColor="Silver">
+            <StackLayout Spacing="20">
+                <Label FontSize="16"
+                       HorizontalOptions="Center"
+                       Text="User Animation" />
+                <Button Clicked="OnClose" Text="Close" />
+            </StackLayout>
+        </Frame>
+    </StackLayout>
 </rg:PopupPage>