X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=8049d76ba2fa388ef9cfb6c9789da18c12ad1a20;hb=46f085f006042a07edc6fb6c2bc464cbe074c275;hp=c61d0144fa251b9de618a53c46e063a8857985cf;hpb=6680ab3aec4c8bfb5662e0d2a251f05cb026e035;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java index c61d0144..8049d76b 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -54,9 +54,10 @@ public class Colors { @ColorInt public static int tableRowDarkBG; @ColorInt - public static int primary, defaultTextColor; + public static int primary, defaultTextColor, defaultTextColorDisabled; public static int profileThemeId = -1; public static MutableLiveData themeWatch = new MutableLiveData<>(0); + public static int errorTextColor; private static int[] themeIDs = {R.style.AppTheme_NoActionBar_000, R.style.AppTheme_NoActionBar_005, R.style.AppTheme_NoActionBar_010, R.style.AppTheme_NoActionBar_015, @@ -105,8 +106,11 @@ public class Colors { primary = tv.data; theme.resolveAttribute(R.attr.textColor, tv, true); defaultTextColor = tv.data; + defaultTextColorDisabled = 0x7f000000 | 0x00ffffff & defaultTextColor; theme.resolveAttribute(R.attr.colorAccent, tv, true); accent = tv.data; + theme.resolveAttribute(R.attr.errorTextColor, tv, true); + errorTextColor = tv.data; // trigger theme observers themeWatch.postValue(themeWatch.getValue() + 1);