From da3450cd594a3f9ad6f0a76b2b2fc219949a6695 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Tue, 16 Apr 2019 20:36:54 +0300 Subject: [PATCH] rework theme color spectrum to match the holy grail violet and get a darker yellow with readable white text also, automate theme XML update --- .../net/ktnx/mobileledger/utils/Colors.java | 31 ++- app/src/main/res/values/styles.xml | 176 ++++++++++-------- tools/gen-styles | 149 +++++++++++---- 3 files changed, 232 insertions(+), 124 deletions(-) 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 acfea2f4..8f59c1cf 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -33,6 +33,8 @@ import static java.lang.Math.abs; public class Colors { public static final int DEFAULT_HUE_DEG = 261; + private static final float blueLightness = 0.665f; + private static final float yellowLightness = 0.350f; public static @ColorInt int accent; @ColorInt @@ -42,7 +44,6 @@ public class Colors { @ColorInt public static int primary, defaultTextColor; public static int profileThemeId = -1; - public static ObservableValue themeWatch = new ObservableValue<>(0); public static void refreshColors(Resources.Theme theme) { TypedValue tv = new TypedValue(); @@ -75,8 +76,8 @@ public class Colors { return 0xff000000 | hsvTriplet(hue, saturation, value); } public static @ColorInt - int hslColor(float hue, float saturation, float lightness) { - return 0xff000000 | hslTriplet(hue, saturation, lightness); + int hslColor(float hueRatio, float saturation, float lightness) { + return 0xff000000 | hslTriplet(hueRatio, saturation, lightness); } public static @ColorInt int hsvTriplet(float hue, float saturation, float value) { @@ -115,9 +116,9 @@ public class Colors { } } public static @ColorInt - int hslTriplet(float hue, float saturation, float lightness) { + int hslTriplet(float hueRatio, float saturation, float lightness) { @ColorLong long result; - float h = hue * 6; + float h = hueRatio * 6; float c = (1 - abs(2f * lightness - 1)) * saturation; float h_mod_2 = h % 2; float x = c * (1 - Math.abs(h_mod_2 - 1)); @@ -133,7 +134,7 @@ public class Colors { throw new IllegalArgumentException(String.format( "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb", - h, hue, saturation, lightness)); + h, hueRatio, saturation, lightness)); } public static @ColorInt @@ -144,16 +145,14 @@ public class Colors { return (r_int << 16) | (g_int << 8) | b_int; } public static @ColorInt - int getPrimaryColorForHue(int degrees) { - // 0/360f becomes -0.000something for some reason - if (degrees == 0) return getPrimaryColorForHue(0f); - return getPrimaryColorForHue(degrees / 360f); - } - public static @ColorInt - int getPrimaryColorForHue(float hue) { -// int result = hsvColor(hue, 0.61f, 0.95f); - int result = hslColor(hue, 0.60f, 0.60f); - Log.d("colors", String.format("getPrimaryColorForHue(%1.2f) = %x", hue, result)); + 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); + Log.d("colors", String.format("getPrimaryColorForHue(%d) = %x", hueDegrees, result)); return result; } public static void setupTheme(Activity activity) { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6c0e377f..76dbd4db 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,202 +34,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + \n"; + + return $result; +} + +my $xml = shift; + +if ($xml) { + my $start_marker = ''; + my $end_marker = ''; + my ($fh, $filename) = tempfile(basename($0).'.XXXXXXXX', DIR => dirname($xml)); + open(my $in, '<', $xml); + 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/; + next; + } + if ( $state eq 'skipping-styles' ) { + next unless /^\s*\Q$end_marker\E/; + outputThemes($fh); + print $fh $_; + $state = 'copying-the-rest'; + next; + } + if ( $state eq 'copying-the-rest') { + print $fh $_; + next; + } + + die "Unexpected state '$state'"; } - printf " #%s\n", - hslHex($hue/360.0, 0.60, 0.60); - printf " #00%s\n", - hslHex($hue/360.0, 0.60, 0.60); - printf " #%s\n", - hslHex($hue/360.0, 0.85, 0.50); - printf " #ffffffff\n"; - printf " #%s\n", - hslHex($hue/360.0, 0.85, 0.95); - printf " #%s\n", - hslHex($hue/360.0, 0.85, 0.98); - printf "\n"; + + close($fh); + close($in); + + rename($filename, $xml); +} +else { + outputThemes(\*STDOUT); } -- 2.39.2