Skip to content

[iOS] Add underline support to TextRun #3314

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
almedina-ms merged 7 commits into from
Aug 8, 2019
Merged

[iOS] Add underline support to TextRun #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74209db
Add underline to TextBlock and
almedina-ms Jul 31, 2019
687a411
Refactor text run styling being passed around in TextHelper functions
almedina-ms Aug 5, 2019
8d8f85b
Fix renderer version to 1.3
almedina-ms Aug 5, 2019
71ce516
Add shared model unit test
almedina-ms Aug 5, 2019
bef80ef
Add UWP unit tests
almedina-ms Aug 6, 2019
019e740
Add ios support for underlien
almedina-ms Aug 6, 2019
26f5a55
Merge branch 'master' into user/almedina-ms/iOSUnderline
almedina-ms Aug 8, 2019
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
21 changes: 21 additions & 0 deletions samples/v1.3/Elements/TextBlock.Underline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.3",
"body": [
{
"type": "TextBlock",
"text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
},
{
"type": "TextBlock",
"text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
"underline": true
},
{
"type": "TextBlock",
"text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
"underline": false
}
]
}
4 changes: 4 additions & 0 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 @@ -18,6 +18,7 @@
3016458A2294BD090032E11C /* TextBlock.FontType.json in Resources */ = {isa = PBXBuildFile; fileRef = 301645892294BD080032E11C /* TextBlock.FontType.json */; };
30860BC220C9B5C9009F9D99 /* (null) in Resources */ = {isa = PBXBuildFile; };
30860BC420C9B5C9009F9D99 /* (null) in Resources */ = {isa = PBXBuildFile; };
30A1ADB622F9F60E00BA3B6F /* RichTextBlock.Underline.json in Resources */ = {isa = PBXBuildFile; fileRef = 30A1ADB522F9F60E00BA3B6F /* RichTextBlock.Underline.json */; };
30C340E42214D50F009A785D /* ColumnSet.Style.json in Resources */ = {isa = PBXBuildFile; fileRef = 30C340E32214D50F009A785D /* ColumnSet.Style.json */; };
6B096D582257DA0C006CC034 /* Action.IconUrl.TwoActions.json in Resources */ = {isa = PBXBuildFile; fileRef = 6B096D572257DA0B006CC034 /* Action.IconUrl.TwoActions.json */; };
6B096D70225EB73C006CC034 /* Container.Bleed.json in Resources */ = {isa = PBXBuildFile; fileRef = 6B096D6D225EB73C006CC034 /* Container.Bleed.json */; };
Expand Down Expand Up @@ -178,6 +179,7 @@
3016458222824B8A0032E11C /* AdaptiveCard.BackgroundImage.FillMode.Cover.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = AdaptiveCard.BackgroundImage.FillMode.Cover.json; path = ../../../../samples/v1.2/Elements/AdaptiveCard.BackgroundImage.FillMode.Cover.json; sourceTree = "<group>"; };
3016458322824B8A0032E11C /* AdaptiveCard.BackgroundImage.FillMode.RepeatVertically.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = AdaptiveCard.BackgroundImage.FillMode.RepeatVertically.json; path = ../../../../samples/v1.2/Elements/AdaptiveCard.BackgroundImage.FillMode.RepeatVertically.json; sourceTree = "<group>"; };
301645892294BD080032E11C /* TextBlock.FontType.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = TextBlock.FontType.json; path = ../../../../samples/v1.2/Elements/TextBlock.FontType.json; sourceTree = "<group>"; };
30A1ADB522F9F60E00BA3B6F /* RichTextBlock.Underline.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = RichTextBlock.Underline.json; path = ../../../../samples/v1.3/Elements/RichTextBlock.Underline.json; sourceTree = "<group>"; };
30C340E32214D50F009A785D /* ColumnSet.Style.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = ColumnSet.Style.json; path = ../../../../samples/v1.2/Elements/ColumnSet.Style.json; sourceTree = "<group>"; };
6B096D572257DA0B006CC034 /* Action.IconUrl.TwoActions.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = Action.IconUrl.TwoActions.json; path = ../../../../samples/v1.1/Elements/Action.IconUrl.TwoActions.json; sourceTree = "<group>"; };
6B096D6D225EB73C006CC034 /* Container.Bleed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = Container.Bleed.json; path = ../../../../samples/v1.2/Elements/Container.Bleed.json; sourceTree = "<group>"; };
Expand Down Expand Up @@ -450,6 +452,7 @@
F4D33E341F045B6E00941E44 /* Jsons */ = {
isa = PBXGroup;
children = (
30A1ADB522F9F60E00BA3B6F /* RichTextBlock.Underline.json */,
6BE0389922DF9409005413DE /* ContainerDoubleFallback.json */,
6BE0389422DE46C1005413DE /* Agenda.json */,
6BE0389322DE46C1005413DE /* ExpenseReport.json */,
Expand Down Expand Up @@ -766,6 +769,7 @@
F4933CD11F79852C00F6EBFD /* Container.Spacing.json in Resources */,
F4933CCF1F79852C00F6EBFD /* Container.SelectAction.json in Resources */,
F4933CDC1F79852C00F6EBFD /* Input.ChoiceSet.json in Resources */,
30A1ADB622F9F60E00BA3B6F /* RichTextBlock.Underline.json in Resources */,
6BC30F6821DFE8EA00B9FAAE /* Media.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACOAdaptiveCard.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ + (ACOAdaptiveCardParseResult *)fromJson:(NSString *)payload;
try
{
ACOAdaptiveCard *card = [[ACOAdaptiveCard alloc] init];
std::shared_ptr<ParseResult> parseResult = AdaptiveCard::DeserializeFromString(std::string([payload UTF8String]), std::string("1.2"));
std::shared_ptr<ParseResult> parseResult = AdaptiveCard::DeserializeFromString(std::string([payload UTF8String]), std::string("1.3"));
NSMutableArray *acrParseWarnings;
std::vector<std::shared_ptr<AdaptiveCardParseWarning>> parseWarnings = parseResult->GetWarnings();
for(const auto &warning : parseWarnings){
Expand Down
5 changes: 5 additions & 0 deletions source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRichTextBlockRenderer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
if(textRun->GetStrikethrough()) {
[textRunContent addAttribute:NSStrikethroughStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:NSMakeRange(0, textRunContent.length)];
}

if(textRun->GetUnderline())
{
[textRunContent addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:NSMakeRange(0, textRunContent.length)];
}

// Add paragraph style, text color, text weight as attributes to a NSMutableAttributedString, content.
[textRunContent addAttributes:@{NSParagraphStyleAttributeName:paragraphStyle, NSForegroundColorAttributeName:foregroundColor,} range:NSMakeRange(0, textRunContent.length - 1)];
Expand Down