Skip to content

Fixes Vertical Alignment Issue on iOS #3630

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
Joseph Woo (jwoo-msft) merged 7 commits into from
Nov 21, 2019
Merged

Fixes Vertical Alignment Issue on iOS #3630

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c83358
Fixes vertical alignment issue & horizontal stretch
jwoo-msft Nov 20, 2019
a30209e
updated changes for release/1.2
jwoo-msft Nov 20, 2019
b4112f3
updated
jwoo-msft Nov 21, 2019
02ba3f3
clang-formatted
jwoo-msft Nov 21, 2019
576e467
updating test files
Nov 21, 2019
4b370a3
Updated json spaces with tabs
Nov 21, 2019
11a4f68
Merge branch 'master' into jwoo/ios-vertical-alignment-issue
jwoo-msft Nov 21, 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
70 changes: 70 additions & 0 deletions samples/v1.1/Tests/Column.VerticalAlignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"text": "**Columns Vertical Alignment Test**",
"horizontalAlignment": "Center"
}
],
"style": "emphasis",
"bleed": true
},
{
"type": "ColumnSet",
"columns": [
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "Image",
"altText": "",
"url": "https://adaptivecards.io/content/adaptive-card-50.png",
"horizontalAlignment": "Center"
}
]
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Top",
"horizontalAlignment": "Center",
"wrap": true
}
]
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Center"
}
],
"verticalContentAlignment": "Center"
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Bottom"
}
],
"verticalContentAlignment": "Bottom"
}
]
}
],
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json"
}
4 changes: 4 additions & 0 deletions source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRColumnRenderer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
trailingBlankSpace = [column addPaddingSpace];
}

if (leadingBlankSpace || trailingBlankSpace) {
column.hasStretchableView = YES;
}

if (columnElem->GetMinHeight() > 0) {
[NSLayoutConstraint constraintWithItem:column
attribute:NSLayoutAttributeHeight
Expand Down
3 changes: 2 additions & 1 deletion source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRColumnSetRenderer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
}
}

// to enable filler space to fill, its superview must strech it
if (curView.hasStretchableView || (columnSetElem->GetHeight() == HeightType::Stretch)) {
[columnSetView setAlignmentForColumnStretch];
}
Expand All @@ -183,7 +184,7 @@ - (UIView *)render:(UIView<ACRIContentHoldingView> *)viewGroup
castedRenderer.fillAlignment = NO;

if ([constraints count]) {
[columnSetView addConstraints:constraints];
[NSLayoutConstraint activateConstraints:constraints];
}

std::shared_ptr<BaseActionElement> selectAction = columnSetElem->GetSelectAction();
Expand Down
1 change: 1 addition & 0 deletions ...eCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.Column.VerticalAlignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"HostConfigHash":null,"CardHash":"a56b909","Error":null}
Binary file added ...App/Expected/Fixed Size Non-Interactive.v1.1.Tests.Column.VerticalAlignment.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ...TestApp/Expected/No host config (default values).v1.1.Tests.Column.VerticalAlignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"HostConfigHash":null,"CardHash":"a56b909","Error":null}
Binary file added ...xpected/No host config (default values).v1.1.Tests.Column.VerticalAlignment.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 70 additions & 0 deletions ...AdaptiveCardTestApp/Expected/SourceCards/v1.1.Tests.Column.VerticalAlignment.a56b909.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"text": "**Columns Vertical Alignment Test**",
"horizontalAlignment": "Center"
}
],
"style": "emphasis",
"bleed": true
},
{
"type": "ColumnSet",
"columns": [
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "Image",
"altText": "",
"url": "https://adaptivecards.io/content/adaptive-card-50.png",
"horizontalAlignment": "Center"
}
]
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Top",
"horizontalAlignment": "Center",
"wrap": true
}
]
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Center"
}
],
"verticalContentAlignment": "Center"
},
{
"type": "Column",
"width": "stretch",
"items": [
{
"type": "TextBlock",
"text": "Bottom"
}
],
"verticalContentAlignment": "Bottom"
}
]
}
],
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json"
}
Loading