adjust hugging priority for UILabel (microsoft#1527)

* adjust hugging priority for UILabel * adjusted hugging for separator * removed unecessary separator and adjusted bottom constraint
rankush · Jun 1, 2018 · 4a56370 · 4a56370
1 parent 88d6e72
commit 4a56370
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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<AdaptiveCard> const &)adapt
         [[rootView card] setInputs:inputs];
 
         std::vector<std::shared_ptr<BaseActionElement>> 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
@@ -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
@@ -84,6 +84,7 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)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
@@ -114,7 +114,7 @@ - (UIView *)render
             [newView sendSubviewToBack:imgView];
             [newView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
             [newView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisVertical];
-            NSArray<NSString *> *visualFormats = [NSArray arrayWithObjects:@"H:|[imgView]", @"V:|[imgView]|", nil];
+            NSArray<NSString *> *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]];