Merge pull request #663 from rotorgames/AccessibilityUpgrade585

Accessibility Workaround Upgrade

Author: martijn00

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

@@ -44,17 +44,23 @@ public Task AddAsync(PopupPage page)
         {
             var decoreView = DecoreView;
 
-            if (page.AndroidTalkbackAccessibilityWorkaround)
-            {
-                RecursivelyChangeAccessibilityOfViewChildren(XApplication.Current.MainPage.GetOrCreateRenderer().View, ImportantForAccessibility.No);
-            }
+            HandleAccessibilityWorkaround(page);
 
             page.Parent = XApplication.Current.MainPage;
-
             var renderer = page.GetOrCreateRenderer();
-            decoreView?.AddView(renderer.View);
 
+            decoreView?.AddView(renderer.View);
             return PostAsync(renderer.View);
+
+            static void HandleAccessibilityWorkaround(PopupPage page)
+            {
+                if (page.AndroidTalkbackAccessibilityWorkaround)
+                {
+                    var NavCount = XApplication.Current.MainPage.Navigation.NavigationStack.Count;
+                    Page currentPage = XApplication.Current.MainPage.Navigation.NavigationStack[NavCount - 1];
+                    currentPage.GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.NoHideDescendants;
+                }
+            }
         }
 
         public Task RemoveAsync(PopupPage page)
@@ -65,10 +71,7 @@ public Task RemoveAsync(PopupPage page)
             var renderer = page.GetOrCreateRenderer();
             if (renderer != null)
             {
-                if (page.AndroidTalkbackAccessibilityWorkaround)
-                {
-                    RecursivelyChangeAccessibilityOfViewChildren(XApplication.Current.MainPage.GetOrCreateRenderer().View, ImportantForAccessibility.Auto);
-                }
+                HandleAccessibilityWorkaround(page);
 
                 page.Parent = XApplication.Current.MainPage;
                 var element = renderer.Element;
@@ -83,6 +86,16 @@ public Task RemoveAsync(PopupPage page)
             }
 
             return Task.FromResult(true);
+
+            static void HandleAccessibilityWorkaround(PopupPage page)
+            {
+                if (page.AndroidTalkbackAccessibilityWorkaround)
+                {
+                    var NavCount = XApplication.Current.MainPage.Navigation.NavigationStack.Count;
+                    Page currentPage = XApplication.Current.MainPage.Navigation.NavigationStack[NavCount - 1];
+                    currentPage.GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
+                }
+            }
         }
 
         #region System Animation
@@ -128,20 +141,6 @@ private static Task PostAsync(Android.Views.View nativeView)
 
             return tcs.Task;
         }
-
-        private void RecursivelyChangeAccessibilityOfViewChildren(Android.Views.View view, ImportantForAccessibility important)
-        {
-            if (view is ViewGroup vGroup)
-            {
-                for (int i = 0; i < vGroup.ChildCount; i++)
-                {
-                    Android.Views.View vChild = vGroup.GetChildAt(i);
-                    vChild.ImportantForAccessibility = important;
-                    vChild.ClearFocus();
-                    RecursivelyChangeAccessibilityOfViewChildren(vChild, important);
-                }
-            }
-        }
         #endregion
     }
 }