X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=fdaacd5c3f61fac25548fc95da13956a52bd18c6;hb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;hp=d13496fe813b8a3b158acffd7442ad6434c85a23;hpb=2d21e0f704ee35b3772a9b4810f85c122e6ad49c;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 d13496fe..fdaacd5c 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -25,6 +25,7 @@ import android.util.TypedValue;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorLong;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.MutableLiveData;
 
 import net.ktnx.mobileledger.BuildConfig;
@@ -44,17 +45,17 @@ public class Colors {
     public static final int DEFAULT_HUE_DEG = 261;
     public static final int THEME_HUE_STEP_DEG = 5;
     public static final int baseHueStep = 60;
+    public static final MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
     private static final float blueLightness = 0.665f;
     private static final float yellowLightness = 0.350f;
     private static final int[][] EMPTY_STATES = new int[][]{new int[0]};
+    private static final int SWIPE_COLOR_COUNT = 6;
     public static @ColorInt
     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 =
+    private static final 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,
@@ -155,15 +156,16 @@ public class Colors {
     public static @ColorInt
     int getPrimaryColorForHue(int hueDegrees) {
         int result = hslColor(hueDegrees / 360f, 0.845f, hueLightness(hueDegrees));
-        debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees,
-                result));
+//        debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x",
+//        hueDegrees,
+//                result));
         return result;
     }
     public static void setupTheme(Activity activity) {
-        MobileLedgerProfile profile = Data.profile.getValue();
+        MobileLedgerProfile profile = Data.getProfile();
         setupTheme(activity, profile);
     }
-    public static void setupTheme(Activity activity, MobileLedgerProfile profile) {
+    public static void setupTheme(Activity activity, @Nullable MobileLedgerProfile profile) {
         final int themeHue = (profile == null) ? -1 : profile.getThemeHue();
         setupTheme(activity, themeHue);
     }