X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=eaae572008149fcedaf0d9715f1d6ad302957a0a;hb=a27b9f88f066df4f4e70707c5d08bc8925b59b71;hp=afb355002eebc5baf38b54cda59056202011d0a0;hpb=c6d5f4d72d3ca705cc03b04d87b282ebe717bd61;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 afb35500..eaae5720 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -48,56 +48,38 @@ public class Colors {
     private static final float yellowLightness = 0.350f;
     private static final int[][] EMPTY_STATES = new int[][]{new int[0]};
     public static @ColorInt
-    int accent;
+    int secondary;
     @ColorInt
     public static int tableRowDarkBG;
     public static int profileThemeId = -1;
     public static MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
     private static int SWIPE_COLOR_COUNT = 6;
     private static int[] themeIDs =
-            {R.style.AppTheme_000, R.style.AppTheme_005,
-             R.style.AppTheme_010, R.style.AppTheme_015,
-             R.style.AppTheme_020, R.style.AppTheme_025,
-             R.style.AppTheme_030, R.style.AppTheme_035,
-             R.style.AppTheme_040, R.style.AppTheme_045,
-             R.style.AppTheme_050, R.style.AppTheme_055,
-             R.style.AppTheme_060, R.style.AppTheme_065,
-             R.style.AppTheme_070, R.style.AppTheme_075,
-             R.style.AppTheme_080, R.style.AppTheme_085,
-             R.style.AppTheme_090, R.style.AppTheme_095,
-             R.style.AppTheme_100, R.style.AppTheme_105,
-             R.style.AppTheme_110, R.style.AppTheme_115,
-             R.style.AppTheme_120, R.style.AppTheme_125,
-             R.style.AppTheme_130, R.style.AppTheme_135,
-             R.style.AppTheme_140, R.style.AppTheme_145,
-             R.style.AppTheme_150, R.style.AppTheme_155,
-             R.style.AppTheme_160, R.style.AppTheme_165,
-             R.style.AppTheme_170, R.style.AppTheme_175,
-             R.style.AppTheme_180, R.style.AppTheme_185,
-             R.style.AppTheme_190, R.style.AppTheme_195,
-             R.style.AppTheme_200, R.style.AppTheme_205,
-             R.style.AppTheme_210, R.style.AppTheme_215,
-             R.style.AppTheme_220, R.style.AppTheme_225,
-             R.style.AppTheme_230, R.style.AppTheme_235,
-             R.style.AppTheme_240, R.style.AppTheme_245,
-             R.style.AppTheme_250, R.style.AppTheme_255,
-             R.style.AppTheme_260, R.style.AppTheme_265,
-             R.style.AppTheme_270, R.style.AppTheme_275,
-             R.style.AppTheme_280, R.style.AppTheme_285,
-             R.style.AppTheme_290, R.style.AppTheme_295,
-             R.style.AppTheme_300, R.style.AppTheme_305,
-             R.style.AppTheme_310, R.style.AppTheme_315,
-             R.style.AppTheme_320, R.style.AppTheme_325,
-             R.style.AppTheme_330, R.style.AppTheme_335,
-             R.style.AppTheme_340, R.style.AppTheme_345,
-             R.style.AppTheme_350, R.style.AppTheme_355,
+            {R.style.AppTheme_000, R.style.AppTheme_005, R.style.AppTheme_010, R.style.AppTheme_015,
+             R.style.AppTheme_020, R.style.AppTheme_025, R.style.AppTheme_030, R.style.AppTheme_035,
+             R.style.AppTheme_040, R.style.AppTheme_045, R.style.AppTheme_050, R.style.AppTheme_055,
+             R.style.AppTheme_060, R.style.AppTheme_065, R.style.AppTheme_070, R.style.AppTheme_075,
+             R.style.AppTheme_080, R.style.AppTheme_085, R.style.AppTheme_090, R.style.AppTheme_095,
+             R.style.AppTheme_100, R.style.AppTheme_105, R.style.AppTheme_110, R.style.AppTheme_115,
+             R.style.AppTheme_120, R.style.AppTheme_125, R.style.AppTheme_130, R.style.AppTheme_135,
+             R.style.AppTheme_140, R.style.AppTheme_145, R.style.AppTheme_150, R.style.AppTheme_155,
+             R.style.AppTheme_160, R.style.AppTheme_165, R.style.AppTheme_170, R.style.AppTheme_175,
+             R.style.AppTheme_180, R.style.AppTheme_185, R.style.AppTheme_190, R.style.AppTheme_195,
+             R.style.AppTheme_200, R.style.AppTheme_205, R.style.AppTheme_210, R.style.AppTheme_215,
+             R.style.AppTheme_220, R.style.AppTheme_225, R.style.AppTheme_230, R.style.AppTheme_235,
+             R.style.AppTheme_240, R.style.AppTheme_245, R.style.AppTheme_250, R.style.AppTheme_255,
+             R.style.AppTheme_260, R.style.AppTheme_265, R.style.AppTheme_270, R.style.AppTheme_275,
+             R.style.AppTheme_280, R.style.AppTheme_285, R.style.AppTheme_290, R.style.AppTheme_295,
+             R.style.AppTheme_300, R.style.AppTheme_305, R.style.AppTheme_310, R.style.AppTheme_315,
+             R.style.AppTheme_320, R.style.AppTheme_325, R.style.AppTheme_330, R.style.AppTheme_335,
+             R.style.AppTheme_340, R.style.AppTheme_345, R.style.AppTheme_350, R.style.AppTheme_355,
              };
     public static void refreshColors(Resources.Theme theme) {
         TypedValue tv = new TypedValue();
         theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true);
         tableRowDarkBG = tv.data;
-        theme.resolveAttribute(R.attr.colorAccent, tv, true);
-        accent = tv.data;
+        theme.resolveAttribute(R.attr.colorSecondary, tv, true);
+        secondary = tv.data;
 
         // trigger theme observers
         themeWatch.postValue(themeWatch.getValue() + 1);