Merge pull request #94 from IeuanWalker/master

Fixes android accessibility handling
LuckyDucko · Nov 30, 2023 · a060c43 · a060c43
2 parents 6ab0275 + 567f29d
commit a060c43
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 35 deletions.
diff --git a/Mopups/Mopups.Maui/Pages/PopupPage.cs b/Mopups/Mopups.Maui/Pages/PopupPage.cs
@@ -1,11 +1,9 @@
-using System.Windows.Input;
-
-using AsyncAwaitBestPractices;
-
+using AsyncAwaitBestPractices;
 using Mopups.Animations;
 using Mopups.Animations.Base;
 using Mopups.Enums;
 using Mopups.Services;
+using System.Windows.Input;
 
 namespace Mopups.Pages;
 
@@ -108,12 +106,12 @@ public object BackgroundClickedCommandParameter
         set => SetValue(BackgroundClickedCommandParameterProperty, value);
     }
 
-    public static readonly BindableProperty AndroidTalkbackAccessibilityWorkaroundProperty = BindableProperty.Create(nameof(AndroidTalkbackAccessibilityWorkaround), typeof(bool), typeof(PopupPage), false);
+    public static readonly BindableProperty DisableAndroidAccessibilityHandlingProperty = BindableProperty.Create(nameof(DisableAndroidAccessibilityHandling), typeof(bool), typeof(PopupPage), false);
 
-    public bool AndroidTalkbackAccessibilityWorkaround
+    public bool DisableAndroidAccessibilityHandling
     {
-        get => (bool)GetValue(AndroidTalkbackAccessibilityWorkaroundProperty);
-        set => SetValue(AndroidTalkbackAccessibilityWorkaroundProperty, value);
+        get => (bool)GetValue(DisableAndroidAccessibilityHandlingProperty);
+        set => SetValue(DisableAndroidAccessibilityHandlingProperty, value);
     }
 
     public PopupPage()

diff --git a/Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs b/Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs
@@ -36,20 +36,13 @@ public static bool SendBackPressed(Action? backPressedHandler = null)
 
     public Task AddAsync(PopupPage page)
     {
-        try
-        {
-            HandleAccessibility(true);
+        HandleAccessibility(true, page.DisableAndroidAccessibilityHandling);
 
-            page.Parent = MauiApplication.Current.Application.Windows[0].Content as Element;
-            var AndroidNativeView = IPopupPlatform.GetOrCreateHandler<PopupPageHandler>(page).PlatformView as Android.Views.View;
-            DecoreView?.AddView(AndroidNativeView);
+        page.Parent = MauiApplication.Current.Application.Windows[0].Content as Element;
+        var AndroidNativeView = IPopupPlatform.GetOrCreateHandler<PopupPageHandler>(page).PlatformView as Android.Views.View;
+        DecoreView?.AddView(AndroidNativeView);
 
-            return PostAsync(AndroidNativeView);
-        }
-        catch (Exception)
-        {
-            throw;
-        }
+        return PostAsync(AndroidNativeView);
     }
 
     public Task RemoveAsync(PopupPage page)
@@ -58,7 +51,7 @@ public Task RemoveAsync(PopupPage page)
 
         if (renderer != null)
         {
-            HandleAccessibility(false);
+            HandleAccessibility(false, page.DisableAndroidAccessibilityHandling);
 
             DecoreView?.RemoveView(renderer.PlatformView as Android.Views.View);
             renderer.DisconnectHandler(); //?? no clue if works
@@ -70,35 +63,50 @@ public Task RemoveAsync(PopupPage page)
         return Task.CompletedTask;
     }
 
-    static void HandleAccessibility(bool showPopup)
+    //! important keeps reference to pages that accessibility has applied to. This is so accessibility can be removed properly when popup is removed. #https://github.com/LuckyDucko/Mopups/issues/93
+    readonly List<Android.Views.View?> views = new();
+    void HandleAccessibility(bool showPopup, bool disableAccessibilityHandling)
     {
-        Page? mainPage = Application.Current?.MainPage;
-
-        if (mainPage is null)
+        if (disableAccessibilityHandling)
         {
             return;
         }
 
-        int navCount = mainPage.Navigation.NavigationStack.Count;
-        int modalCount = mainPage.Navigation.ModalStack.Count;
+        if (showPopup)
+        {
+            Page? mainPage = Application.Current?.MainPage;
+
+            if (mainPage is null)
+            {
+                return;
+            }
+
+            views.Add(mainPage.Handler?.PlatformView as Android.Views.View);
 
-        ProcessView(showPopup, mainPage.Handler?.PlatformView as Android.Views.View);
+            int navCount = mainPage.Navigation.NavigationStack.Count;
+            int modalCount = mainPage.Navigation.ModalStack.Count;
 
-        if (navCount > 0)
-        {
-            ProcessView(showPopup, mainPage.Navigation?.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View);
+            if (navCount > 0)
+            {
+                views.Add(mainPage.Navigation?.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View);
+            }
+
+            if (modalCount > 0)
+            {
+                views.Add(mainPage.Navigation?.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View);
+            }
         }
 
-        if (modalCount > 0)
+        foreach (var view in views)
         {
-            ProcessView(showPopup, mainPage.Navigation?.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View);
+            ProcessView(showPopup, view);
         }
 
         static void ProcessView(bool showPopup, Android.Views.View? view)
         {
             if (view is null)
             {
-                return;   
+                return;
             }
 
             // Screen reader
@@ -110,7 +118,7 @@ static void ProcessView(bool showPopup, Android.Views.View? view)
         }
     }
 
-    Task<bool> PostAsync(Android.Views.View? nativeView)
+    static Task<bool> PostAsync(Android.Views.View? nativeView)
     {
         if (nativeView == null)
         {