diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRenderer.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRenderer.mm index 757bbf0f0b..127bed068e 100644 --- a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRenderer.mm +++ b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRRenderer.mm @@ -79,9 +79,9 @@ + (UIView *)renderWithAdaptiveCards:(std::shared_ptr const &)adapt [[rootView card] setInputs:inputs]; std::vector> actions = adaptiveCard->GetActions(); - [rootView addActionsToConcurrentQueue:actions]; - [ACRSeparator renderActionsSeparator:verticalView hostConfig:[config getHostConfig]]; if(!actions.empty()) { + [rootView addActionsToConcurrentQueue:actions]; + [ACRSeparator renderActionsSeparator:verticalView hostConfig:[config getHostConfig]]; // renders buttons and their associated actions [ACRRenderer renderButton:rootView inputs:inputs superview:verticalView actionElems:actions hostConfig:config]; } diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRSeparator.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRSeparator.mm index 8b0ee6c138..d3ab875981 100644 --- a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRSeparator.mm +++ b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRSeparator.mm @@ -85,13 +85,13 @@ - (NSLayoutConstraint *)configAutoLayout:(UIView *)superview { [self setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; [self setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - [self setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisVertical]; + [self setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; [self setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; } else { - [self setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; + [self setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + [self setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; [self setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisVertical]; [self setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; } diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRTextBlockRenderer.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRTextBlockRenderer.mm index 6c1d73e4f2..26c0d70799 100644 --- a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRTextBlockRenderer.mm +++ b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRTextBlockRenderer.mm @@ -84,6 +84,7 @@ - (UIView *)render:(UIView *)viewGroup } [lab setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; + [lab setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; [viewGroup addArrangedSubview:lab]; return lab; diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRView.mm b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRView.mm index 4686c2621e..2811cc0d4b 100644 --- a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRView.mm +++ b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRView.mm @@ -114,7 +114,7 @@ - (UIView *)render [newView sendSubviewToBack:imgView]; [newView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; [newView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisVertical]; - NSArray *visualFormats = [NSArray arrayWithObjects:@"H:|[imgView]", @"V:|[imgView]|", nil]; + NSArray *visualFormats = [NSArray arrayWithObjects:@"H:|[imgView]", @"V:|[imgView]", nil]; NSDictionary *viewMap = NSDictionaryOfVariableBindings(imgView); for(NSString *constraint in visualFormats){ [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:constraint options:0 metrics:nil views:viewMap]];