Skip to content

Bug fixes: Textblock layout | Parsing warnings #7041

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 8 commits into from
Feb 10, 2022
Merged

Bug fixes: Textblock layout | Parsing warnings #7041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c647da
need to take accoutn for empty
Feb 5, 2022
d3291f0
works but need to find memory leak
Feb 5, 2022
09e7d9d
testing against stackedit
Feb 7, 2022
7ae5ad4
removing unneeded line | allocating array
Feb 7, 2022
dbe4f92
clean up
Feb 7, 2022
5cc7352
getting rid of str() use from strigstream
Feb 7, 2022
b17e199
handling link destination with [ character and other tokens
Feb 9, 2022
e02dd17
removing cpp changes
Feb 9, 2022
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
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 @@ -63,7 +63,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.5"));
NSMutableArray *acrParseWarnings;
NSMutableArray *acrParseWarnings = [[NSMutableArray alloc] init];
std::vector<std::shared_ptr<AdaptiveCardParseWarning>> parseWarnings = parseResult->GetWarnings();
for (const auto &warning : parseWarnings) {
ACRParseWarning *acrParseWarning = [[ACRParseWarning alloc] initWithParseWarning:warning];
Expand Down
2 changes: 1 addition & 1 deletion source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRColumnView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ - (void)configureWidthOfView:(UIView *)view
}

[view setContentHuggingPriority:priority forAxis:UILayoutConstraintAxisHorizontal];
[view setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal];
[view setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
[self setContentHuggingPriority:priority forAxis:UILayoutConstraintAxisHorizontal];
[self setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal];
// if columnWidth is set to stretch or number, allow column to fill the available space
Expand Down