From 2d21e0f704ee35b3772a9b4810f85c122e6ad49c Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Fri, 10 Jul 2020 10:12:59 +0300 Subject: [PATCH] rework colours using more colour theory lightness is adjusted per colour to ensure enough contrast drop colorAccent which is not used anymore --- .../net/ktnx/mobileledger/utils/Colors.java | 12 +- app/src/main/res/values-night/styles.xml | 693 ++++++++---------- app/src/main/res/values/styles.xml | 665 ++++++++--------- 3 files changed, 613 insertions(+), 757 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 eaae5720..d13496fe 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -125,17 +125,17 @@ public class Colors { public static float baseHueLightness(int baseHueDegrees) { switch (baseHueDegrees % 360) { case 0: - return 0.450f; // red + return 0.550f; // red case 60: - return 0.400f; // yellow + return 0.250f; // yellow case 120: - return 0.400f; // green + return 0.290f; // green case 180: - return 0.400f; // cyan + return 0.300f; // cyan case 240: - return 0.750f; // blue + return 0.710f; // blue case 300: - return 0.500f; // magenta + return 0.450f; // magenta default: throw new IllegalStateException( String.format(Locale.US, "baseHueLightness called with invalid value %d", diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 7ee44ac0..1b393b60 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -16,7 +16,6 @@ --> - @@ -28,6 +27,9 @@ #ffffff #909090 #dddddd + @android:color/white + @android:color/white + @android:color/white @style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense @@ -40,731 +42,658 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2fd7ac9d..a25fb608 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,729 +39,656 @@ -- 2.39.2