darker colour palette, matching theme (pre-generated) and run-time colours

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 d820f2441d7e4b7f9562a1ea6c03e1847233a222..c61d0144fa251b9de618a53c46e063a8857985cf 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -27,6 +27,7 @@ import androidx.annotation.ColorLong;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
+import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
@@ -42,6 +43,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;
+    public static final int baseHueStep = 60;
     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]};
@@ -140,7 +142,6 @@ public class Colors {
                 "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb",
                 h, hueRatio, saturation, lightness));
     }
-
     public static @ColorInt
     int tupleToColor(float r, float g, float b) {
         int r_int = Math.round(255 * r);
@@ -148,15 +149,39 @@ public class Colors {
         int b_int = Math.round(255 * b);
         return (r_int << 16) | (g_int << 8) | b_int;
     }
+    public static float baseHueLightness(int baseHueDegrees) {
+        switch (baseHueDegrees % 360) {
+            case 0:
+                return 0.450f;   // red
+            case 60:
+                return 0.400f;  // yellow
+            case 120:
+                return 0.400f;  // green
+            case 180:
+                return 0.400f;  // cyan
+            case 240:
+                return 0.750f;  // blue
+            case 300:
+                return 0.500f;   // magenta
+            default:
+                throw new IllegalStateException(
+                        String.format(Locale.US, "baseHueLightness called with invalid value %d",
+                                baseHueDegrees));
+        }
+    }
+    public static float hueLightness(int hueDegrees) {
+        int mod = hueDegrees % baseHueStep;
+        int x0 = hueDegrees - mod;
+        int x1 = x0 + baseHueStep;
+
+        float y0 = baseHueLightness(x0);
+        float y1 = baseHueLightness(x1);
+
+        return y0 + (hueDegrees - x0) * (y1 - y0) / (x1 - x0);
+    }
     public static @ColorInt
     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);
+        int result = hslColor(hueDegrees / 360f, 0.845f, hueLightness(hueDegrees));
         debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees,
                 result));
         return result;
@@ -169,7 +194,7 @@ public class Colors {
         final int themeHue = (profile == null) ? -1 : profile.getThemeHue();
         setupTheme(activity, themeHue);
     }
-    public static void setupTheme(Activity activity, int themeHue) {
+    public static int getThemeIdForHue(int themeHue) {
         int themeId = -1;
         if (themeHue == 360)
             themeHue = 0;
@@ -187,14 +212,17 @@ public class Colors {
         }
 
         if (themeId < 0) {
-            activity.setTheme(R.style.AppTheme_NoActionBar);
+            themeId = R.style.AppTheme_NoActionBar;
             debug("profiles",
                     String.format(Locale.ENGLISH, "Theme hue %d not supported, using the default",
                             themeHue));
         }
-        else {
-            activity.setTheme(themeId);
-        }
+
+        return themeId;
+    }
+    public static void setupTheme(Activity activity, int themeHue) {
+        int themeId = getThemeIdForHue(themeHue);
+        activity.setTheme(themeId);
 
         refreshColors(activity.getTheme());
     }
@@ -238,6 +266,15 @@ public class Colors {
                 hues.add(hue);
             }
             Collections.sort(hues);
+            if (BuildConfig.DEBUG) {
+                StringBuilder huesSB = new StringBuilder();
+                for (int h : hues) {
+                    if (huesSB.length() > 0)
+                        huesSB.append(", ");
+                    huesSB.append(String.valueOf(h));
+                }
+                debug("profiles", String.format("used hues: %s", huesSB.toString()));
+            }
             hues.add(hues.get(0));
 
             int lastHue = -1;
@@ -271,6 +308,10 @@ public class Colors {
             final int chosenIndex = (int) (Math.random() * largestIntervalStarts.size());
             int chosenIntervalStart = largestIntervalStarts.get(chosenIndex);
 
+            debug("profiles",
+                    String.format(Locale.US, "Choosing the middle colour between %d and %d",
+                            chosenIntervalStart, chosenIntervalStart + largestInterval));
+
             if (largestInterval % 2 != 0)
                 largestInterval++;    // round up the middle point
 
@@ -285,6 +326,8 @@ public class Colors {
                 chosenHue -= mod;       // 12 -= 2 = 10
         }
 
+        debug("profiles", String.format(Locale.US, "New profile hue: %d", chosenHue));
+
         return chosenHue;
     }
 }

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9defca00a7829d7b3ab880a96feb3d4d79b12f5c..4929826cec54e335a7ce303591d25f0527090808 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,414 +36,414 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="textColor">#757575</item>
-        <item name="colorPrimary">#935ff2</item>
-        <item name="colorPrimaryTransparent">#00935ff2</item>
-        <item name="colorAccent">#5f14e9</item>
+        <item name="colorPrimary">#9360f2</item>
+        <item name="colorPrimaryTransparent">#009360f2</item>
+        <item name="colorAccent">#6922ec</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#efe7fd</item>
         <item name="table_row_light_bg">#f9f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.000" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ec1717</item>
