Skip to content

Commit

Permalink
[Android] Add support for links in FactSets (microsoft#3235)
Browse files Browse the repository at this point in the history
* Add listener for links in fact sets

* Add test file

* Add tests results
  • Loading branch information
almedina-ms authored Jul 17, 2019
1 parent 1974570 commit 9f7e70c
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 7 deletions.
22 changes: 22 additions & 0 deletions samples/v1.0/Elements/FactSet.Markdown.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [

{
"type": "Container",
"items": [
{
"type": "FactSet",
"facts": [
{
"title": "Test Markdown Link :",
"value": "This is a [Link](https://adaptivecards.io)"
}
]
}
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import android.content.Context;
import android.support.v4.app.FragmentManager;
import android.text.SpannableString;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -51,6 +52,7 @@ static TextView createTextView(Context context, CharSequence text, TextConfig te
TextBlockRenderer.setTextColor(textView, textConfig.getColor(), hostConfig, textConfig.getIsSubtle(), containerStyle);
TextBlockRenderer.setTextSize(textView, FontType.Default, textConfig.getSize(), hostConfig);
TextBlockRenderer.getInstance().setTextFormat(textView, hostConfig, FontType.Default, textConfig.getWeight());
textView.setOnTouchListener(new TextBlockRenderer.TouchTextView(new SpannableString(text)));
textView.setSingleLine(!textConfig.getWrap());
textView.setMaxWidth(Util.dpToPixels(context, textConfig.getMaxWidth()));
textView.setEllipsize(TextUtils.TruncateAt.END);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"HostConfigHash":null,"CardHash":"6e1a85b","Error":null}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"HostConfigHash":null,"CardHash":"6e1a85b","Error":null}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [

{
"type": "Container",
"items": [
{
"type": "FactSet",
"facts": [
{
"title": "Test Markdown Link :",
"value": "This is a [Link](https://adaptivecards.io)"
}
]
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"HostConfigHash":"569178d","CardHash":"6e1a85b","Error":null}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"actions":[],"body":[{"items":[{"facts":[{"title":"Test Markdown Link :","value":"This is a [Link](https://adaptivecards.io)"}],"type":"FactSet"}],"type":"Container"}],"type":"AdaptiveCard","version":"1.0"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"actions":[{"title":"OK","type":"Action.Submit"}],"body":[{"text":"Toggle Input","type":"TextBlock"},{"id":"acceptTerms","title":"I accept the terms and agreements","type":"Input.Toggle","value":"true","valueOff":"false","valueOn":"true"}],"type":"AdaptiveCard","version":"1.0"}
{"actions":[{"title":"OK","type":"Action.Submit"}],"body":[{"text":"Toggle Input","type":"TextBlock"},{"id":"acceptTerms","title":"I accept the terms and agreements","type":"Input.Toggle","value":"true"}],"type":"AdaptiveCard","version":"1.0"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"actions":[{"data":{"id":"1234567890"},"title":"Submit","type":"Action.Submit"},{"card":{"actions":[{"title":"OK","type":"Action.Submit"}],"body":[{"id":"CommentVal","placeholder":"enter comment","style":"text","type":"Input.Text"}],"type":"AdaptiveCard","version":"1.0"},"title":"Show Card","type":"Action.ShowCard"}],"body":[{"horizontalAlignment":"center","size":"Medium","text":"Input.Text elements","type":"TextBlock","weight":"Bolder"},{"id":"SimpleVal","placeholder":"Name","style":"text","type":"Input.Text"},{"id":"UrlVal","placeholder":"Homepage","style":"Url","type":"Input.Text"},{"id":"EmailVal","placeholder":"Email","style":"Email","type":"Input.Text"},{"id":"TelVal","placeholder":"Phone","style":"Tel","type":"Input.Text"},{"id":"MultiLineVal","isMultiline":true,"placeholder":"Comments","style":"text","type":"Input.Text"},{"id":"NumVal","max":5,"min":-5,"placeholder":"Quantity","type":"Input.Number","value":1},{"id":"DateVal","placeholder":"Due Date","type":"Input.Date","value":"2017-09-20"},{"id":"TimeVal","placeholder":"Start time","type":"Input.Time","value":"16:59"},{"horizontalAlignment":"center","size":"Medium","text":"Input.ChoiceSet","type":"TextBlock","weight":"Bolder"},{"text":"What color do you want? (compact)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"CompactSelectVal","style":"Compact","type":"Input.ChoiceSet","value":"1"},{"text":"What color do you want? (expanded)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"SingleSelectVal","style":"Expanded","type":"Input.ChoiceSet","value":"1"},{"text":"What colors do you want? (multiselect)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"MultiSelectVal","isMultiSelect":true,"style":"Compact","type":"Input.ChoiceSet","value":"1,3"},{"horizontalAlignment":"center","size":"Medium","text":"Input.Toggle","type":"TextBlock","weight":"Bolder"},{"id":"AcceptsTerms","title":"I accept the terms and conditions (True/False)","type":"Input.Toggle","valueOff":"false","valueOn":"true"},{"id":"ColorPreference","title":"Red cars are better than other cars","type":"Input.Toggle","valueOff":"NotRedCars","valueOn":"RedCars"}],"type":"AdaptiveCard","version":"1.0"}
{"actions":[{"data":{"id":"1234567890"},"title":"Submit","type":"Action.Submit"},{"card":{"actions":[{"title":"OK","type":"Action.Submit"}],"body":[{"id":"CommentVal","placeholder":"enter comment","style":"text","type":"Input.Text"}],"type":"AdaptiveCard","version":"1.0"},"title":"Show Card","type":"Action.ShowCard"}],"body":[{"horizontalAlignment":"center","size":"Medium","text":"Input.Text elements","type":"TextBlock","weight":"Bolder"},{"id":"SimpleVal","placeholder":"Name","style":"text","type":"Input.Text"},{"id":"UrlVal","placeholder":"Homepage","style":"Url","type":"Input.Text"},{"id":"EmailVal","placeholder":"Email","style":"Email","type":"Input.Text"},{"id":"TelVal","placeholder":"Phone","style":"Tel","type":"Input.Text"},{"id":"MultiLineVal","isMultiline":true,"placeholder":"Comments","style":"text","type":"Input.Text"},{"id":"NumVal","max":5,"min":-5,"placeholder":"Quantity","type":"Input.Number","value":1},{"id":"DateVal","placeholder":"Due Date","type":"Input.Date","value":"2017-09-20"},{"id":"TimeVal","placeholder":"Start time","type":"Input.Time","value":"16:59"},{"horizontalAlignment":"center","size":"Medium","text":"Input.ChoiceSet","type":"TextBlock","weight":"Bolder"},{"text":"What color do you want? (compact)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"CompactSelectVal","style":"Compact","type":"Input.ChoiceSet","value":"1"},{"text":"What color do you want? (expanded)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"SingleSelectVal","style":"Expanded","type":"Input.ChoiceSet","value":"1"},{"text":"What colors do you want? (multiselect)","type":"TextBlock"},{"choices":[{"title":"Red","value":"1"},{"title":"Green","value":"2"},{"title":"Blue","value":"3"}],"id":"MultiSelectVal","isMultiSelect":true,"style":"Compact","type":"Input.ChoiceSet","value":"1,3"},{"horizontalAlignment":"center","size":"Medium","text":"Input.Toggle","type":"TextBlock","weight":"Bolder"},{"id":"AcceptsTerms","title":"I accept the terms and conditions (True/False)","type":"Input.Toggle"},{"id":"ColorPreference","title":"Red cars are better than other cars","type":"Input.Toggle","valueOff":"NotRedCars","valueOn":"RedCars"}],"type":"AdaptiveCard","version":"1.0"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"actions":[],"body":[{"columns":[{"items":[{"text":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.","type":"TextBlock","wrap":true}],"type":"Column","width":"1"},{"items":[{"text":"This is a textblock that doesn't stretch, but the input text does","type":"TextBlock","wrap":true},{"height":"Stretch","id":"input1","title":"Placeholder title","type":"Input.Toggle","valueOff":"false","valueOn":"true"},{"text":"One last text block at the bottom","type":"TextBlock","wrap":true}],"separator":true,"spacing":"large","type":"Column","width":"1"}],"height":"Stretch","type":"ColumnSet"}],"type":"AdaptiveCard","version":"1.0"}
{"actions":[],"body":[{"columns":[{"items":[{"text":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.","type":"TextBlock","wrap":true}],"type":"Column","width":"1"},{"items":[{"text":"This is a textblock that doesn't stretch, but the input text does","type":"TextBlock","wrap":true},{"height":"Stretch","id":"input1","title":"Placeholder title","type":"Input.Toggle"},{"text":"One last text block at the bottom","type":"TextBlock","wrap":true}],"separator":true,"spacing":"large","type":"Column","width":"1"}],"height":"Stretch","type":"ColumnSet"}],"type":"AdaptiveCard","version":"1.0"}
Loading

0 comments on commit 9f7e70c

Please sign in to comment.