Skip to content

[Android] Fix spacing in ChoiceSets with wrappjng #3594

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 6 commits into from
Nov 18, 2019
Merged

[Android] Fix spacing in ChoiceSets with wrappjng #3594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2774a21
Hotfix for padding
almedina-ms Oct 31, 2019
d54377d
Fix Spacing by changing lines to maxLiens
almedina-ms Nov 12, 2019
456bc40
Merge branch 'master' into user/almedina-ms/FixSpacingInMultichoice
almedina-ms Nov 12, 2019
f1b5f18
Merge branch 'master' into user/almedina-ms/FixSpacingInMultichoice
Nov 13, 2019
36c8d07
Add Teams test fikes
almedina-ms Nov 18, 2019
630509a
Merge branch 'master' into user/almedina-ms/FixSpacingInMultichoice
almedina-ms Nov 18, 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
34 changes: 34 additions & 0 deletions samples/v1.2/Tests/choice_set.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "Input.ChoiceSet",
"id": "myColor4",
"isMultiSelect": true,
"value": "1",
"style": "expanded",
"choices": [
{
"title": "Red",
"value": "1"
},
{
"title": "Green",
"value": "2"
},
{
"title": "Blue",
"value": "3"
}
]
}
],
"actions": [
{
"type": "Action.Submit",
"title": "OK"
}
]
}
35 changes: 35 additions & 0 deletions samples/v1.2/Tests/choice_set_with_wrap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "Input.ChoiceSet",
"id": "myColor4",
"isMultiSelect": true,
"value": "1",
"style": "expanded",
"wrap": true,
"choices": [
{
"title": "Red",
"value": "1"
},
{
"title": "Green",
"value": "2"
},
{
"title": "Blue",
"value": "3"
}
]
}
],
"actions": [
{
"type": "Action.Submit",
"title": "OK"
}
]
}
5 changes: 3 additions & 2 deletions ...d/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public View renderCheckBoxSet(
List<CheckBox> checkBoxList = new Vector<CheckBox>();
ChoiceInputVector choiceInputVector = choiceSetInput.GetChoices();
long size = choiceInputVector.size();

@shalinijoshi19 Shalini Joshi (shalinijoshi19) Nov 13, 2019

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a sample card that you can check in to teh samples folder for the bug bash testing. Also can we add a unit test for this?


String value = choiceSetInput.GetValue();
Vector<String> defaults = new Vector<>();
defaults.addAll(Arrays.asList(value.split(",")));
Expand All @@ -90,9 +91,9 @@ public View renderCheckBoxSet(
CheckBox checkBox = new CheckBox(context);
checkBox.setText(choiceInput.GetTitle());

if(!choiceSetInput.GetWrap())
if (!choiceSetInput.GetWrap())
{
checkBox.setLines(1);
checkBox.setMaxLines(1);
checkBox.setEllipsize(TextUtils.TruncateAt.END);
}

Expand Down