From 2774a2198e53fd554bde3543607b6c62aa0c6494 Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Thu, 31 Oct 2019 15:14:55 -0700 Subject: [PATCH 1/3] Hotfix for padding --- .../renderer/input/ChoiceSetInputRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java index f13dcd31bc..600a0ba331 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java @@ -76,6 +76,7 @@ public View renderCheckBoxSet( List checkBoxList = new Vector(); ChoiceInputVector choiceInputVector = choiceSetInput.GetChoices(); long size = choiceInputVector.size(); + String value = choiceSetInput.GetValue(); Vector defaults = new Vector<>(); defaults.addAll(Arrays.asList(value.split(","))); @@ -90,9 +91,10 @@ public View renderCheckBoxSet( CheckBox checkBox = new CheckBox(context); checkBox.setText(choiceInput.GetTitle()); - if(!choiceSetInput.GetWrap()) + if (!choiceSetInput.GetWrap()) { - checkBox.setLines(1); + checkBox.setSingleLine(true); + checkBox.setPadding(0, 8, 0, 8); checkBox.setEllipsize(TextUtils.TruncateAt.END); } From d54377d0302e553bb1fd70501f41c31d1f6e1df6 Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Mon, 11 Nov 2019 18:36:11 -0800 Subject: [PATCH 2/3] Fix Spacing by changing lines to maxLiens --- .../adaptivecards/renderer/input/ChoiceSetInputRenderer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java index 600a0ba331..b0d85f5074 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/input/ChoiceSetInputRenderer.java @@ -93,8 +93,7 @@ public View renderCheckBoxSet( if (!choiceSetInput.GetWrap()) { - checkBox.setSingleLine(true); - checkBox.setPadding(0, 8, 0, 8); + checkBox.setMaxLines(1); checkBox.setEllipsize(TextUtils.TruncateAt.END); } From 36c8d07748be508ab715fc6bcdbe7b64725f7a46 Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Mon, 18 Nov 2019 10:57:03 -0800 Subject: [PATCH 3/3] Add Teams test fikes --- samples/v1.2/Tests/choice_set.json | 34 +++++++++++++++++++ samples/v1.2/Tests/choice_set_with_wrap.json | 35 ++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 samples/v1.2/Tests/choice_set.json create mode 100644 samples/v1.2/Tests/choice_set_with_wrap.json diff --git a/samples/v1.2/Tests/choice_set.json b/samples/v1.2/Tests/choice_set.json new file mode 100644 index 0000000000..2d02fee348 --- /dev/null +++ b/samples/v1.2/Tests/choice_set.json @@ -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" + } + ] +} \ No newline at end of file diff --git a/samples/v1.2/Tests/choice_set_with_wrap.json b/samples/v1.2/Tests/choice_set_with_wrap.json new file mode 100644 index 0000000000..273408b2f9 --- /dev/null +++ b/samples/v1.2/Tests/choice_set_with_wrap.json @@ -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" + } + ] +} \ No newline at end of file