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.

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

Set UIAccessibilityTraitButton for QButtonElement. #697

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions quickdialog/QButtonElement.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
cell.textLabel.textAlignment = self.appearance.buttonAlignment;
cell.textLabel.font = self.appearance.labelFont;
cell.textLabel.textColor = self.enabled ? self.appearance.actionColorEnabled : self.appearance.actionColorDisabled;
cell.accessibilityTraits = UIAccessibilityTraitButton;
return cell;
}

Expand Down
Empty file modified quickdialog/QDateTimeInlineElement.h
100755 → 100644
Empty file.
Empty file modified quickdialog/QDateTimeInlineElement.m
100755 → 100644
Empty file.
3 changes: 3 additions & 0 deletions quickdialog/QRadioElement.m
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
cell.accessoryType = self.enabled ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone;
cell.selectionStyle = self.enabled ? UITableViewCellSelectionStyleBlue : UITableViewCellSelectionStyleNone;
cell.textField.userInteractionEnabled = NO;
cell.textField.accessibilityElementsHidden = YES;
cell.accessibilityTraits = UIAccessibilityTraitButton;
cell.textLabel.accessibilityLabel = [NSString stringWithFormat: @"%@, %@", cell.textLabel.text, cell.textField.text];
[cell setNeedsLayout];
return cell;
}
Expand Down
1 change: 1 addition & 0 deletions quickdialog/QRadioItemElement.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
cell.accessoryType = selectedIndex == _index ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
cell.textLabel.textAlignment = NSTextAlignmentLeft; // hardcoded so that appearance doesn't change it
cell.textLabel.textColor = self.enabled ? self.appearance.valueColorEnabled : self.appearance.valueColorDisabled;
cell.accessibilityTraits = UIAccessibilityTraitButton;
cell.imageView.image = self.image;
return cell;
}
Expand Down
1 change: 1 addition & 0 deletions quickdialog/QuickDialogTableView.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- (QuickDialogTableView *)initWithController:(QuickDialogController *)controller;
- (void)deselectRows;

- (NSIndexPath *)indexForElement:(QElement *)element;
- (UITableViewCell *)cellForElement:(QElement *)element;
- (void)reloadCellForElements:(QElement *)element, ... NS_REQUIRES_NIL_TERMINATION;

Expand Down
2 changes: 1 addition & 1 deletion quickdialog/QuickDialogTableView.m
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ - (UITableViewCell *)cellForElement:(QElement *)element {
return nil;
UITableViewCell *cell = [self cellForRowAtIndexPath:[element getIndexPath]];
cell.accessibilityLabel = element.accessibilityLabel;
cell.accessibilityIdentifier = cell.accessibilityIdentifier;
cell.accessibilityIdentifier = element.accessibilityIdentifier;
return cell;
}

Expand Down