Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 47cab56

Browse files
sriramramanisriramramani
committed
Bug 823644: Base TextAppearances for the application. [r=mfinkle]
--HG-- extra : rebase_source : 41c00873d3f5a171b9a8c16d73bd62fa619e6384
1 parent e1fadc9 commit 47cab56

10 files changed

Lines changed: 205 additions & 8 deletions

File tree

‎mobile/android/base/Makefile.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,13 @@ RES_COLOR = \
974974
res/color/awesome_bar_title.xml \
975975
res/color/awesome_bar_title_hint.xml \
976976
res/color/menu_item_title.xml \
977+
res/color/primary_text.xml \
978+
res/color/primary_text_inverse.xml \
979+
res/color/secondary_text.xml \
980+
res/color/secondary_text_inverse.xml \
977981
res/color/select_item_multichoice.xml \
982+
res/color/tertiary_text.xml \
983+
res/color/tertiary_text_inverse.xml \
978984
$(NULL)
979985

980986
RES_MENU = \

‎mobile/android/base/resources/color/primary_text.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_primary"/>
6+
7+
</selector>

‎mobile/android/base/resources/color/primary_text_inverse.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_primary_inverse"/>
6+
7+
</selector>

‎mobile/android/base/resources/color/secondary_text.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_secondary"/>
6+
7+
</selector>

‎mobile/android/base/resources/color/secondary_text_inverse.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_secondary_inverse"/>
6+
7+
</selector>

‎mobile/android/base/resources/color/tertiary_text.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_tertiary"/>
6+
7+
</selector>

‎mobile/android/base/resources/color/tertiary_text_inverse.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
5+
<item android:color="@color/text_color_tertiary_inverse"/>
6+
7+
</selector>

‎mobile/android/base/resources/values/colors.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,33 @@
3232
<!-- highlight-focused on private nav button: 10% white over background_private -->
3333
<color name="highlight_nav_focused_pb">#FF3F423F</color>
3434

35+
<!--
36+
Application theme colors
37+
-->
38+
<!-- Default colors -->
39+
<color name="text_color_primary">#222222</color>
40+
<color name="text_color_secondary">#666666</color>
41+
<color name="text_color_tertiary">#9198A1</color>
42+
43+
<!-- Default inverse colors -->
44+
<color name="text_color_primary_inverse">#FFFFFF</color>
45+
<color name="text_color_secondary_inverse">#DDDDDD</color>
46+
<color name="text_color_tertiary_inverse">#A4A7A9</color>
47+
48+
<!-- Disabled colors -->
49+
<color name="text_color_primary_disable_only">#999999</color>
50+
51+
<!-- Hint colors -->
52+
<color name="text_color_hint">#666666</color>
53+
<color name="text_color_hint_inverse">#7F828A</color>
54+
55+
<!-- Highlight colors -->
56+
<color name="text_color_highlight">#FF9500</color>
57+
<color name="text_color_highlight_inverse">#D06BFF</color>
58+
59+
<!-- Link colors -->
60+
<color name="text_color_link">#22629E</color>
61+
3562
<color name="autocomplete_listitem_text">#000000</color>
3663
<color name="splash_background">#000000</color>
3764
<color name="splash_msgfont">#ffffff</color>

‎mobile/android/base/resources/values/styles.xml‎

Lines changed: 95 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@
2222
Application styles. All customizations that are not specific
2323
to a particular API level can go here.
2424
-->
25-
<style name="Widget.Button" parent="Widget.BaseButton"/>
25+
<style name="Widget.Button" parent="Widget.BaseButton">
26+
<item name="android:textAppearance">@style/TextAppearance.Widget.Button</item>
27+
</style>
2628

27-
<style name="Widget.EditText" parent="Widget.BaseEditText"/>
29+
<style name="Widget.EditText" parent="Widget.BaseEditText">
30+
<item name="android:textAppearance">@style/TextAppearance.Widget.EditText</item>
31+
</style>
2832

29-
<style name="Widget.TextView" parent="Widget.BaseTextView"/>
33+
<style name="Widget.TextView" parent="Widget.BaseTextView">
34+
<item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
35+
</style>
3036

3137
<style name="Widget.ListView" parent="Widget.BaseListView">
3238
<item name="android:divider">#D1D5DA</item>
@@ -50,6 +56,90 @@
5056
<item name="android:ellipsize">marquee</item>
5157
</style>
5258

