Skip to content
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

[.NET] FontStyle Implementation #1988

Merged
merged 18 commits into from
Oct 26, 2018
Merged

[.NET] FontStyle Implementation #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b71a04
Added new Test and HostConfig for fontStyle feature
carlos-zamora Sep 28, 2018
c14449a
Added parse implementation of FontStyles in HostConfig and AdaptiveCard
carlos-zamora Sep 28, 2018
6f76c61
WPF works. Debugging up next. Also need to test/debug HTML.
carlos-zamora Sep 28, 2018
d9d660b
Added a way to easily access system default values
carlos-zamora Oct 3, 2018
98ffe97
WPF: style inheritance supported
carlos-zamora Oct 3, 2018
fa25c57
HTML: style inheritance supported
carlos-zamora Oct 3, 2018
96b53a0
Testing: HostConfigs for fontStyle testing
carlos-zamora Oct 3, 2018
7e3bdb6
Updated a test. Added empty constructor to deprecated properties.
carlos-zamora Oct 3, 2018
d0b538c
Merge branch 'master' into cazamor/1967-multiplefonts-.net
carlos-zamora Oct 3, 2018
83aec06
Moved Get<proprty> to AdaptiveHostConfig + other PR changes
carlos-zamora Oct 16, 2018
aec5de8
merged master
carlos-zamora Oct 16, 2018
41118d4
.NET: Updated supported renderer version
carlos-zamora Oct 16, 2018
1d2291f
Testing: FontStyles.json now tests different sizes/weights\r*HTML: fo…
carlos-zamora Oct 16, 2018
02a35c1
Fixed bug where cards with actions fail to render
carlos-zamora Oct 16, 2018
160a851
Testing: updated expected version to 1.2, removed unnecessary font-fa…
carlos-zamora Oct 17, 2018
49b0e5f
FontStyle-FontFamily Inheritance: Monospace style no longer inherits …
carlos-zamora Oct 23, 2018
63ff79f
removed unnecessary HCs and modified sample.json to include FontStyles
carlos-zamora Oct 25, 2018
52d85dd
updated all HCs to use font styles
carlos-zamora Oct 25, 2018
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
58 changes: 46 additions & 12 deletions samples/HostConfig/microsoft-teams.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,52 @@
"lineColor": "#FFEEEEEE"
},
"supportsInteractivity": true,
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
"fontStyles": {
"default": {
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"display": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"monospace": {
"fontFamily": "Segoe UI Mono",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
}
},
"containerStyles": {
"default": {
Expand Down
60 changes: 47 additions & 13 deletions samples/HostConfig/outlook-desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,53 @@
"lineColor": "#FFEEEEEE"
},
"supportsInteractivity": true,
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
},
"fontStyles": {
"default": {
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"display": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"monospace": {
"fontFamily": "Courier New",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
}
}
"containerStyles": {
"default": {
"backgroundColor": "#FFFFFFFF",
Expand Down
58 changes: 46 additions & 12 deletions samples/HostConfig/sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,52 @@
"lineColor": "#EEEEEE"
},
"supportsInteractivity": true,
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
"fontStyles": {
"default": {
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"display": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"monospace": {
"fontFamily": "Segoe UI Mono",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
}
},
"containerStyles": {
"default": {
Expand Down
60 changes: 47 additions & 13 deletions samples/HostConfig/sampleDifferentFont.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,53 @@
"lineColor": "#EEEEEE"
},
"supportsInteractivity": true,
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
},
"fontStyles": {
"default": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"display": {
"fontFamily": "Comic Sans",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"monospace": {
"fontFamily": "Courier New",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
}
}
"containerStyles": {
"default": {
"backgroundColor": "#00000000",
Expand Down
58 changes: 46 additions & 12 deletions samples/HostConfig/skype.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,52 @@
"lineColor": "#FF444444"
},
"supportsInteractivity": true,
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
"fontStyles": {
"default": {
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"display": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
},
"monospace": {
"fontFamily": "Segoe UI Mono",
"fontSizes": {
"small": 12,
"default": 14,
"medium": 17,
"large": 21,
"extraLarge": 26
},
"fontWeights": {
"lighter": 200,
"default": 400,
"bolder": 600
}
}
},
"containerStyles": {
"default": {
Expand Down
58 changes: 46 additions & 12 deletions samples/HostConfig/windows-notification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,52 @@
"lineThickness": 1,
"lineColor": "#66FFFFFF"
},
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 15,
"medium": 20,
"large": 24,
"extraLarge": 34
},
"fontWeights": {
"lighter": 400,
"default": 500,
"bolder": 700
"fontStyles": {
"default": {
"fontFamily": "Segoe UI",
"fontSizes": {
"small": 12,
"default": 15,
"medium": 20,
"large": 24,
"extraLarge": 34
},
"fontWeights": {
"lighter": 400,
"default": 500,
"bolder": 700
}
},
"display": {
"fontFamily": "Times New Roman",
"fontSizes": {
"small": 12,
"default": 15,
"medium": 20,
"large": 24,
"extraLarge": 34
},
"fontWeights": {
"lighter": 400,
"default": 500,
"bolder": 700
}
},
"monospace": {
"fontFamily": "Segoe UI Mono",
"fontSizes": {
"small": 12,
"default": 15,
"medium": 20,
"large": 24,
"extraLarge": 34
},
"fontWeights": {
"lighter": 400,
"default": 500,
"bolder": 700
}
}
},
"containerStyles": {
"default": {
Expand Down
Loading