FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(android): NavigationButton was read as "Button" by screenreaders. by m-abs · Pull Request #5949 · NativeScript/NativeScript · GitHub

/ NativeScript Public

fix(android): NavigationButton was read as "Button" by screenreaders. #5949

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

Merged
vakrilov merged 2 commits into from
Jun 14, 2018
+20 −4
Conversation 2 Commits 2 Checks 0 Files changed 2
Merged

fix(android): NavigationButton was read as "Button" by screenreaders. #5949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b0b79c
fix(android): NavigationButton was read as "Button" by screenreaders.
m-abs Jun 13, 2018
53817f1
Merge branch 'master' into feature/navigation-button-content-description
Jun 14, 2018
File filter

Filter by extension

Filter by extension .ts  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 14 additions & 1 deletion tests/app/ui/action-bar/action-bar-tests.android.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ export function test_navigationButton_visibility() {
TKUnit.assertNull(toolbar.getNavigationIcon(), "Visibility does not work");
}

export function test_navigationButton_contentDecription() {
const actionItem = new ActionItem();
actionItem.icon = "~/small-image.png";
const actionItemText = "NavButton with small-image";
actionItem.text = actionItemText;
const page = actionTestsCommon.createPageAndNavigate();
page.actionBar.navigationButton = actionItem;

const toolbar = <android.support.v7.widget.Toolbar>page.actionBar.nativeViewProtected;

TKUnit.assertEqual(toolbar.getNavigationContentDescription(), actionItemText, "Navigation Button should have an content decription");
}

export function test_set_actionView_to_attached_actionItem_propagates_context() {
const actionItem = new ActionItem();
const actionButton = new Button();
Expand Down Expand Up @@ -72,4 +85,4 @@ export function test_add_actionItem_with_actionView_propagates_context() {
TKUnit.assertNull(actionButton._context, "Action button context should be null before added");
actionItem.actionView = actionButton;
TKUnit.assertNotNull(actionButton._context, "Action button context should not be null after add");
}
}
9 changes: 6 additions & 3 deletions tns-core-modules/ui/action-bar/action-bar.android.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ export class ActionBar extends ActionBarBase {
this.nativeViewProtected.setNavigationIcon(drawableOrId);
}

// Set navigation content descripion, used by screen readers for the vision-impaired users
this.nativeViewProtected.setNavigationContentDescription(navButton.text || null);

let navBtn = new WeakRef(navButton);
this.nativeViewProtected.setNavigationOnClickListener(new android.view.View.OnClickListener({
onClick: function (v) {
Expand Down Expand Up @@ -285,7 +288,7 @@ export class ActionBar extends ActionBarBase {
let menuItem = menu.add(android.view.Menu.NONE, item._getItemId(), android.view.Menu.NONE, item.text + "");

if (item.actionView && item.actionView.android) {
// With custom action view, the menuitem cannot be displayed in a popup menu.
// With custom action view, the menuitem cannot be displayed in a popup menu.
item.android.position = "actionBar";
menuItem.setActionView(item.actionView.android);
ActionBar._setOnClickListener(item);
Expand Down Expand Up @@ -376,7 +379,7 @@ export class ActionBar extends ActionBarBase {
}

// Fallback to hardcoded falue if we don't find TextView instance...
// using new TextView().getTextColors().getDefaultColor() returns different value: -1979711488
// using new TextView().getTextColors().getDefaultColor() returns different value: -1979711488
defaultTitleTextColor = tv ? tv.getTextColors().getDefaultColor() : -570425344;
}

Expand Down Expand Up @@ -468,4 +471,4 @@ function getIconVisibility(iconVisibility: string): boolean {

function getSystemResourceId(systemIcon: string): number {
return android.content.res.Resources.getSystem().getIdentifier(systemIcon, "drawable", "android");
}
}
Back | FazBrowse Home | New Git URL