59+
<!--
60+
TextAppearance
61+
Note: Gecko uses light theme as default, while Android uses dark.
62+
If Android convention has to be followd, the list of colors specified
63+
in themes.xml would be inverse, and things would get confusing.
64+
Hence, Gecko's TextAppearance is based on text over light theme and
65+
TextAppearance.Inverse is based on text over dark theme.
66+
-->
67+
<style name="TextAppearance">
68+
<item name="android:textColor">?android:attr/textColorPrimary</item>
69+
<item name="android:textColorHighlight">@color/text_color_highlight</item>
70+
<item name="android:textColorHint">?android:attr/textColorHint</item>
71+
<item name="android:textColorLink">?android:attr/textColorLink</item>
72+
<item name="android:textSize">16sp</item>
73+
<item name="android:textStyle">normal</item>
74+
</style>
75+
76+
<style name="TextAppearance.Inverse">
77+
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
78+
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
79+
<item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
80+
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
81+
</style>
82+
83+
<style name="TextAppearance.Large">
84+
<item name="android:textSize">22sp</item>
85+
</style>
86+
87+
<style name="TextAppearance.Large.Inverse">
88+
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
89+
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
90+
<item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
91+
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
92+
</style>
93+
94+
<style name="TextAppearance.Medium">
95+
<item name="android:textSize">18sp</item>
96+
</style>
97+
98+
<style name="TextAppearance.Medium.Inverse">
99+
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
100+
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
101+
<item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
102+
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
103+
</style>
104+
105+
<style name="TextAppearance.Small">
106+
<item name="android:textSize">14sp</item>
107+
<item name="android:textColor">?android:attr/textColorSecondary</item>
108+
</style>
109+
110+
<style name="TextAppearance.Small.Inverse">
111+
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
112+
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
113+
<item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
114+
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
115+
</style>
116+
117+
<style name="TextAppearance.Micro">
118+
<item name="android:textSize">12sp</item>
119+
<item name="android:textColor">?android:attr/textColorTertiary</item>
120+
</style>
121+
122+
<style name="TextAppearance.Micro.Inverse">
123+
<item name="android:textColor">?android:attr/textColorTertiaryInverse</item>
124+
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
125+
<item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
126+
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
127+
</style>
128+
129+
<style name="TextAppearance.Widget" />
130+
131+
<style name="TextAppearance.Widget.Button" parent="TextAppearance.Small">
132+
<item name="android:textColor">@color/primary_text</item>
133+
</style>
134+
135+
<style name="TextAppearance.Widget.EditText">
136+
<item name="android:textColor">@color/primary_text</item>
137+
</style>
138+
139+
<style name="TextAppearance.Widget.TextView">
140+
<item name="android:textColor">@color/primary_text</item>
141+
</style>
142+
53143
<!-- BrowserToolbar -->
54144
<style name="BrowserToolbar">
55145
<item name="android:layout_width">fill_parent</item>
@@ -277,13 +367,11 @@
277367

278368
<style name="AboutHome.TextAppearance" />
279369

280-
<style name="AboutHome.TextAppearance.Title">
281-
<item name="android:textSize">15sp</item>
370+
<style name="AboutHome.TextAppearance.Title" parent="TextAppearance">
282371
<item name="android:textColor">@color/abouthome_section_title</item>
283372
</style>
284373

285-
<style name="AboutHome.TextAppearance.SubTitle">
286-
<item name="android:textSize">12sp</item>
374+
<style name="AboutHome.TextAppearance.SubTitle" parent="TextAppearance.Micro">
287375
<item name="android:textColor">@color/abouthome_section_subtitle</item>
288376
</style>
289377

‎mobile/android/base/resources/values/themes.xml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,41 @@
3434
Application Theme. All customizations that are not specific
3535
to a particular API level can go here.
3636
-->
37-
<style name="Gecko" parent="GeckoBase"/>
37+
<style name="Gecko" parent="GeckoBase">
38+
<!-- Default colors -->
39+
<item name="android:textColorPrimary">@color/primary_text</item>
40+
<item name="android:textColorSecondary">@color/secondary_text</item>
41+
<item name="android:textColorTertiary">@color/tertiary_text</item>
42+
43+
<!-- Default inverse colors -->
44+
<item name="android:textColorPrimaryInverse">@color/primary_text</item>
45+
<item name="android:textColorSecondaryInverse">@color/secondary_text</item>
46+
<item name="android:textColorTertiaryInverse">@color/tertiary_text</item>
47+
48+
<!-- Disabled colors -->
49+
<item name="android:textColorPrimaryDisableOnly">@color/text_color_primary_disable_only</item>
50+
51+
<!-- Hint colors -->
52+
<item name="android:textColorHint">@color/text_color_hint</item>
53+
<item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
54+
55+
<!-- Highlight colors -->
56+
<item name="android:textColorHighlight">@color/text_color_highlight</item>
57+
<item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
58+
59+
<!-- Link colors -->
60+
<item name="android:textColorLink">@color/text_color_link</item>
61+
62+
<!-- TextAppearances -->
63+
<item name="android:textAppearance">@style/TextAppearance</item>
64+
<item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
65+
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
66+
<item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
67+
<item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
68+
<item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
69+
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
70+
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
71+
</style>
3872

3973
<style name="Gecko.Dialog" parent="GeckoDialogBase"/>
4074

0 commit comments

Comments
 (0)