X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=afb355002eebc5baf38b54cda59056202011d0a0;hb=c6d5f4d72d3ca705cc03b04d87b282ebe717bd61;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..afb35500 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
@@ -50,14 +50,9 @@ public class Colors {
     public static @ColorInt
     int accent;
     @ColorInt
-    public static int tableRowLightBG;
-    @ColorInt
     public static int tableRowDarkBG;
-    @ColorInt
-    public static int primary, defaultTextColor, defaultTextColorDisabled;
     public static int profileThemeId = -1;
     public static MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
-    public static int errorTextColor;
     private static int SWIPE_COLOR_COUNT = 6;
     private static int[] themeIDs =
             {R.style.AppTheme_000, R.style.AppTheme_005,
@@ -101,17 +96,8 @@ public class Colors {
         TypedValue tv = new TypedValue();
         theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true);
         tableRowDarkBG = tv.data;
-        theme.resolveAttribute(R.attr.table_row_light_bg, tv, true);
-        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);
-        errorTextColor = tv.data;
 
         // trigger theme observers
         themeWatch.postValue(themeWatch.getValue() + 1);
@@ -217,7 +203,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));