X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=1cff8970992fefec4a93545f547bb6f12f54b66f;hb=3d89211c7a825602e385ff7cb22ef6f69d789735;hp=3c89df9c788a82dab020919e54d6ef7b4214ffd7;hpb=1738aee062f23cc9a69ed11cade1cb048f083def;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 3c89df9c..1cff8970 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -32,6 +32,8 @@ import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.HueRing;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Locale;
 
 import static java.lang.Math.abs;
@@ -39,6 +41,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class Colors {
     public static final int DEFAULT_HUE_DEG = 261;
+    public static final int THEME_HUE_STEP_DEG = 5;
     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]};
@@ -130,9 +133,10 @@ public class Colors {
         int r, g, b;
 
         if ((hue < -0.00005) || (hue > 1.0000005) || (saturation < 0) || (saturation > 1) ||
-            (value < 0) || (value > 1)) throw new IllegalArgumentException(String.format(
-                "hue, saturation, value and alpha must all be between 0 and 1. Arguments given: " +
-                "hue=%1.5f, sat=%1.5f, val=%1.5f", hue, saturation, value));
+            (value < 0) || (value > 1))
+            throw new IllegalArgumentException(String.format(
+                    "hue, saturation, value and alpha must all be between 0 and 1. Arguments " +
+                    "given: " + "hue=%1.5f, sat=%1.5f, val=%1.5f", hue, saturation, value));
 
         int h = (int) (hue * 6);
         float f = hue * 6 - h;
@@ -170,12 +174,18 @@ public class Colors {
         int r, g, b;
         float m = lightness - c / 2f;
 
-        if (h < 1 || h == 6) return tupleToColor(c + m, x + m, 0 + m);
-        if (h < 2) return tupleToColor(x + m, c + m, 0 + m);
-        if (h < 3) return tupleToColor(0 + m, c + m, x + m);
-        if (h < 4) return tupleToColor(0 + m, x + m, c + m);
-        if (h < 5) return tupleToColor(x + m, 0 + m, c + m);
-        if (h < 6) return tupleToColor(c + m, 0 + m, x + m);
+        if (h < 1 || h == 6)
+            return tupleToColor(c + m, x + m, 0 + m);
+        if (h < 2)
+            return tupleToColor(x + m, c + m, 0 + m);
+        if (h < 3)
+            return tupleToColor(0 + m, c + m, x + m);
+        if (h < 4)
+            return tupleToColor(0 + m, x + m, c + m);
+        if (h < 5)
+            return tupleToColor(x + m, 0 + m, c + m);
+        if (h < 6)
+            return tupleToColor(c + m, 0 + m, x + m);
 
         throw new IllegalArgumentException(String.format(
                 "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb",
@@ -193,7 +203,8 @@ public class Colors {
     int getPrimaryColorForHue(int hueDegrees) {
 //        int result = hsvColor(hueDegrees, 0.61f, 0.95f);
         float y = hueDegrees - 60;
-        if (y < 0) y += 360;
+        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);
@@ -212,7 +223,8 @@ public class Colors {
     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 == 360)
+            themeHue = 0;
         if ((themeHue >= 0) && (themeHue < 360) && ((themeHue % HueRing.hueStepDegrees) == 0)) {
             themeId = themeIDs[themeHue / HueRing.hueStepDegrees];
         }
@@ -248,4 +260,70 @@ public class Colors {
         }
         return colors;
     }
+    public static int getNewProfileThemeHue(ArrayList<MobileLedgerProfile> profiles) {
+        if ((profiles == null) || (profiles.size() == 0))
+            return DEFAULT_HUE_DEG;
+
+        if (profiles.size() == 1) {
+            int opposite = profiles.get(0)
+                                   .getThemeHue() + 180;
+            opposite %= 360;
+            return opposite;
+        }
+
+        ArrayList<Integer> hues = new ArrayList<>();
+        for (MobileLedgerProfile p : profiles) {
+            int hue = p.getThemeHue();
+            if (hue == -1)
+                hue = DEFAULT_HUE_DEG;
+            hues.add(hue);
+        }
+        Collections.sort(hues);
+        hues.add(hues.get(0));
+
+        int lastHue = -1;
+        int largestInterval = 0;
+        ArrayList<Integer> largestIntervalStarts = new ArrayList<>();
+
+        for (int h : hues) {
+            if (lastHue == -1) {
+                lastHue = h;
+                continue;
+            }
+
+            int interval;
+            if (h > lastHue)
+                interval = h - lastHue;     // 10 -> 20 is a step of 10
+            else
+                interval = h + (360 - lastHue);    // 350 -> 20 is a step of 30
+
+            if (interval > largestInterval) {
+                largestInterval = interval;
+                largestIntervalStarts.clear();
+                largestIntervalStarts.add(lastHue);
+            }
+            else if (interval == largestInterval) {
+                largestIntervalStarts.add(lastHue);
+            }
+
+            lastHue = h;
+        }
+
+        final int chosenIndex = (int) (Math.random() * largestIntervalStarts.size());
+        int chosenIntervalStart = largestIntervalStarts.get(chosenIndex);
+
+        if (largestInterval % 2 != 0)
+            largestInterval++;    // round up the middle point
+        int chosenHue = (chosenIntervalStart + (largestInterval / 2)) % 360;
+
+        final int mod = chosenHue % THEME_HUE_STEP_DEG;
+        if (mod != 0) {
+            if (mod > THEME_HUE_STEP_DEG / 2)
+                chosenHue += (THEME_HUE_STEP_DEG - mod); // 13 += (5-3) = 15
+            else
+                chosenHue -= mod;       // 12 -= 2 = 10
+        }
+
+        return chosenHue;
+    }
 }