-        <item name="colorPrimaryTransparent">#00ec1717</item>
-        <item name="colorAccent">#b00f0f</item>
+        <item name="colorPrimary">#d41212</item>
+        <item name="colorPrimaryTransparent">#00d41212</item>
+        <item name="colorAccent">#a90e0e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7e7</item>
         <item name="table_row_light_bg">#fef6f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.005" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#e92514</item>
-        <item name="colorPrimaryTransparent">#00e92514</item>
-        <item name="colorAccent">#ac1c0e</item>
+        <item name="colorPrimary">#d22212</item>
+        <item name="colorPrimaryTransparent">#00d22212</item>
+        <item name="colorAccent">#a81b0e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde9e7</item>
         <item name="table_row_light_bg">#fef6f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.010" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#e33613</item>
-        <item name="colorPrimaryTransparent">#00e33613</item>
-        <item name="colorAccent">#a7280e</item>
+        <item name="colorPrimary">#d03111</item>
+        <item name="colorPrimaryTransparent">#00d03111</item>
+        <item name="colorAccent">#a6270e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdebe7</item>
         <item name="table_row_light_bg">#fef7f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.015" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#dd4513</item>
-        <item name="colorPrimaryTransparent">#00dd4513</item>
-        <item name="colorAccent">#a3330e</item>
+        <item name="colorPrimary">#ce4011</item>
+        <item name="colorPrimaryTransparent">#00ce4011</item>
+        <item name="colorAccent">#a5340e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdede7</item>
         <item name="table_row_light_bg">#fef8f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.020" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#d75412</item>
-        <item name="colorPrimaryTransparent">#00d75412</item>
-        <item name="colorAccent">#9e3d0d</item>
+        <item name="colorPrimary">#cc4f11</item>
+        <item name="colorPrimaryTransparent">#00cc4f11</item>
+        <item name="colorAccent">#a3400e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdefe7</item>
         <item name="table_row_light_bg">#fef8f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.025" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#d16112</item>
-        <item name="colorPrimaryTransparent">#00d16112</item>
-        <item name="colorAccent">#99470d</item>
+        <item name="colorPrimary">#ca5e11</item>
+        <item name="colorPrimaryTransparent">#00ca5e11</item>
+        <item name="colorAccent">#a24b0e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf0e7</item>
         <item name="table_row_light_bg">#fef9f6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.030" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#cb6e11</item>
-        <item name="colorPrimaryTransparent">#00cb6e11</item>
-        <item name="colorAccent">#94500c</item>
+        <item name="colorPrimary">#c86c11</item>
+        <item name="colorPrimaryTransparent">#00c86c11</item>
+        <item name="colorAccent">#a0570d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf2e7</item>
         <item name="table_row_light_bg">#fefaf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.035" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#c57a11</item>
-        <item name="colorPrimaryTransparent">#00c57a11</item>
-        <item name="colorAccent">#8f580c</item>
+        <item name="colorPrimary">#c67a11</item>
+        <item name="colorPrimaryTransparent">#00c67a11</item>
+        <item name="colorAccent">#9e620d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf4e7</item>
         <item name="table_row_light_bg">#fefbf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.040" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#be8410</item>
-        <item name="colorPrimaryTransparent">#00be8410</item>
-        <item name="colorAccent">#8a600c</item>
+        <item name="colorPrimary">#c48810</item>
+        <item name="colorPrimaryTransparent">#00c48810</item>
+        <item name="colorAccent">#9d6d0d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf6e7</item>
         <item name="table_row_light_bg">#fefbf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.045" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#b88e0f</item>
-        <item name="colorPrimaryTransparent">#00b88e0f</item>
-        <item name="colorAccent">#85670b</item>
+        <item name="colorPrimary">#c29610</item>
+        <item name="colorPrimaryTransparent">#00c29610</item>
+        <item name="colorAccent">#9b780d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf8e7</item>
         <item name="table_row_light_bg">#fefcf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.050" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#b2960f</item>
-        <item name="colorPrimaryTransparent">#00b2960f</item>
-        <item name="colorAccent">#806c0b</item>
+        <item name="colorPrimary">#c0a310</item>
+        <item name="colorPrimaryTransparent">#00c0a310</item>
+        <item name="colorAccent">#9a820d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdf9e7</item>
         <item name="table_row_light_bg">#fefdf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.055" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ab9e0e</item>
