X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=tools%2Fgen-styles;h=9191e18af29e5244b2f9ead7a654210daa964ab4;hb=6680ab3aec4c8bfb5662e0d2a251f05cb026e035;hp=d158d8bf370e227e5b9894c9a39b8c02558006dd;hpb=c3d401c2ce5137fd8c3e8f4bf3b71b21dc881ccb;p=mobile-ledger.git

diff --git a/tools/gen-styles b/tools/gen-styles
index d158d8bf..9191e18a 100644
--- a/tools/gen-styles
+++ b/tools/gen-styles
@@ -140,11 +140,11 @@ warn sprintf( 's%1.3f, l%1.3f -> %s',
 
 my $baseTheme = "AppTheme.NoActionBar";
 
-use constant STEP_DEGREES => 15;
+use constant STEP_DEGREES => 5;
 
 # # hsb
 # for( my $hue = 0; $hue < 360; $hue += STEP_DEGREES ) {
-# 	printf "<style name=\"%s.%d\" parent=\"%s\">\n",
+# 	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);
@@ -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;
 
@@ -198,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 {
@@ -206,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",