X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=05ec81755c0759543993e49b797144bfedee1b17;hb=600d64f8daa770afc8f1a809e541573bf317033f;hp=eaae572008149fcedaf0d9715f1d6ad302957a0a;hpb=a27b9f88f066df4f4e70707c5d08bc8925b59b71;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 eaae5720..05ec8175 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;
@@ -47,13 +48,13 @@ public class Colors {
     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 =
             {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,
@@ -125,17 +126,17 @@ public class Colors {
     public static float baseHueLightness(int baseHueDegrees) {
         switch (baseHueDegrees % 360) {
             case 0:
-                return 0.450f;   // red
+                return 0.550f;   // red
             case 60:
-                return 0.400f;  // yellow
+                return 0.250f;  // yellow
             case 120:
-                return 0.400f;  // green
+                return 0.290f;  // green
             case 180:
-                return 0.400f;  // cyan
+                return 0.300f;  // cyan
             case 240:
-                return 0.750f;  // blue
+                return 0.710f;  // blue
             case 300:
-                return 0.500f;   // magenta
+                return 0.450f;   // magenta
             default:
                 throw new IllegalStateException(
                         String.format(Locale.US, "baseHueLightness called with invalid value %d",
@@ -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);
     }