From feff5deb6a6a7593eae96df627324dc63847803e Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@nojhan.net>
Date: Sat, 18 Nov 2023 10:35:06 +0100
Subject: [PATCH] fix(contrast): better color contrast

---
 dotmatrix.theme                   |  2 +-
 presets/colors-high-contrast.conf | 33 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dotmatrix.theme b/dotmatrix.theme
index f56accc..c6acfda 100644
--- a/dotmatrix.theme
+++ b/dotmatrix.theme
@@ -126,7 +126,7 @@ _lp_dotmatrix_theme_activate() {
     [[ ${#DOTMATRIX_COLOR_WARN[@]} == 0 ]] && DOTMATRIX_COLOR_WARN=(196 220 1 0   0  11)
 
     DOTMATRIX_COLOR_FAIR=( ${DOTMATRIX_COLOR_FAIR[@]+"${DOTMATRIX_COLOR_FAIR[@]}"} )
-    [[ ${#DOTMATRIX_COLOR_FAIR[@]} == 0 ]] && DOTMATRIX_COLOR_FAIR=(  0 244 0 0   0   8)
+    [[ ${#DOTMATRIX_COLOR_FAIR[@]} == 0 ]] && DOTMATRIX_COLOR_FAIR=(  0 239 1 0   0   8)
 
 
     DOTMATRIX_COLOR_PATH_SHORT=( ${DOTMATRIX_COLOR_PATH_SHORT[@]+"${DOTMATRIX_COLOR_PATH_SHORT[@]}"} )
diff --git a/presets/colors-high-contrast.conf b/presets/colors-high-contrast.conf
index ed1e4e3..b45db0e 100644
--- a/presets/colors-high-contrast.conf
+++ b/presets/colors-high-contrast.conf
@@ -1,22 +1,25 @@
 
+da=238
+li=254
+
 # Color arrays defaults: fg bg b u ffg fbg
-DOTMATRIX_COLOR_DARK=( 15  0 0 0  15   0)
-DOTMATRIX_COLOR_LITE=(  0 15 0 0   0  15)
-DOTMATRIX_COLOR_GLOW=(  0 15 1 0   0  15)
-DOTMATRIX_COLOR_NOTE=( 15  4 0 0  15   4)
-DOTMATRIX_COLOR_WARN=(  9 11 1 0   9  11)
-DOTMATRIX_COLOR_FAIR=(  0  8 0 0   0   8)
+DOTMATRIX_COLOR_DARK=( $li $da 0 0  15   0)
+DOTMATRIX_COLOR_LITE=( $da $li 0 0   0  15)
+DOTMATRIX_COLOR_GLOW=(   0 $li 0 0   0  15)
+DOTMATRIX_COLOR_NOTE=(   0  27 1 1  15   4)
+DOTMATRIX_COLOR_WARN=(  88 220 1 1   9  11)
+DOTMATRIX_COLOR_FAIR=(   0 $li 1 0   0   8)
 
-DOTMATRIX_COLOR_PATH_SHORT=( 15 0 0 0   0  15)
-DOTMATRIX_COLOR_PATH_VCS=(   15 0 0 1   0  15)
-DOTMATRIX_COLOR_PATH_LAST=(  15 0 1 0   0  15)
+DOTMATRIX_COLOR_PATH_SHORT=( 15 $da 0 0   0  15)
+DOTMATRIX_COLOR_PATH_VCS=(   15 $da 0 1   0  15)
+DOTMATRIX_COLOR_PATH_LAST=(  15 $da 1 0   0  15)
 
-DOTMATRIX_COLOR_LINE=(15 -1 0 0 15 -1)
-DOTMATRIX_COLOR_LINE_START=(15 -1 1 0 15 -1)
-DOTMATRIX_COLOR_LINE_END=(  0 -1 1 0 15 -1)
+DOTMATRIX_COLOR_LINE=(247 -1 0 0 7 -1)
+DOTMATRIX_COLOR_LINE_START=(247 -1 1 0 7 -1)
+DOTMATRIX_COLOR_LINE_END=(  247 -1 1 0 7 -1)
 
 DOTMATRIX_COLOR_MARK=(15 -1 0 0 15 -1)
-DOTMATRIX_COLOR_SEP_DARK=( 15 -2 0 0 15 -2)
-DOTMATRIX_COLOR_SEP_FAIR=(  8 -2 0 0  0 -2)
-DOTMATRIX_COLOR_SEP_LITE=( 15 -2 0 0 15 -2)
+DOTMATRIX_COLOR_SEP_DARK=(  15 -2 0 0 15 -2)
+DOTMATRIX_COLOR_SEP_FAIR=(   0 -2 0 0  0 -2)
+DOTMATRIX_COLOR_SEP_LITE=(   0 -2 0 0 15 -2)