-        <item name="colorPrimaryTransparent">#00ab9e0e</item>
-        <item name="colorAccent">#7b710a</item>
+        <item name="colorPrimary">#beb010</item>
+        <item name="colorPrimaryTransparent">#00beb010</item>
+        <item name="colorAccent">#988d0d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdfbe7</item>
         <item name="table_row_light_bg">#fefdf6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.060" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#a5a50e</item>
-        <item name="colorPrimaryTransparent">#00a5a50e</item>
-        <item name="colorAccent">#76760a</item>
+        <item name="colorPrimary">#bcbc10</item>
+        <item name="colorPrimaryTransparent">#00bcbc10</item>
+        <item name="colorAccent">#97970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fdfde7</item>
         <item name="table_row_light_bg">#fefef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.065" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#9eab0e</item>
-        <item name="colorPrimaryTransparent">#009eab0e</item>
-        <item name="colorAccent">#717b0a</item>
+        <item name="colorPrimary">#aebc10</item>
+        <item name="colorPrimaryTransparent">#00aebc10</item>
+        <item name="colorAccent">#8b970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fbfde7</item>
         <item name="table_row_light_bg">#fdfef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.070" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#96b20f</item>
-        <item name="colorPrimaryTransparent">#0096b20f</item>
-        <item name="colorAccent">#6c800b</item>
+        <item name="colorPrimary">#9fbc10</item>
+        <item name="colorPrimaryTransparent">#009fbc10</item>
+        <item name="colorAccent">#80970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f9fde7</item>
         <item name="table_row_light_bg">#fdfef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.075" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#8eb80f</item>
-        <item name="colorPrimaryTransparent">#008eb80f</item>
-        <item name="colorAccent">#67850b</item>
+        <item name="colorPrimary">#91bc10</item>
+        <item name="colorPrimaryTransparent">#0091bc10</item>
+        <item name="colorAccent">#74970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f8fde7</item>
         <item name="table_row_light_bg">#fcfef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.080" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#84be10</item>
-        <item name="colorPrimaryTransparent">#0084be10</item>
-        <item name="colorAccent">#608a0c</item>
+        <item name="colorPrimary">#83bc10</item>
+        <item name="colorPrimaryTransparent">#0083bc10</item>
+        <item name="colorAccent">#69970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f6fde7</item>
         <item name="table_row_light_bg">#fbfef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.085" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#7ac511</item>
-        <item name="colorPrimaryTransparent">#007ac511</item>
-        <item name="colorAccent">#588f0c</item>
+        <item name="colorPrimary">#74bc10</item>
+        <item name="colorPrimaryTransparent">#0074bc10</item>
+        <item name="colorAccent">#5d970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f4fde7</item>
         <item name="table_row_light_bg">#fbfef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.090" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#6ecb11</item>
-        <item name="colorPrimaryTransparent">#006ecb11</item>
-        <item name="colorAccent">#50940c</item>
+        <item name="colorPrimary">#66bc10</item>
+        <item name="colorPrimaryTransparent">#0066bc10</item>
+        <item name="colorAccent">#52970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f2fde7</item>
         <item name="table_row_light_bg">#fafef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.095" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#61d112</item>
-        <item name="colorPrimaryTransparent">#0061d112</item>
-        <item name="colorAccent">#47990d</item>
+        <item name="colorPrimary">#58bc10</item>
+        <item name="colorPrimaryTransparent">#0058bc10</item>
+        <item name="colorAccent">#46970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f0fde7</item>
         <item name="table_row_light_bg">#f9fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.100" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#54d712</item>
-        <item name="colorPrimaryTransparent">#0054d712</item>
-        <item name="colorAccent">#3d9e0d</item>
+        <item name="colorPrimary">#49bc10</item>
+        <item name="colorPrimaryTransparent">#0049bc10</item>
+        <item name="colorAccent">#3b970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#effde7</item>
         <item name="table_row_light_bg">#f8fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.105" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#45dd13</item>
-        <item name="colorPrimaryTransparent">#0045dd13</item>
-        <item name="colorAccent">#33a30e</item>
+        <item name="colorPrimary">#3bbc10</item>
+        <item name="colorPrimaryTransparent">#003bbc10</item>
+        <item name="colorAccent">#2f970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#edfde7</item>
         <item name="table_row_light_bg">#f8fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.110" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#36e313</item>
