From b19625185e362995f5e5389b68d78f7868cb7e66 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:27:05 +0200 Subject: [PATCH 1/6] Fix assignment of cell.accessibilityIdentifier introduced in dec110c. --- quickdialog/QuickDialogTableView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickdialog/QuickDialogTableView.m b/quickdialog/QuickDialogTableView.m index 9a66efc8..d60999e7 100644 --- a/quickdialog/QuickDialogTableView.m +++ b/quickdialog/QuickDialogTableView.m @@ -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; } From 9b5df82dc0c54b6d30bd87c338ec044a60059228 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:28:36 +0200 Subject: [PATCH 2/6] Add UIAccessibilityTraitButton to QRadioItemElement. --- quickdialog/QRadioItemElement.m | 1 + 1 file changed, 1 insertion(+) diff --git a/quickdialog/QRadioItemElement.m b/quickdialog/QRadioItemElement.m index 3f66754d..58c5e057 100644 --- a/quickdialog/QRadioItemElement.m +++ b/quickdialog/QRadioItemElement.m @@ -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; } From ced2dc9c981759de0eea567ee0b226624b436b72 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:29:15 +0200 Subject: [PATCH 3/6] Add missing declaration of indexForElement. --- quickdialog/QuickDialogTableView.h | 1 + 1 file changed, 1 insertion(+) diff --git a/quickdialog/QuickDialogTableView.h b/quickdialog/QuickDialogTableView.h index 99cb9c68..46d3004d 100644 --- a/quickdialog/QuickDialogTableView.h +++ b/quickdialog/QuickDialogTableView.h @@ -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; From 4f19449bfa6ad371ed2e049650cb4a9d1c8529c9 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:30:03 +0200 Subject: [PATCH 4/6] Simplify VoiceOver handling of QRadioElement. --- quickdialog/QRadioElement.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quickdialog/QRadioElement.m b/quickdialog/QRadioElement.m index 1dbfc2fa..2cbd4b88 100644 --- a/quickdialog/QRadioElement.m +++ b/quickdialog/QRadioElement.m @@ -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; } From 11a46df1de57e58a46f6f9b8e732b155736e6add Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:30:27 +0200 Subject: [PATCH 5/6] Set UIAccessibilityTraitButton for QButtonElement. --- quickdialog/QButtonElement.m | 1 + 1 file changed, 1 insertion(+) diff --git a/quickdialog/QButtonElement.m b/quickdialog/QButtonElement.m index 2d1aa520..05d450a5 100644 --- a/quickdialog/QButtonElement.m +++ b/quickdialog/QButtonElement.m @@ -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; } From aea15ace884bd00254718766bdcb056cf370f948 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sat, 2 Apr 2016 14:48:30 +0200 Subject: [PATCH 6/6] Fix file permissions for QDateTimeInlineElement. --- quickdialog/QDateTimeInlineElement.h | 0 quickdialog/QDateTimeInlineElement.m | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 quickdialog/QDateTimeInlineElement.h mode change 100755 => 100644 quickdialog/QDateTimeInlineElement.m diff --git a/quickdialog/QDateTimeInlineElement.h b/quickdialog/QDateTimeInlineElement.h old mode 100755 new mode 100644 diff --git a/quickdialog/QDateTimeInlineElement.m b/quickdialog/QDateTimeInlineElement.m old mode 100755 new mode 100644