Skip to content

[iOS] Updated Radio Buttons / Check Boxes Contrast Ratio #6372

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
merged 4 commits into from
Sep 26, 2021
Merged

[iOS] Updated Radio Buttons / Check Boxes Contrast Ratio #6372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe26532
[iOS] Updated Radio Buttons / Check Boxes Contrast Ratio
jwoo-msft Sep 17, 2021
d4fc713
Merge branch 'main' into jwoo/ios-accessibility-1
jwoo-msft Sep 23, 2021
79c3db0
Merge branch 'main' into jwoo/ios-accessibility-1
paulcam206 Sep 23, 2021
ea5c9b1
Merge branch 'main' into jwoo/ios-accessibility-1
paulcam206 Sep 26, 2021
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
4 changes: 2 additions & 2 deletions source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -863,7 +863,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
28 changes: 22 additions & 6 deletions source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRChoiceSetViewDataSource.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,29 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(nulla
UIImage *iconImage = nil;
NSBundle *bundle = [[ACOBundle getInstance] getBundle];
if ([reuseIdentifier isEqualToString:@"checked-checkbox"]) {
iconImage = [UIImage imageNamed:@"checked-checkbox-24.png" inBundle:bundle compatibleWithTraitCollection:nil];
if (@available(iOS 13.0, *)) {
iconImage = [UIImage systemImageNamed:@"checkmark.square"];
} else {
iconImage = [UIImage imageNamed:@"checked-checkbox-24.png" inBundle:bundle compatibleWithTraitCollection:nil];
}
} else if ([reuseIdentifier isEqualToString:@"checked-radiobutton"]) {
iconImage = [UIImage imageNamed:@"checked.png" inBundle:bundle compatibleWithTraitCollection:nil];
if (@available(iOS 13.0, *)) {
iconImage = [UIImage systemImageNamed:@"record.circle"];
} else {
iconImage = [UIImage imageNamed:@"checked.png" inBundle:bundle compatibleWithTraitCollection:nil];
}
} else if ([reuseIdentifier isEqualToString:@"unchecked-checkbox"]) {
iconImage = [UIImage imageNamed:@"unchecked-checkbox-24.png" inBundle:bundle compatibleWithTraitCollection:nil];
if (@available(iOS 13.0, *)) {
iconImage = [UIImage systemImageNamed:@"square"];
} else {
iconImage = [UIImage imageNamed:@"square" inBundle:bundle compatibleWithTraitCollection:nil];
}
} else if ([reuseIdentifier isEqualToString:@"unchecked-radiobutton"]) {
iconImage = [UIImage imageNamed:@"unchecked.png" inBundle:bundle compatibleWithTraitCollection:nil];
if (@available(iOS 13.0, *)) {
iconImage = [UIImage systemImageNamed:@"circle"];
} else {
iconImage = [UIImage imageNamed:@"unchecked.png" inBundle:bundle compatibleWithTraitCollection:nil];
}
}

if (iconImage) {
Expand Down Expand Up @@ -161,9 +177,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
}
cell.accessibilityTraits = cell.accessibilityTraits | UIAccessibilityTraitButton;
cell.accessibilityLabel = [NSString stringWithFormat:@"%@, %@", _accessibilityString, title];

NSString *elementId = [NSString stringWithCString:_choiceSetDataSource->GetId().c_str()
encoding:NSUTF8StringEncoding];
encoding:NSUTF8StringEncoding];
cell.textLabel.accessibilityIdentifier = [NSString stringWithFormat:@"%@, %@", elementId, title];

return cell;
Expand Down