X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=fc2951f648e18f17e02eedc076a1fadcc7e03dc6;hp=8f59c1cf23ccf0c1247cfa0b597431a9f1e3293f;hb=ea270d6c84f46211d8051d3661a5e8e372c188bf;hpb=da3450cd594a3f9ad6f0a76b2b2fc219949a6695

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..fc2951f6 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,20 @@ 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 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 +47,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 +62,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) {
@@ -152,7 +155,8 @@ public class Colors {
         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));
+        debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees,
+                result));
         return result;
     }
     public static void setupTheme(Activity activity) {
@@ -240,8 +244,8 @@ public class Colors {
                 break;
             default:
                 activity.setTheme(R.style.AppTheme_NoActionBar);
-                Log.d("profiles",
-                        String.format("Theme hue %d not supported, using the default", themeId));
+                debug("profiles", String.format(Locale.ENGLISH,
+                        "Theme hue %d not supported, using the default", themeId));
         }
 
         refreshColors(activity.getTheme());