X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=e648ca7d058ff167e8791e45c2c554a601527955;hb=4f910919819fbe8db070847cfbfba493a62c7c58;hp=be68ccc70f261e16821cd3ef4c7e7fa92fa1550b;hpb=afbf56f22cee5cf71e4bb8af728ebc8313731705;p=mobile-ledger-staging.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 be68ccc7..e648ca7d 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -54,7 +54,7 @@ public class Colors { @ColorInt public static int tableRowDarkBG; @ColorInt - public static int primary, defaultTextColor, defaultTextColorDisabled; + public static int primary; public static int profileThemeId = -1; public static MutableLiveData themeWatch = new MutableLiveData<>(0); public static int errorTextColor; @@ -105,9 +105,6 @@ public class Colors { tableRowLightBG = tv.data; theme.resolveAttribute(R.attr.colorPrimary, tv, true); 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); @@ -217,7 +214,7 @@ public class Colors { } if (themeId < 0) { - themeId = R.style.AppTheme; + themeId = R.style.AppTheme_default; debug("profiles", String.format(Locale.ENGLISH, "Theme hue %d not supported, using the default", themeHue));