From fe26532101fbfa77301bb96a714e005f83744762 Mon Sep 17 00:00:00 2001 From: nesalang Date: Fri, 17 Sep 2021 14:28:22 -0700 Subject: [PATCH] [iOS] Updated Radio Buttons / Check Boxes Contrast Ratio --- .../project.pbxproj | 4 +-- .../ACRChoiceSetViewDataSource.mm | 28 +++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/project.pbxproj b/source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/project.pbxproj index ac547b1938..b491c04d36 100644 --- a/source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/project.pbxproj +++ b/source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/project.pbxproj @@ -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; @@ -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; diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRChoiceSetViewDataSource.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRChoiceSetViewDataSource.mm index 30a09cf885..dcdc1d68cd 100644 --- a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRChoiceSetViewDataSource.mm +++ b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRChoiceSetViewDataSource.mm @@ -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) { @@ -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;