-        <item name="colorPrimaryTransparent">#0036e313</item>
-        <item name="colorAccent">#28a70e</item>
+        <item name="colorPrimary">#2dbc10</item>
+        <item name="colorPrimaryTransparent">#002dbc10</item>
+        <item name="colorAccent">#24970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#ebfde7</item>
         <item name="table_row_light_bg">#f7fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.115" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#25e914</item>
-        <item name="colorPrimaryTransparent">#0025e914</item>
-        <item name="colorAccent">#1cac0e</item>
+        <item name="colorPrimary">#1ebc10</item>
+        <item name="colorPrimaryTransparent">#001ebc10</item>
+        <item name="colorAccent">#18970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e9fde7</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.120" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#17ec17</item>
-        <item name="colorPrimaryTransparent">#0017ec17</item>
-        <item name="colorAccent">#0fb00f</item>
+        <item name="colorPrimary">#10bc10</item>
+        <item name="colorPrimaryTransparent">#0010bc10</item>
+        <item name="colorAccent">#0d970d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fde7</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.125" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#1dec2e</item>
-        <item name="colorPrimaryTransparent">#001dec2e</item>
-        <item name="colorAccent">#0fb51d</item>
+        <item name="colorPrimary">#10bc1e</item>
+        <item name="colorPrimaryTransparent">#0010bc1e</item>
+        <item name="colorAccent">#0d9718</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fde9</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
 
     <style name="AppTheme.NoActionBar.130" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#22ec44</item>
-        <item name="colorPrimaryTransparent">#0022ec44</item>
-        <item name="colorAccent">#10b92c</item>
+        <item name="colorPrimary">#10bc2d</item>
+        <item name="colorPrimaryTransparent">#0010bc2d</item>
+        <item name="colorAccent">#0d9724</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdeb</item>
         <item name="table_row_light_bg">#f6fef7</item>
     </style>
 
     <style name="AppTheme.NoActionBar.135" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#27ed59</item>
-        <item name="colorPrimaryTransparent">#0027ed59</item>
-        <item name="colorAccent">#10bd3b</item>
+        <item name="colorPrimary">#10bc3b</item>
+        <item name="colorPrimaryTransparent">#0010bc3b</item>
+        <item name="colorAccent">#0d972f</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fded</item>
         <item name="table_row_light_bg">#f6fef8</item>
     </style>
 
     <style name="AppTheme.NoActionBar.140" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#2ced6d</item>
-        <item name="colorPrimaryTransparent">#002ced6d</item>
-        <item name="colorAccent">#10c14b</item>
+        <item name="colorPrimary">#10bc49</item>
+        <item name="colorPrimaryTransparent">#0010bc49</item>
+        <item name="colorAccent">#0d973b</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdef</item>
         <item name="table_row_light_bg">#f6fef8</item>
     </style>
 
     <style name="AppTheme.NoActionBar.145" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#31ee80</item>
-        <item name="colorPrimaryTransparent">#0031ee80</item>
-        <item name="colorAccent">#11c55c</item>
+        <item name="colorPrimary">#10bc58</item>
+        <item name="colorPrimaryTransparent">#0010bc58</item>
+        <item name="colorAccent">#0d9746</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf0</item>
         <item name="table_row_light_bg">#f6fef9</item>
     </style>
 
     <style name="AppTheme.NoActionBar.150" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#36ee92</item>
-        <item name="colorPrimaryTransparent">#0036ee92</item>
-        <item name="colorAccent">#11c96d</item>
+        <item name="colorPrimary">#10bc66</item>
+        <item name="colorPrimaryTransparent">#0010bc66</item>
+        <item name="colorAccent">#0d9752</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf2</item>
         <item name="table_row_light_bg">#f6fefa</item>
     </style>
 
     <style name="AppTheme.NoActionBar.155" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#3aeea3</item>
-        <item name="colorPrimaryTransparent">#003aeea3</item>
-        <item name="colorAccent">#11cc7e</item>
+        <item name="colorPrimary">#10bc74</item>
+        <item name="colorPrimaryTransparent">#0010bc74</item>
+        <item name="colorAccent">#0d975d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf4</item>
         <item name="table_row_light_bg">#f6fefb</item>
     </style>
 
     <style name="AppTheme.NoActionBar.160" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#3fefb4</item>
-        <item name="colorPrimaryTransparent">#003fefb4</item>
-        <item name="colorAccent">#11d090</item>
+        <item name="colorPrimary">#10bc83</item>
+        <item name="colorPrimaryTransparent">#0010bc83</item>
+        <item name="colorAccent">#0d9769</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf6</item>
         <item name="table_row_light_bg">#f6fefb</item>
     </style>
 
     <style name="AppTheme.NoActionBar.165" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#43efc4</item>
