X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=fb4298b25d93772f3826f2065cbc73dd74b4ba21;hb=aff298c5d65b279b40884cf8273bd4eeb054adaa;hp=8f59c1cf23ccf0c1247cfa0b597431a9f1e3293f;hpb=da3450cd594a3f9ad6f0a76b2b2fc219949a6695;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 8f59c1cf..fb4298b2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -19,17 +19,21 @@ package net.ktnx.mobileledger.utils;
 
 import android.app.Activity;
 import android.content.res.Resources;
-import android.util.Log;
 import android.util.TypedValue;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.HueRing;
+
+import java.util.Locale;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorLong;
+import androidx.lifecycle.MutableLiveData;
 
 import static java.lang.Math.abs;
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class Colors {
     public static final int DEFAULT_HUE_DEG = 261;
@@ -44,7 +48,7 @@ public class Colors {
     @ColorInt
     public static int primary, defaultTextColor;
     public static int profileThemeId = -1;
-    public static ObservableValue<Integer> themeWatch = new ObservableValue<>(0);
+    public static MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
     public static void refreshColors(Resources.Theme theme) {
         TypedValue tv = new TypedValue();
         theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true);
@@ -59,7 +63,7 @@ public class Colors {
         accent = tv.data;
 
         // trigger theme observers
-        themeWatch.notifyObservers();
+        themeWatch.postValue(themeWatch.getValue() + 1);
     }
     public static @ColorLong
     long hsvaColor(float hue, float saturation, float value, float alpha) {
@@ -151,97 +155,35 @@ public class Colors {
         if (y < 0) y += 360;
         float l = yellowLightness + (blueLightness - yellowLightness) *
                                     (float) Math.cos(Math.toRadians(Math.abs(180 - y) / 2f));
-        int result = hslColor(hueDegrees/360f, 0.845f, l);
-        Log.d("colors", String.format("getPrimaryColorForHue(%d) = %x", hueDegrees, result));
+        int result = hslColor(hueDegrees / 360f, 0.845f, l);
+        debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees,
+                result));
         return result;
     }
     public static void setupTheme(Activity activity) {
-        MobileLedgerProfile profile = Data.profile.get();
+        MobileLedgerProfile profile = Data.profile.getValue();
         setupTheme(activity, profile);
     }
     public static void setupTheme(Activity activity, MobileLedgerProfile profile) {
-        final int themeId = (profile == null) ? -1 : profile.getThemeId();
-        setupTheme(activity, themeId);
+        final int themeHue = (profile == null) ? -1 : profile.getThemeId();
+        setupTheme(activity, themeHue);
     }
-    public static void setupTheme(Activity activity, int themeId) {
-        switch (themeId) {
-            case 0:
-            case 360:
-                activity.setTheme(R.style.AppTheme_NoActionBar_0);
-                break;
-            case 15:
-                activity.setTheme(R.style.AppTheme_NoActionBar_15);
-                break;
-            case 30:
-                activity.setTheme(R.style.AppTheme_NoActionBar_30);
-                break;
-            case 45:
-                activity.setTheme(R.style.AppTheme_NoActionBar_45);
-                break;
-            case 60:
-                activity.setTheme(R.style.AppTheme_NoActionBar_60);
-                break;
-            case 75:
-                activity.setTheme(R.style.AppTheme_NoActionBar_75);
-                break;
-            case 90:
-                activity.setTheme(R.style.AppTheme_NoActionBar_90);
-                break;
-            case 105:
-                activity.setTheme(R.style.AppTheme_NoActionBar_105);
-                break;
-            case 120:
-                activity.setTheme(R.style.AppTheme_NoActionBar_120);
-                break;
-            case 135:
-                activity.setTheme(R.style.AppTheme_NoActionBar_135);
-                break;
-            case 150:
-                activity.setTheme(R.style.AppTheme_NoActionBar_150);
-                break;
-            case 165:
-                activity.setTheme(R.style.AppTheme_NoActionBar_165);
-                break;
-            case 180:
-                activity.setTheme(R.style.AppTheme_NoActionBar_180);
-                break;
-            case 195:
-                activity.setTheme(R.style.AppTheme_NoActionBar_195);
-                break;
-            case 210:
-                activity.setTheme(R.style.AppTheme_NoActionBar_210);
-                break;
-            case 225:
-                activity.setTheme(R.style.AppTheme_NoActionBar_225);
-                break;
-            case 240:
-                activity.setTheme(R.style.AppTheme_NoActionBar_240);
-                break;
-            case 255:
-                activity.setTheme(R.style.AppTheme_NoActionBar_255);
-                break;
-            case 270:
-                activity.setTheme(R.style.AppTheme_NoActionBar_270);
-                break;
-            case 285:
-                activity.setTheme(R.style.AppTheme_NoActionBar_285);
-                break;
-            case 300:
-                activity.setTheme(R.style.AppTheme_NoActionBar_300);
-                break;
-            case 315:
-                activity.setTheme(R.style.AppTheme_NoActionBar_315);
-                break;
-            case 330:
-                activity.setTheme(R.style.AppTheme_NoActionBar_330);
-                break;
-            case 345:
-                activity.setTheme(R.style.AppTheme_NoActionBar_345);
-                break;
-            default:
-                activity.setTheme(R.style.AppTheme_NoActionBar);
-                Log.d("profiles",
-                        String.format("Theme hue %d not supported, using the default", themeId));
+    public static void setupTheme(Activity activity, int themeHue) {
+        int themeId = -1;
+        // Relies that theme resource IDs are sequential numbers
+        if (themeHue == 360) themeHue = 0;
+        if ((themeHue >= 0) && (themeHue < 360) && ((themeHue % HueRing.hueStepDegrees) == 0)) {
+            themeId = R.style.AppTheme_NoActionBar_000 + (themeHue / HueRing.hueStepDegrees);
+        }
+
+        if (themeId < 0) {
+            activity.setTheme(R.style.AppTheme_NoActionBar);
+            debug("profiles",
+                    String.format(Locale.ENGLISH, "Theme hue %d not supported, using the default",
+                            themeHue));
+        }
+        else {
+            activity.setTheme(themeId);
         }
 
         refreshColors(activity.getTheme());