[iOS] fixed microsoft#4531 (microsoft#6180)

rankush · Aug 17, 2021 · a2b8e29 · a2b8e29
1 parent 36cb670
commit a2b8e29
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRichTextBlockRenderer.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRichTextBlockRenderer.mm
@@ -105,8 +105,9 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
 
                 // Obtain text color to apply to the attributed string
                 ACRContainerStyle style = lab.style;
+                auto textColor = textRun->GetTextColor().value_or(ForegroundColor::Default);
                 auto foregroundColor = [acoConfig getTextBlockColor:style
-                                                          textColor:textRun->GetTextColor().value_or(ForegroundColor::Default)
+                                                          textColor:textColor
                                                        subtleOption:textRun->GetIsSubtle().value_or(false)];
 
                 // Config and add Select Action
@@ -122,19 +123,20 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
                         [textRunContent addAttribute:@"SelectAction"
                                                value:target
                                                range:selectActionRange];
+
                         [ACRLongPressGestureRecognizerFactory
                             addTapGestureRecognizerToUITextView:lab
                                                          target:(NSObject<ACRSelectActionDelegate>
                                                                      *)target
                                                        rootView:rootView
                                                      hostConfig:acoConfig];
 
-                        [textRunContent addAttribute:NSUnderlineStyleAttributeName
-                                               value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
-                                               range:selectActionRange];
-                        [textRunContent addAttribute:NSUnderlineColorAttributeName
-                                               value:foregroundColor
-                                               range:selectActionRange];
+                        if (@available(iOS 13.0, *)) {
+                            foregroundColor = UIColor.linkColor;
+                        } else {
+                            // Fallback on earlier versions
+                            foregroundColor = [ACOHostConfig convertHexColorCodeToUIColor:"#007affff"];
+                        }
                     }
                 }