Data: migrate profile to a private variable, provide methods for accessing it

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / Colors.java

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 eaae572008149fcedaf0d9715f1d6ad302957a0a..476c56b3a247407bac8a94dd6b5e2a8e3cb2aae4 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -125,17 +125,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",
@@ -160,10 +160,10 @@ public class Colors {
         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);
     }