Apply text color directly from theme attr

This commit is contained in:
moezbhatti
2019-08-11 20:33:13 +02:00
parent b7e78b79aa
commit f5bf212c76
19 changed files with 104 additions and 132 deletions
+4 -7
View File
@@ -20,13 +20,10 @@
<resources>
<attr name="textColor" format="enum">
<enum name="primary" value="0" />
<enum name="secondary" value="1" />
<enum name="tertiary" value="2" />
<enum name="primaryOnTheme" value="3" />
<enum name="secondaryOnTheme" value="4" />
<enum name="tertiaryOnTheme" value="5" />
<enum name="theme" value="6" />
<enum name="theme" value="0" />
<enum name="primaryOnTheme" value="1" />
<enum name="secondaryOnTheme" value="2" />
<enum name="tertiaryOnTheme" value="3" />
</attr>
<attr name="textSize" format="enum">
+5 -5
View File
@@ -19,17 +19,17 @@
<resources>
<style name="TextPrimary">
<item name="textColor">primary</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="textSize">primary</item>
</style>
<style name="TextSecondary">
<item name="textColor">tertiary</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="textSize">secondary</item>
</style>
<style name="TextTertiary">
<item name="textColor">tertiary</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
<item name="textSize">tertiary</item>
</style>
@@ -61,7 +61,7 @@
<item name="android:ellipsize">end</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:maxLines">1</item>
<item name="textColor">primary</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="textSize">toolbar</item>
</style>
@@ -116,8 +116,8 @@
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:lines">1</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">bold</item>
<item name="textColor">primary</item>
<item name="textSize">secondary</item>
</style>