-        <item name="colorPrimaryTransparent">#0043efc4</item>
-        <item name="colorAccent">#12d3a3</item>
+        <item name="colorPrimary">#10bc91</item>
+        <item name="colorPrimaryTransparent">#0010bc91</item>
+        <item name="colorAccent">#0d9774</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf8</item>
         <item name="table_row_light_bg">#f6fefc</item>
     </style>
 
     <style name="AppTheme.NoActionBar.170" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#47f0d3</item>
-        <item name="colorPrimaryTransparent">#0047f0d3</item>
-        <item name="colorAccent">#12d6b5</item>
+        <item name="colorPrimary">#10bc9f</item>
+        <item name="colorPrimaryTransparent">#0010bc9f</item>
+        <item name="colorAccent">#0d9780</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdf9</item>
         <item name="table_row_light_bg">#f6fefd</item>
     </style>
 
     <style name="AppTheme.NoActionBar.175" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#4af0e2</item>
-        <item name="colorPrimaryTransparent">#004af0e2</item>
-        <item name="colorAccent">#12d9c8</item>
+        <item name="colorPrimary">#10bcae</item>
+        <item name="colorPrimaryTransparent">#0010bcae</item>
+        <item name="colorAccent">#0d978b</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdfb</item>
         <item name="table_row_light_bg">#f6fefd</item>
     </style>
 
     <style name="AppTheme.NoActionBar.180" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#4ef0f0</item>
-        <item name="colorPrimaryTransparent">#004ef0f0</item>
-        <item name="colorAccent">#12dbdb</item>
+        <item name="colorPrimary">#10bcbc</item>
+        <item name="colorPrimaryTransparent">#0010bcbc</item>
+        <item name="colorAccent">#0d9797</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fdfd</item>
         <item name="table_row_light_bg">#f6fefe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.185" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#51e3f0</item>
-        <item name="colorPrimaryTransparent">#0051e3f0</item>
-        <item name="colorAccent">#13cdde</item>
+        <item name="colorPrimary">#11baca</item>
+        <item name="colorPrimaryTransparent">#0011baca</item>
+        <item name="colorAccent">#0e95a2</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7fbfd</item>
         <item name="table_row_light_bg">#f6fdfe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.190" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#54d6f1</item>
-        <item name="colorPrimaryTransparent">#0054d6f1</item>
-        <item name="colorAccent">#13bee0</item>
+        <item name="colorPrimary">#12b7d8</item>
+        <item name="colorPrimaryTransparent">#0012b7d8</item>
+        <item name="colorAccent">#0e92ad</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f9fd</item>
         <item name="table_row_light_bg">#f6fdfe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.195" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#56caf1</item>
-        <item name="colorPrimaryTransparent">#0056caf1</item>
-        <item name="colorAccent">#13aee2</item>
+        <item name="colorPrimary">#13b1e5</item>
+        <item name="colorPrimaryTransparent">#0013b1e5</item>
+        <item name="colorAccent">#0f8db7</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f8fd</item>
         <item name="table_row_light_bg">#f6fcfe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.200" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#58bef1</item>
-        <item name="colorPrimaryTransparent">#0058bef1</item>
-        <item name="colorAccent">#139ee4</item>
+        <item name="colorPrimary">#1ca6ec</item>
+        <item name="colorPrimaryTransparent">#001ca6ec</item>
+        <item name="colorAccent">#1087c2</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f6fd</item>
         <item name="table_row_light_bg">#f6fbfe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.205" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#5bb2f1</item>
-        <item name="colorPrimaryTransparent">#005bb2f1</item>
-        <item name="colorAccent">#138ee6</item>
+        <item name="colorPrimary">#299bed</item>
+        <item name="colorPrimaryTransparent">#00299bed</item>
+        <item name="colorAccent">#117fcd</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f4fd</item>
         <item name="table_row_light_bg">#f6fbfe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.210" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#5ca7f1</item>
-        <item name="colorPrimaryTransparent">#005ca7f1</item>
-        <item name="colorAccent">#137de7</item>
+        <item name="colorPrimary">#3793ee</item>
+        <item name="colorPrimaryTransparent">#003793ee</item>
+        <item name="colorAccent">#1275d8</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f2fd</item>
         <item name="table_row_light_bg">#f6fafe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.215" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#5e9bf1</item>
-        <item name="colorPrimaryTransparent">#005e9bf1</item>
-        <item name="colorAccent">#146ce8</item>
+        <item name="colorPrimary">#458cef</item>
+        <item name="colorPrimaryTransparent">#00458cef</item>
+        <item name="colorAccent">#136ae3</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7f0fd</item>
         <item name="table_row_light_bg">#f6f9fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.220" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#5f90f2</item>
