mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-09-05 22:15:54 +02:00
Override textColorPrimary and not textColor as it conflicts with support libraries (e.g. snackbar text).
Further, use textColorPrimary in the graphs instead of textColor.
This commit is contained in:
parent
68608f8582
commit
2c152e8447
@ -433,7 +433,7 @@ public class GBApplication extends Application {
|
|||||||
public static int getTextColor(Context context) {
|
public static int getTextColor(Context context) {
|
||||||
TypedValue typedValue = new TypedValue();
|
TypedValue typedValue = new TypedValue();
|
||||||
Resources.Theme theme = context.getTheme();
|
Resources.Theme theme = context.getTheme();
|
||||||
theme.resolveAttribute(android.R.attr.textColor, typedValue, true);
|
theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
|
||||||
return typedValue.data;
|
return typedValue.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="GadgetbridgeTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
<style name="GadgetbridgeTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
<item name="android:textColor">@color/primarytext_light</item>
|
<item name="android:textColorPrimary">@color/primarytext_light</item>
|
||||||
<item name="android:textColorSecondary">@color/secondarytext</item>
|
<item name="android:textColorSecondary">@color/secondarytext</item>
|
||||||
<item name="colorPrimary">@color/primary_light</item>
|
<item name="colorPrimary">@color/primary_light</item>
|
||||||
<item name="colorPrimaryDark">@color/primarydark_light</item>
|
<item name="colorPrimaryDark">@color/primarydark_light</item>
|
||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<!-- dark theme -->
|
<!-- dark theme -->
|
||||||
<style name="GadgetbridgeThemeDark" parent="Theme.AppCompat">
|
<style name="GadgetbridgeThemeDark" parent="Theme.AppCompat">
|
||||||
<item name="android:textColor">@color/primarytext_dark</item>
|
<item name="android:textColorPrimary">@color/primarytext_dark</item>
|
||||||
<item name="android:textColorSecondary">@color/secondarytext</item>
|
<item name="android:textColorSecondary">@color/secondarytext</item>
|
||||||
<item name="colorPrimary">@color/primary_dark</item>
|
<item name="colorPrimary">@color/primary_dark</item>
|
||||||
<item name="colorPrimaryDark">@color/primarydark_dark</item>
|
<item name="colorPrimaryDark">@color/primarydark_dark</item>
|
||||||
|
Loading…
Reference in New Issue
Block a user