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

[mobile-ledger.git] / tools / gen-styles

diff --git a/tools/gen-styles b/tools/gen-styles
index 0e894e9f3cb1028644969c80170ac79172c60c19..9191e18af29e5244b2f9ead7a654210daa964ab4 100644 (file)
--- a/tools/gen-styles
+++ b/tools/gen-styles
@@ -140,9 +140,11 @@ warn sprintf( 's%1.3f, l%1.3f -> %s',
 
 my $baseTheme = "AppTheme.NoActionBar";
 
+use constant STEP_DEGREES => 5;
+
 # # hsb
-# for( my $hue = 0; $hue < 360; $hue += 15 ) {
-#      printf "<style name=\"%s.%d\" parent=\"%s\">\n",
+# for( my $hue = 0; $hue < 360; $hue += STEP_DEGREES ) {
+#      printf "<style name=\"%s.%03d\" parent=\"%s\">\n",
 #              $baseTheme, $hue, $baseTheme;
 #      printf "  <item name=\"colorPrimary\">#%s</item>\n",
 #                      hsvHex($hue/360.0, 0.61, 0.95);
@@ -165,7 +167,7 @@ sub outputThemes {
        my $out = shift;
        my $baseIndent = shift;
        $out->print(hslStyleForHue($baseColorHue, undef, $baseIndent));
-       for( my $hue = 0; $hue < 360; $hue += 15 ) {
+       for( my $hue = 0; $hue < 360; $hue += STEP_DEGREES ) {
                $out->print("\n");
                $out->print(hslStyleForHue($hue, $baseTheme, $baseIndent));
        }
@@ -176,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;
 
@@ -196,7 +205,7 @@ sub hslStyleForHue {
        my $indent = "$baseIndent    ";
 
        if ($base) {
-               $result .= sprintf "$baseIndent<style name=\"%s.%d\" parent=\"%s\">\n",
+               $result .= sprintf "$baseIndent<style name=\"%s.%03d\" parent=\"%s\">\n",
                         $baseTheme, $hue, $baseTheme;
         }
         else {
@@ -204,7 +213,7 @@ sub hslStyleForHue {
                         $baseTheme;
                 $result .= "$indent<item name=\"windowActionBar\">false</item>\n";
                 $result .= "$indent<item name=\"windowNoTitle\">true</item>\n";
-                $result .= "$indent<item name=\"textColor\">#8a000000</item>\n";
+                $result .= "$indent<item name=\"textColor\">#757575</item>\n";
         }
         my $S = 0.845;
         $result .= sprintf "$indent<item name=\"colorPrimary\">#%s</item>\n",