-        <item name="colorPrimaryTransparent">#005f90f2</item>
-        <item name="colorAccent">#145be9</item>
+        <item name="colorPrimary">#5287f1</item>
+        <item name="colorPrimaryTransparent">#005287f1</item>
+        <item name="colorAccent">#175eec</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7effd</item>
         <item name="table_row_light_bg">#f6f8fe</item>
@@ -452,241 +452,241 @@
     <style name="AppTheme.NoActionBar.225" parent="AppTheme.NoActionBar">
         <item name="colorPrimary">#6085f2</item>
         <item name="colorPrimaryTransparent">#006085f2</item>
-        <item name="colorAccent">#1449ea</item>
+        <item name="colorAccent">#2255ec</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7edfd</item>
         <item name="table_row_light_bg">#f6f8fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.230" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#6179f2</item>
-        <item name="colorPrimaryTransparent">#006179f2</item>
-        <item name="colorAccent">#1438eb</item>
+        <item name="colorPrimary">#6e84f3</item>
+        <item name="colorPrimaryTransparent">#006e84f3</item>
+        <item name="colorAccent">#2d4ded</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7ebfd</item>
         <item name="table_row_light_bg">#f6f7fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.235" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#616df2</item>
-        <item name="colorPrimaryTransparent">#00616df2</item>
-        <item name="colorAccent">#1426eb</item>
+        <item name="colorPrimary">#7c86f4</item>
+        <item name="colorPrimaryTransparent">#007c86f4</item>
+        <item name="colorAccent">#3847ee</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7e9fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.240" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#6161f2</item>
-        <item name="colorPrimaryTransparent">#006161f2</item>
-        <item name="colorAccent">#1414eb</item>
+        <item name="colorPrimary">#8989f5</item>
+        <item name="colorPrimaryTransparent">#008989f5</item>
+        <item name="colorAccent">#4343ef</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e7e7fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.245" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#6d61f2</item>
-        <item name="colorPrimaryTransparent">#006d61f2</item>
-        <item name="colorAccent">#2614eb</item>
+        <item name="colorPrimary">#8980f4</item>
+        <item name="colorPrimaryTransparent">#008980f4</item>
+        <item name="colorAccent">#4a3bef</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#e9e7fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.250" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#7961f2</item>
-        <item name="colorPrimaryTransparent">#007961f2</item>
-        <item name="colorAccent">#3814eb</item>
+        <item name="colorPrimary">#8b76f3</item>
+        <item name="colorPrimaryTransparent">#008b76f3</item>
+        <item name="colorAccent">#5233ee</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#ebe7fd</item>
         <item name="table_row_light_bg">#f7f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.255" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#8560f2</item>
-        <item name="colorPrimaryTransparent">#008560f2</item>
-        <item name="colorAccent">#4914ea</item>
+        <item name="colorPrimary">#8e6cf3</item>
+        <item name="colorPrimaryTransparent">#008e6cf3</item>
+        <item name="colorAccent">#5c2bed</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#ede7fd</item>
         <item name="table_row_light_bg">#f8f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.260" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#905ff2</item>
-        <item name="colorPrimaryTransparent">#00905ff2</item>
-        <item name="colorAccent">#5b14e9</item>
+        <item name="colorPrimary">#9262f2</item>
+        <item name="colorPrimaryTransparent">#009262f2</item>
+        <item name="colorAccent">#6623ed</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#efe7fd</item>
         <item name="table_row_light_bg">#f8f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.265" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#9b5ef1</item>
-        <item name="colorPrimaryTransparent">#009b5ef1</item>
-        <item name="colorAccent">#6c14e8</item>
+        <item name="colorPrimary">#9858f1</item>
+        <item name="colorPrimaryTransparent">#009858f1</item>
+        <item name="colorAccent">#721cec</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f0e7fd</item>
         <item name="table_row_light_bg">#f9f6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.270" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#a75cf1</item>
-        <item name="colorPrimaryTransparent">#00a75cf1</item>
-        <item name="colorAccent">#7d13e7</item>
+        <item name="colorPrimary">#9f4ff0</item>
+        <item name="colorPrimaryTransparent">#009f4ff0</item>
+        <item name="colorAccent">#8014eb</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f2e7fd</item>
         <item name="table_row_light_bg">#faf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.275" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#b25bf1</item>
-        <item name="colorPrimaryTransparent">#00b25bf1</item>
-        <item name="colorAccent">#8e13e6</item>
+        <item name="colorPrimary">#a845ef</item>
+        <item name="colorPrimaryTransparent">#00a845ef</item>
+        <item name="colorAccent">#8d13e3</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f4e7fd</item>
         <item name="table_row_light_bg">#fbf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.280" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#be58f1</item>
