X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=tools%2Fgen-styles;h=73e2367bd7ba9a0ad1792345a5290f77e511f313;hp=21388fe3826d57338a9f9997a82171c27626e42f;hb=3cfb098fc4ac9e6f3f3f4e7e3925ff8c7619d3ba;hpb=01f62b66cbef1915f20c8b42cab9260efac39498

diff --git a/tools/gen-styles b/tools/gen-styles
index 21388fe3..73e2367b 100644
--- a/tools/gen-styles
+++ b/tools/gen-styles
@@ -138,11 +138,13 @@ for (my $s = 0.50; $s < 0.90; $s += 0.001) {
 warn sprintf( 's%1.3f, l%1.3f -> %s',
 	@$best );
 
-my $baseTheme = "AppTheme.NoActionBar";
+my $baseTheme = "AppTheme";
+
+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);
@@ -150,7 +152,6 @@ my $baseTheme = "AppTheme.NoActionBar";
 #        		hsvHex($hue/360.0, 0.86, 0.55);
 # 	printf "  <item name=\"colorAccent\">#%s</item>\n",
 #        		hsvHex(($hue-4)/360.0, 0.72, 0.82);
-# 	printf "  <item name=\"drawer_background\">#ffffffff</item>\n";
 # 	printf "  <item name=\"table_row_dark_bg\">#28%s</item>\n",
 #        		hsvHex($hue/360.0, 0.65, 0.83);
 # 	printf "  <item name=\"table_row_light_bg\">#28%s</item>\n",
@@ -163,53 +164,69 @@ my $baseTheme = "AppTheme.NoActionBar";
 # HSL
 sub outputThemes {
 	my $out = shift;
-	$out->print(hslStyleForHue($baseColorHue));
-	for( my $hue = 0; $hue < 360; $hue += 15 ) {
-		$out->print(hslStyleForHue($hue, $baseTheme));
+	my $baseIndent = shift;
+	for( my $hue = 0; $hue < 360; $hue += STEP_DEGREES ) {
+		$out->print("\n");
+		$out->print(hslStyleForHue($hue, $baseTheme, $baseIndent));
 	}
 }
 
 sub hslStyleForHue {
 	my $hue = shift;
 	my $base = shift;
-
-	my $blueL = 0.665;
-	my $yellowL = 0.350;
-
-	my $y = $hue - 60;
-	$y += 360 if $y < 0;
-	my $q = cos(deg2rad(abs($y-180)/2.0));
-	my $l1 = $yellowL + ($blueL - $yellowL) * $q;
-	my $l2 = 0.150 + 0.350 * $q;
+	my $baseIndent = shift // '';
+
+	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;
 
 	my $result = "";
+	my $indent = "$baseIndent    ";
 
 	if ($base) {
-		$result .= sprintf "<style name=\"%s.%d\" parent=\"%s\">\n",
+		$result .= sprintf "$baseIndent<style name=\"%s.%03d\" parent=\"%s\">\n",
                         $baseTheme, $hue, $baseTheme;
         }
         else {
-                $result .= sprintf "<style name=\"%s\">\n",
+                $result .= sprintf "$baseIndent<style name=\"%s\">\n",
                         $baseTheme;
-                $result .= "  <item name=\"windowActionBar\">false</item>\n";
-                $result .= "  <item name=\"windowNoTitle\">true</item>\n";
-                $result .= "  <item name=\"textColor\">#8a000000</item>\n";
+#                $result .= "$indent<item name=\"windowActionBar\">false</item>\n";
+#                $result .= "$indent<item name=\"windowNoTitle\">true</item>\n";
+#                $result .= "$indent<item name=\"textColor\">#757575</item>\n";
         }
         my $S = 0.845;
-        $result .= sprintf "  <item name=\"colorPrimary\">#%s</item>\n",
+        $result .= sprintf "$indent<item name=\"colorPrimary\">#%s</item>\n",
                 hslHex($hue, $S, $l1);
-        $result .= sprintf "  <item name=\"colorPrimaryTransparent\">#00%s</item>\n",
+        $result .= sprintf "$indent<item name=\"colorPrimaryTransparent\">#00%s</item>\n",
                 hslHex($hue, $S, $l1);
-        $result .= sprintf "  <item name=\"colorAccent\">#%s</item>\n",
+        $result .= sprintf "$indent<item name=\"colorAccent\">#%s</item>\n",
+                hslHex($hue, $S, $l2);
+        $result .= sprintf "$indent<item name=\"colorPrimaryDark\">#%s</item>\n",
                 hslHex($hue, $S, $l2);
-        $result .= "  <item name=\"drawer_background\">#ffffffff</item>\n";
-        $result .= sprintf "  <item name=\"table_row_dark_bg\">#%s</item>\n",
+        $result .= sprintf "$indent<item name=\"table_row_dark_bg\">#%s</item>\n",
                 hslHex($hue, $S, $l3);
-        $result .= sprintf "  <item name=\"table_row_light_bg\">#%s</item>\n",
+        $result .= sprintf "$indent<item name=\"table_row_light_bg\">#%s</item>\n",
                 hslHex($hue, $S, $l4);
-        $result .= "</style>\n";
+        $result .= "$baseIndent</style>\n";
 
         return $result;
 }
@@ -221,16 +238,18 @@ if ($xml) {
 	my $end_marker = '<!-- theme list end -->';
 	my ($fh, $filename) = tempfile(basename($0).'.XXXXXXXX', DIR => dirname($xml));
 	open(my $in, '<', $xml);
+	my $base_indent = '';
 	my $state = 'waiting-for-start-marker';
 	while (<$in>) {
 		if ( $state eq 'waiting-for-start-marker' ) {
 			print $fh $_;
-			$state = 'skipping-styles' if /^\s*\Q$start_marker\E/;
+			$state = 'skipping-styles', $base_indent = $1
+                                if /^(\s*)\Q$start_marker\E/;
 			next;
 		}
 		if ( $state eq 'skipping-styles' ) {
 			next unless /^\s*\Q$end_marker\E/;
-			outputThemes($fh);
+			outputThemes($fh, $base_indent);
 			print $fh $_;
 			$state = 'copying-the-rest';
 			next;