Skip to content

Commit c41b8c3

Browse files
authored
Merge pull request #722 from Axemasta/721-screenreaderfix
Fixed Andriod Screenreader Accessibility (#721)
2 parents c29a0be + 8c38fc2 commit c41b8c3

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,26 @@ static void HandleAccessibilityWorkaround(PopupPage page)
116116
{
117117
if (page.AndroidTalkbackAccessibilityWorkaround)
118118
{
119-
var navCount = XApplication.Current.MainPage.Navigation.NavigationStack.Count;
120-
var modalCount = XApplication.Current.MainPage.Navigation.ModalStack.Count;
121-
XApplication.Current.MainPage.GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
119+
var mainPage = XApplication.Current.MainPage;
120+
121+
var navCount = mainPage.Navigation.NavigationStack.Count;
122+
var modalCount = mainPage.Navigation.ModalStack.Count;
123+
124+
var mainPageRenderer = mainPage.GetOrCreateRenderer();
125+
126+
// Workaround for https://github.com/rotorgames/Rg.Plugins.Popup/issues/721
127+
if (!(mainPage is MultiPage<Page>))
128+
{
129+
mainPageRenderer.View.ImportantForAccessibility = ImportantForAccessibility.Auto;
130+
}
122131

123132
if (navCount > 0)
124133
{
125-
XApplication.Current.MainPage.Navigation.NavigationStack[navCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
134+
mainPage.Navigation.NavigationStack[navCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
126135
}
127136
if (modalCount > 0)
128137
{
129-
XApplication.Current.MainPage.Navigation.ModalStack[modalCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
138+
mainPage.Navigation.ModalStack[modalCount - 1].GetOrCreateRenderer().View.ImportantForAccessibility = ImportantForAccessibility.Auto;
130139
}
131140
}
132141
}

0 commit comments

Comments
 (0)