Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android keyboard navigation accessibility #741

Closed
wants to merge 1 commit into from
Closed

Android keyboard navigation accessibility #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 51 additions & 55 deletions Rg.Plugins.Popup/Platforms/Android/Impl/PopupPlatformDroid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,37 +36,18 @@ public event EventHandler OnInitialized

public Task AddAsync(PopupPage page)
{
var decoreView = DecoreView;

HandleAccessibilityWorkaround(page);

if (page.AndroidTalkbackAccessibilityWorkaround)
{
HandleAccessibility(true);
DisableFocusableInTouchMode(XApplication.Current.MainPage?.GetOrCreateRenderer().View.Parent);
}

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;
var modalCount = XApplication.Current.MainPage.Navigation.ModalStack.Count;
XApplication.Current.MainPage.GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.NoHideDescendants;

if (navCount > 0)
{
XApplication.Current.MainPage.Navigation.NavigationStack[navCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.NoHideDescendants;
}
if (modalCount > 0)
{
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;
Expand Down Expand Up @@ -94,7 +75,10 @@ public Task RemoveAsync(PopupPage page)
var renderer = page.GetOrCreateRenderer();
if (renderer != null)
{
HandleAccessibilityWorkaround(page);
if (page.AndroidTalkbackAccessibilityWorkaround)
{
HandleAccessibility(false);
}

page.Parent = XApplication.Current.MainPage;
var element = renderer.Element;
Expand All @@ -109,34 +93,6 @@ public Task RemoveAsync(PopupPage page)
}

return Task.FromResult(true);

static void HandleAccessibilityWorkaround(PopupPage page)
{
if (page.AndroidTalkbackAccessibilityWorkaround)
{
var mainPage = XApplication.Current.MainPage;

var navCount = mainPage.Navigation.NavigationStack.Count;
var modalCount = mainPage.Navigation.ModalStack.Count;

var mainPageRenderer = mainPage.GetOrCreateRenderer();

// Workaround for https://github.com/rotorgames/Rg.Plugins.Popup/issues/721
if (!(mainPage is MultiPage<Page>))
{
mainPageRenderer.View.ImportantForAccessibility = ImportantForAccessibility.Auto;
}

if (navCount > 0)
{
mainPage.Navigation.NavigationStack[navCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
}
if (modalCount > 0)
{
mainPage.Navigation.ModalStack[modalCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
}
}
}
}

#region System Animation
Expand Down Expand Up @@ -183,5 +139,45 @@ private static Task PostAsync(Android.Views.View nativeView)
return tcs.Task;
}
#endregion

static void HandleAccessibility(bool showPopup)
{
Page? mainPage = XApplication.Current?.MainPage;

if (mainPage is null)
{
return;
}

int navCount = mainPage.Navigation.NavigationStack.Count;
int modalCount = mainPage.Navigation.ModalStack.Count;

ProcessView(showPopup, mainPage.GetOrCreateRenderer().View);

if (navCount > 0)
{
ProcessView(showPopup, mainPage.Navigation?.NavigationStack[navCount - 1]?.GetOrCreateRenderer().View);
}

if (modalCount > 0)
{
ProcessView(showPopup, mainPage.Navigation?.ModalStack[modalCount - 1]?.GetOrCreateRenderer()?.View);
}

static void ProcessView(bool showPopup, Android.Views.View? view)
{
if (view is null)
{
return;
}

// Screen reader
view.ImportantForAccessibility = showPopup ? ImportantForAccessibility.NoHideDescendants : ImportantForAccessibility.Auto;

// Keyboard navigation
((ViewGroup)view).DescendantFocusability = showPopup ? DescendantFocusability.BlockDescendants : DescendantFocusability.AfterDescendants;
view.ClearFocus();
}
}
}
}