Merge branch 'master' into rebecch/inputlabels

microsoft · Dec 4, 2019 · 1893413 · 1893413
2 parents 276d40b + 0c99bfd
commit 1893413
Show file tree

Hide file tree

Showing 31 changed files with 1,051 additions and 130 deletions.
diff --git a/samples/v1.1/Tests/Column.VerticalAlignment.json b/samples/v1.1/Tests/Column.VerticalAlignment.json
@@ -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:https://adaptivecards.io/schemas/adaptive-card.json"
+}
diff --git a/samples/v1.2/Tests/choice_default_value.json b/samples/v1.2/Tests/choice_default_value.json
@@ -0,0 +1,35 @@
+{
+ "$schema": "http:https://adaptivecards.io/schemas/adaptive-card.json",
+ "type": "AdaptiveCard",
+ "version": "1.0",
+ "body": [
+ {
+ "type": "TextBlock",
+ "text": "What color do you want? *(isMultiSelect:false, style:compact)*"
+ },
+ {
+ "type": "Input.ChoiceSet",
+ "id": "myColor",
+ "choices": [
+ {
+ "title": "Red",
+ "value": "1"
+ },
+ {
+ "title": "Green",
+ "value": "2"
+ },
+ {
+ "title": "Blue",
+ "value": "3"
+ }
+ ]
+ }
+ ],
+ "actions": [
+ {
+ "type": "Action.Submit",
+ "title": "Submit"
+ }
+ ]
+}
diff --git a/samples/v1.2/Tests/choice_set.json b/samples/v1.2/Tests/choice_set.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "http:https://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"
+ }
+ ]
+}
diff --git a/samples/v1.2/Tests/choice_set_with_wrap.json b/samples/v1.2/Tests/choice_set_with_wrap.json
@@ -0,0 +1,35 @@
+{
+ "$schema": "http:https://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"
+ }
+ ]
+}
diff --git a/samples/v1.2/Tests/newline_card.json b/samples/v1.2/Tests/newline_card.json
@@ -0,0 +1,129 @@
+{
+ "$schema": "http:https://adaptivecards.io/schemas/adaptive-card.json",
+ "type": "AdaptiveCard",
+ "version": "1.0",
+ "body": [
+ {
+ "type": "Container",
+ "items": [
+ {
+ "type": "TextBlock",
+ "text": "Publish Adaptive Card schema",
+ "weight": "bolder",
+ "size": "medium"
+ },
+ {
+ "type": "ColumnSet",
+ "columns": [
+ {
+ "type": "Column",
+ "width": "auto",
+ "items": [
+ {
+ "size": "small",
+ "style": "person",
+ "type": "Image",
+ "url": "https://pbs.twimg.com/profile_images/3647943215/d7f12830b3c17a5a9e4afcc370e3a37e_400x400.jpeg"
+ }
+ ]
+ },
+ {
+ "type": "Column",
+ "width": "stretch",
+ "items": [
+ {
+ "type": "TextBlock",
+ "text": "Matt Hidinger",
+ "weight": "bolder",
+ "wrap": true
+ },
+ {
+ "type": "TextBlock",
+ "spacing": "none",
+ "text": "Created {{DATE(2017-02-14T06:08:39Z, SHORT)}}",
+ "isSubtle": true,
+ "wrap": true
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "Container",
+ "items": [
+ {
+ "type": "TextBlock",
+ "text": "Hi Team,\n\n2 things: \n\n1) @Micheal gave me some great feedback to start sharing my research trips more broadly to the desktop folks. I will be sharing research trips and insights to everyone and not just the team I travel with. So get ready to learn more about our users 🙂\n\n2) I recently visited customers in London with @Meghan Stockdale to research Somethings+SomeOtherThing+something. I wanted to share some insights from the trip that Meghan put together! For context this information is based off 4 companies and 85 customers. (full deck here: Modern Collaboration_ Content and Comms System feedback.pptx)",
+ "wrap": true
+ },
+ {
+ "type": "FactSet",
+ "facts": [
+ {
+ "title": "Board:",
+ "value": "Adaptive Card"
+ },
+ {
+ "title": "List:",
+ "value": "Backlog"
+ },
+ {
+ "title": "Assigned to:",
+ "value": "Matt Hidinger"
+ },
+ {
+ "title": "Due date:",
+ "value": "Not set"
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "actions": [
+ {
+ "type": "Action.ShowCard",
+ "title": "Set due date",
+ "card": {
+ "type": "AdaptiveCard",
+ "version": "1.0",
+ "body": [
+ {
+ "type": "Input.Date",
+ "id": "dueDate"
+ }
+ ],
+ "actions": [
+ {
+ "type": "Action.Submit",
+ "title": "OK"
+ }
+ ]
+ }
+ },
+ {
+ "type": "Action.ShowCard",
+ "title": "Comment",
+ "card": {
+ "type": "AdaptiveCard",
+ "version": "1.0",
+ "body": [
+ {
+ "type": "Input.Text",
+ "id": "comment",
+ "isMultiline": true,
+ "placeholder": "Enter your comment"
+ }
+ ],
+ "actions": [
+ {
+ "type": "Action.Submit",
+ "title": "OK"
+ }
+ ]
+ }
+ }
+ ]
+}