-        <item name="colorPrimaryTransparent">#00be58f1</item>
-        <item name="colorAccent">#9e13e4</item>
+        <item name="colorPrimary">#b33bef</item>
+        <item name="colorPrimaryTransparent">#00b33bef</item>
+        <item name="colorAccent">#9912dc</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f6e7fd</item>
         <item name="table_row_light_bg">#fbf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.285" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ca56f1</item>
-        <item name="colorPrimaryTransparent">#00ca56f1</item>
-        <item name="colorAccent">#ae13e2</item>
+        <item name="colorPrimary">#bf31ee</item>
+        <item name="colorPrimaryTransparent">#00bf31ee</item>
+        <item name="colorAccent">#a312d4</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f8e7fd</item>
         <item name="table_row_light_bg">#fcf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.290" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#d654f1</item>
-        <item name="colorPrimaryTransparent">#00d654f1</item>
-        <item name="colorAccent">#be13e0</item>
+        <item name="colorPrimary">#cc27ed</item>
+        <item name="colorPrimaryTransparent">#00cc27ed</item>
+        <item name="colorAccent">#ad11cc</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#f9e7fd</item>
         <item name="table_row_light_bg">#fdf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.295" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#e351f0</item>
-        <item name="colorPrimaryTransparent">#00e351f0</item>
-        <item name="colorAccent">#cd13de</item>
+        <item name="colorPrimary">#db1eec</item>
+        <item name="colorPrimaryTransparent">#00db1eec</item>
+        <item name="colorAccent">#b510c4</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fbe7fd</item>
         <item name="table_row_light_bg">#fdf6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.300" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#f04ef0</item>
-        <item name="colorPrimaryTransparent">#00f04ef0</item>
-        <item name="colorAccent">#db12db</item>
+        <item name="colorPrimary">#eb14eb</item>
+        <item name="colorPrimaryTransparent">#00eb14eb</item>
+        <item name="colorAccent">#bc10bc</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7fd</item>
         <item name="table_row_light_bg">#fef6fe</item>
     </style>
 
     <style name="AppTheme.NoActionBar.305" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#f04ae2</item>
-        <item name="colorPrimaryTransparent">#00f04ae2</item>
-        <item name="colorAccent">#d912c8</item>
+        <item name="colorPrimary">#e914d7</item>
+        <item name="colorPrimaryTransparent">#00e914d7</item>
+        <item name="colorAccent">#bb10ac</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7fb</item>
         <item name="table_row_light_bg">#fef6fd</item>
     </style>
 
     <style name="AppTheme.NoActionBar.310" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#f047d3</item>
-        <item name="colorPrimaryTransparent">#00f047d3</item>
-        <item name="colorAccent">#d612b5</item>
+        <item name="colorPrimary">#e713c4</item>
+        <item name="colorPrimaryTransparent">#00e713c4</item>
+        <item name="colorAccent">#b9109d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f9</item>
         <item name="table_row_light_bg">#fef6fd</item>
     </style>
 
     <style name="AppTheme.NoActionBar.315" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ef43c4</item>
-        <item name="colorPrimaryTransparent">#00ef43c4</item>
-        <item name="colorAccent">#d312a3</item>
+        <item name="colorPrimary">#e513b1</item>
+        <item name="colorPrimaryTransparent">#00e513b1</item>
+        <item name="colorAccent">#b70f8d</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f8</item>
         <item name="table_row_light_bg">#fef6fc</item>
     </style>
 
     <style name="AppTheme.NoActionBar.320" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ef3fb4</item>
-        <item name="colorPrimaryTransparent">#00ef3fb4</item>
-        <item name="colorAccent">#d01190</item>
+        <item name="colorPrimary">#e3139e</item>
+        <item name="colorPrimaryTransparent">#00e3139e</item>
+        <item name="colorAccent">#b60f7e</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f6</item>
         <item name="table_row_light_bg">#fef6fb</item>
     </style>
 
     <style name="AppTheme.NoActionBar.325" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ee3aa3</item>
-        <item name="colorPrimaryTransparent">#00ee3aa3</item>
-        <item name="colorAccent">#cc117e</item>
+        <item name="colorPrimary">#e1138b</item>
+        <item name="colorPrimaryTransparent">#00e1138b</item>
+        <item name="colorAccent">#b40f70</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f4</item>
         <item name="table_row_light_bg">#fef6fb</item>
     </style>
 
     <style name="AppTheme.NoActionBar.330" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ee3692</item>
