marketally/marketally.mopups
2
0
Fork 0
Code Issues Packages Releases Wiki

Merge pull request #136 from IeuanWalker/Fix/Accessibility

Browse Source 
Fix: Accessibility with overlaying popups
This commit is contained in:
Tyson Elliot Hooker
2024-09-16 09:54:29 +10:00
committed by GitHub
parent 44b6af7579 d6187191fe
commit 6e556f454a
1 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs
View File

@@ -15,13 +15,13 @@ public class AndroidMopups : IPopupPlatform
{
var popupNavigationInstance = MopupService.Instance;
if (popupNavigationInstance.PopupStack.Count > 0)
if(popupNavigationInstance.PopupStack.Count > 0)
{
var lastPage = popupNavigationInstance.PopupStack[popupNavigationInstance.PopupStack.Count - 1];
var isPreventClose = lastPage.SendBackButtonPressed();
if (!isPreventClose)
if(!isPreventClose)
{
popupNavigationInstance.PopAsync().SafeFireAndForget();
}
@@ -36,7 +36,7 @@ public class AndroidMopups : IPopupPlatform
public Task AddAsync(PopupPage page)
{
HandleAccessibility(true, page.DisableAndroidAccessibilityHandling, page.Parent as Page);
HandleAccessibility(true, page.DisableAndroidAccessibilityHandling, page);
page.Parent = MauiApplication.Current.Application.Windows[0].Content as Element;
page.Parent ??= MauiApplication.Current.Application.Windows[0].Content as Element;
@@ -55,9 +55,9 @@ public class AndroidMopups : IPopupPlatform
{
var renderer = IPopupPlatform.GetOrCreateHandler<PopupPageHandler>(page);
if (renderer != null)
if(renderer != null)
{
HandleAccessibility(false, page.DisableAndroidAccessibilityHandling, page.Parent as Page);
HandleAccessibility(false, page.DisableAndroidAccessibilityHandling, page);
DecoreView?.RemoveView(renderer.PlatformView as Android.Views.View);
renderer.DisconnectHandler(); //?? no clue if works
@@ -70,47 +70,81 @@ public class AndroidMopups : IPopupPlatform
}
//! 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 = null)
readonly Dictionary<Type, List<Android.Views.View>> accessibilityStates = new();
void HandleAccessibility(bool showPopup, bool disableAccessibilityHandling, PopupPage popup)
{
if (disableAccessibilityHandling)
if(disableAccessibilityHandling)
{
return;
}
if (showPopup)
if(showPopup)
{
mainPage ??= Application.Current?.MainPage;
Page? mainPage = popup.Parent as Page ?? Application.Current?.MainPage;
if (mainPage is null)
if(mainPage is null)
{
return;
}
views.Add(mainPage.Handler?.PlatformView as Android.Views.View);
List<Android.Views.View> views = [];
var mainPageAndroidView = mainPage.Handler?.PlatformView as Android.Views.View;
if(mainPageAndroidView is not null && mainPageAndroidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
{
views.Add(mainPageAndroidView);
}
int navCount = mainPage.Navigation.NavigationStack.Count;
if(navCount > 0)
{
var androidView = mainPage.Navigation.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View;
if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
{
views.Add(androidView);
}
}
int modalCount = mainPage.Navigation.ModalStack.Count;
if (navCount > 0)
if(modalCount > 0)
{
views.Add(mainPage.Navigation?.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View);
var androidView = mainPage.Navigation.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View;
if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
{
views.Add(androidView);
}
}
if (modalCount > 0)
var popupCount = MopupService.Instance.PopupStack.Count;
if(popupCount > 1)
{
views.Add(mainPage.Navigation?.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View);
var androidView = MopupService.Instance.PopupStack[popupCount - 2]?.Handler?.PlatformView as Android.Views.View;
if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
{
views.Add(androidView);
}
}
accessibilityStates.Add(popup.GetType(), views);
}
foreach (var view in views)
if(accessibilityStates.ContainsKey(popup.GetType()))
{
ProcessView(showPopup, view);
foreach(var view in accessibilityStates[popup.GetType()])
{
ProcessView(showPopup, view);
}
if(!showPopup)
{
accessibilityStates.Remove(popup.GetType());
}
}
static void ProcessView(bool showPopup, Android.Views.View? view)
{
if (view is null)
if(view is null)
{
return;
}
@@ -126,7 +160,7 @@ public class AndroidMopups : IPopupPlatform
static Task<bool> PostAsync(Android.Views.View? nativeView)
{
if (nativeView == null)
if(nativeView == null)
{
return Task.FromResult(true);
}