]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
multi-color progress indicators
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / Colors.java
index 8e526c1fb6879f59fb565404639313d6b7e3d2b2..f0db19ebdc4cf3b27fb65481dfaeadf6450d74d7 100644 (file)
 package net.ktnx.mobileledger.utils;
 
 import android.app.Activity;
+import android.content.res.ColorStateList;
 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.annotation.NonNull;
+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;
+    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]};
     public static @ColorInt
     int accent;
     @ColorInt
@@ -42,8 +51,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);
@@ -58,7 +66,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) {
@@ -75,8 +83,8 @@ public class Colors {
         return 0xff000000 | hsvTriplet(hue, saturation, value);
     }
     public static @ColorInt
-    int hslColor(float hue, float saturation, float lightness) {
-        return 0xff000000 | hslTriplet(hue, saturation, lightness);
+    int hslColor(float hueRatio, float saturation, float lightness) {
+        return 0xff000000 | hslTriplet(hueRatio, saturation, lightness);
     }
     public static @ColorInt
     int hsvTriplet(float hue, float saturation, float value) {
@@ -115,9 +123,9 @@ public class Colors {
         }
     }
     public static @ColorInt
-    int hslTriplet(float hue, float saturation, float lightness) {
+    int hslTriplet(float hueRatio, float saturation, float lightness) {
         @ColorLong long result;
-        float h = hue * 6;
+        float h = hueRatio * 6;
         float c = (1 - abs(2f * lightness - 1)) * saturation;
         float h_mod_2 = h % 2;
         float x = c * (1 - Math.abs(h_mod_2 - 1));
@@ -133,7 +141,7 @@ public class Colors {
 
         throw new IllegalArgumentException(String.format(
                 "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb",
-                h, hue, saturation, lightness));
+                h, hueRatio, saturation, lightness));
     }
 
     public static @ColorInt
@@ -144,111 +152,62 @@ public class Colors {
         return (r_int << 16) | (g_int << 8) | b_int;
     }
     public static @ColorInt
-    int getPrimaryColorForHue(int degrees) {
-        // 0/360f becomes -0.000something for some reason
-        if (degrees == 0) return getPrimaryColorForHue(0f);
-        return getPrimaryColorForHue(degrees / 360f);
-    }
-    public static @ColorInt
-    int getPrimaryColorForHue(float hue) {
-//        int result = hsvColor(hue, 0.61f, 0.95f);
-        int result = hslColor(hue, 0.60f, 0.60f);
-        Log.d("colors", String.format("getPrimaryColorForHue(%1.2f) = %x", hue, result));
+    int getPrimaryColorForHue(int hueDegrees) {
+//        int result = hsvColor(hueDegrees, 0.61f, 0.95f);
+        float y = hueDegrees - 60;
+        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);
+        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) {
-        if (profile != null) {
-            final int themeId = profile.getThemeId();
-            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));
-            }
+        final int themeHue = (profile == null) ? -1 : profile.getThemeId();
+        setupTheme(activity, themeHue);
+    }
+    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);
         }
-        else {
-            Log.d("profiles", "No profile given, using default theme");
+
+        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());
     }
 
+    public static @NonNull
+    ColorStateList getColorStateList() {
+        return getColorStateList(profileThemeId);
+    }
+    public static @NonNull
+    ColorStateList getColorStateList(int hue) {
+        return new ColorStateList(EMPTY_STATES, getColors(hue));
+    }
+    public static int[] getColors() {
+        return getColors(profileThemeId);
+    }
+    public static int[] getColors(int hue) {
+        int[] colors = new int[]{0, 0, 0, 0, 0, 0};
+        for (int i = 0; i < 6; i++, hue = (hue + 60) % 360) {
+            colors[i] = getPrimaryColorForHue(hue);
+        }
+        return colors;
+    }
 }