-        <item name="colorPrimaryTransparent">#00ee3692</item>
-        <item name="colorAccent">#c9116d</item>
+        <item name="colorPrimary">#df1379</item>
+        <item name="colorPrimaryTransparent">#00df1379</item>
+        <item name="colorAccent">#b30f61</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f2</item>
         <item name="table_row_light_bg">#fef6fa</item>
     </style>
 
     <style name="AppTheme.NoActionBar.335" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ee3180</item>
-        <item name="colorPrimaryTransparent">#00ee3180</item>
-        <item name="colorAccent">#c5115c</item>
+        <item name="colorPrimary">#de1367</item>
+        <item name="colorPrimaryTransparent">#00de1367</item>
+        <item name="colorAccent">#b10f53</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7f0</item>
         <item name="table_row_light_bg">#fef6f9</item>
     </style>
 
     <style name="AppTheme.NoActionBar.340" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ed2c6d</item>
-        <item name="colorPrimaryTransparent">#00ed2c6d</item>
-        <item name="colorAccent">#c1104b</item>
+        <item name="colorPrimary">#dc1255</item>
+        <item name="colorPrimaryTransparent">#00dc1255</item>
+        <item name="colorAccent">#b00f44</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7ef</item>
         <item name="table_row_light_bg">#fef6f8</item>
     </style>
 
     <style name="AppTheme.NoActionBar.345" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ed2759</item>
-        <item name="colorPrimaryTransparent">#00ed2759</item>
-        <item name="colorAccent">#bd103b</item>
+        <item name="colorPrimary">#da1244</item>
+        <item name="colorPrimaryTransparent">#00da1244</item>
+        <item name="colorAccent">#ae0f36</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7ed</item>
         <item name="table_row_light_bg">#fef6f8</item>
     </style>
 
     <style name="AppTheme.NoActionBar.350" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ec2244</item>
-        <item name="colorPrimaryTransparent">#00ec2244</item>
-        <item name="colorAccent">#b9102c</item>
+        <item name="colorPrimary">#d81233</item>
+        <item name="colorPrimaryTransparent">#00d81233</item>
+        <item name="colorAccent">#ad0e29</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7eb</item>
         <item name="table_row_light_bg">#fef6f7</item>
     </style>
 
     <style name="AppTheme.NoActionBar.355" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">#ec1d2e</item>
-        <item name="colorPrimaryTransparent">#00ec1d2e</item>
-        <item name="colorAccent">#b50f1d</item>
+        <item name="colorPrimary">#d61222</item>
+        <item name="colorPrimaryTransparent">#00d61222</item>
+        <item name="colorAccent">#ab0e1b</item>
         <item name="drawer_background">#ffffffff</item>
         <item name="table_row_dark_bg">#fde7e9</item>
         <item name="table_row_light_bg">#fef6f6</item>

diff --git a/tools/gen-styles b/tools/gen-styles
index 0012d5d52921b190123fa36ae409d7a7ec782e27..9191e18af29e5244b2f9ead7a654210daa964ab4 100644 (file)
--- a/tools/gen-styles
+++ b/tools/gen-styles
@@ -178,19 +178,26 @@ sub hslStyleForHue {
        my $base = shift;
        my $baseIndent = shift // '';
 
-       my $blueL = 0.665;
-       my $yellowL = 0.350;
-
-       my $blueL2 = 0.350;
-       my $yellowL2 = 0.500;
-
-       # $y == 0 for yellow
-       my $y = $hue - 60;
-       $y += 360 if $y < 0;
-       # $q == 0 for yellow, 1 for blue
-       my $q = cos(deg2rad(abs($y-180)/2.0));
-       my $l1 = $yellowL + ($blueL - $yellowL) * $q;
-       my $l2 = 0.250 + 0.250 * $q;
+       my %lQ = (
+               0   => 0.450,   # red
+               60  => 0.400,   # yellow
+               120 => 0.400,   # green
+               180 => 0.400,   # cyan
+               240 => 0.750,   # blue
+               300 => 0.500,   # magenta
+       );
+       $lQ{360} = $lQ{0};
+
+       my ($x0, $x1, $y0, $y1);
+       $x0 = (int( $hue / 60 ) * 60) % 360;
+       $x1 = $x0 + 60;
+       $y0 = $lQ{$x0};
+       $y1 = $lQ{$x1};
+
+       # linear interpolation
+       my $l1 = $y0 + 1.0 * ( $hue - $x0 ) * ( $y1 - $y0 ) / ( $x1 - $x0 );
+
+       my $l2 = $l1 * 0.80;
        my $l3 = 0.950;
        my $l4 = 0.980;