Skip to content

Commit 1705d19

Browse files
committed
Finalize font sizes
1 parent 91bf86d commit 1705d19

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,8 @@ Colors
3939
Styles
4040
------
4141

42+
- Font Styles
43+
44+
![Text styles](art/text_styles.png)
45+
4246
TBC

app/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,7 @@
8787
<color name="text_primary">@color/gray_darker</color>
8888
<color name="text_disabled">@color/gray_dark</color>
8989
<color name="text_placeholder">@color/gray</color>
90+
<color name="text_notice">@color/red_dark</color>
91+
<color name="text_button">@color/blue</color>
9092

9193
</resources>
Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="HeadingOne">
4+
<style name="HeadlineOne">
55
<item name="android:textSize">@dimen/text_hero</item>
66
<item name="android:textStyle">bold</item>
77
<item name="android:textColor">@color/text_primary</item>
88
</style>
99

10-
<style name="HeadingTwo">
10+
<style name="HeadlineTwo">
1111
<item name="android:textSize">@dimen/text_headline</item>
1212
<item name="android:textStyle">bold</item>
1313
<item name="android:textColor">@color/text_primary</item>
1414
</style>
1515

16-
<style name="Title">
17-
<item name="android:textSize">@dimen/text_title</item>
16+
<style name="Heading">
17+
<item name="android:textSize">@dimen/text_large_body</item>
18+
<item name="android:textColor">@color/text_primary</item>
19+
</style>
20+
21+
<style name="Subheading">
22+
<item name="android:textSize">@dimen/text_body</item>
1823
<item name="android:textStyle">bold</item>
1924
<item name="android:textColor">@color/text_primary</item>
2025
</style>
2126

22-
<style name="ParagraphMedium">
27+
<style name="BodyMedium">
2328
<item name="android:textSize">@dimen/text_small_body</item>
2429
<item name="android:textStyle">bold</item>
2530
<item name="android:textColor">@color/text_primary</item>
2631
</style>
2732

28-
<style name="Paragraph">
33+
<style name="Body">
2934
<item name="android:textSize">@dimen/text_small_body</item>
3035
<item name="android:textColor">@color/text_primary</item>
3136
</style>
@@ -41,26 +46,16 @@
4146
<item name="android:textColor">@color/text_primary</item>
4247
</style>
4348

44-
<style name="InputDisabled">
45-
<item name="android:textSize">@dimen/text_small_body</item>
46-
<item name="android:textColor">@color/text_disabled</item>
47-
</style>
48-
49-
<style name="InputPlaceholder">
50-
<item name="android:textSize">@dimen/text_small_body</item>
51-
<item name="android:textColor">@color/text_placeholder</item>
52-
</style>
53-
54-
<style name="SmallText">
49+
<style name="SmallTextMedium">
5550
<item name="android:textSize">@dimen/text_smaller_body</item>
5651
<item name="android:textStyle">bold</item>
5752
<item name="android:textColor">@color/text_primary</item>
5853
</style>
5954

60-
<style name="SmallTextHelp">
55+
<style name="SmallText">
6156
<item name="android:textSize">@dimen/text_smaller_body</item>
6257
<item name="android:textStyle">bold</item>
63-
<item name="android:textColor">@color/red_dark</item>
58+
<item name="android:textColor">@color/text_primary</item>
6459
</style>
6560

6661
</resources>

art/text_styles.png

73.6 KB
Loading

0 commit comments

Comments
 (0)