From 1fbfc38d6fba56b5a6d391f6964d03cc59f94046 Mon Sep 17 00:00:00 2001
From: dece <shgck@pistache.land>
Date: Mon, 14 Feb 2022 19:15:02 +0100
Subject: [PATCH] colors: use colors more adequately

Turns out Solarized has a bunch of rules like maintaining the same
contrast between normal text on normal background with selected text on
slightly highlighted background and so on. This commit attempts to fix
issues related to that, and indeed it seems to look better!
---
 app/src/main/res/drawable/devborders.xml      |  2 +-
 .../main/res/layout/fragment_history_item.xml |  2 +-
 app/src/main/res/layout/fragment_identity.xml |  2 +-
 .../main/res/layout/gemtext_blockquote.xml    |  1 +
 .../main/res/layout/gemtext_preformatted.xml  |  2 +-
 app/src/main/res/values-night/colors.xml      | 20 +++---
 app/src/main/res/values/colors.xml            | 61 +++++++++----------
 7 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/app/src/main/res/drawable/devborders.xml b/app/src/main/res/drawable/devborders.xml
index bc9f51f..c6ce957 100644
--- a/app/src/main/res/drawable/devborders.xml
+++ b/app/src/main/res/drawable/devborders.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <stroke android:width="1dip" android:color="@color/black"/>
+    <stroke android:width="1dip" android:color="@color/main_accent"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_history_item.xml b/app/src/main/res/layout/fragment_history_item.xml
index 1746fad..4b079b0 100644
--- a/app/src/main/res/layout/fragment_history_item.xml
+++ b/app/src/main/res/layout/fragment_history_item.xml
@@ -44,7 +44,7 @@
             android:layout_alignParentEnd="true"
             android:textSize="16sp"
             android:textStyle="italic"
-            android:textColor="@color/text_light" />
+            android:textColor="@color/text" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index ef29a18..75ad0c9 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -25,7 +25,7 @@
         android:layout_marginTop="0dp"
         android:layout_marginBottom="8dp"
         android:textSize="12sp"
-        android:textColor="@color/text_light"
+        android:textColor="@color/text"
         android:fontFamily="@font/preformatted"
         android:typeface="monospace" />
 
diff --git a/app/src/main/res/layout/gemtext_blockquote.xml b/app/src/main/res/layout/gemtext_blockquote.xml
index 30fa5a8..d36bbe8 100644
--- a/app/src/main/res/layout/gemtext_blockquote.xml
+++ b/app/src/main/res/layout/gemtext_blockquote.xml
@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         style="@style/CometText"
+        android:textColor="@color/text_light"
         android:background="@color/background_emph"
         android:textStyle="italic" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/gemtext_preformatted.xml b/app/src/main/res/layout/gemtext_preformatted.xml
index 8ff6f6f..d5e2ee0 100644
--- a/app/src/main/res/layout/gemtext_preformatted.xml
+++ b/app/src/main/res/layout/gemtext_preformatted.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="@color/text"
+        android:textColor="@color/text_light"
         android:fontFamily="@font/preformatted"
         android:typeface="monospace"
         android:padding="4dp"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 503995d..7106065 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="background">#002b36</color>
-    <color name="background_emph">#073642</color>
-    <color name="text_light">#93a1a1</color>
-    <color name="text">#839496</color>
-    <color name="main_accent">#d33682</color>
-    <color name="main_accent_dark">#073642</color>
-    <color name="second_accent">#2aa198</color>
-    <color name="second_accent_dark">#073642</color>
-    <color name="url_bar">#fdf6e3</color>
-    <color name="url_bar_loading">#586e75</color>
+    <color name="background">@color/base03</color>
+    <color name="background_emph">@color/base02</color>
+    <color name="text_light">@color/base1</color>
+    <color name="text">@color/base0</color>
+    <color name="main_accent">@color/magenta</color>
+    <color name="main_accent_dark">@color/base02</color>
+    <color name="second_accent">@color/cyan</color>
+    <color name="second_accent_dark">@color/base02</color>
+    <color name="url_bar">@color/base3</color>
+    <color name="url_bar_loading">@color/base01</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3d463eb..9848879 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,37 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#000000</color>
+    <color name="base03">#002b36</color>
+    <color name="base02">#073642</color>
+    <color name="base01">#586e75</color>
+    <color name="base00">#657b83</color>
+    <color name="base0">#839496</color>
+    <color name="base1">#93a1a1</color>
+    <color name="base2">#eee8d5</color>
+    <color name="base3">#fdf6e3</color>
+    <color name="yellow">#b58900</color>
+    <color name="orange">#cb4b16</color>
+    <color name="red">#dc322f</color>
+    <color name="magenta">#d33682</color>
+    <color name="violet">#6c71c4</color>
+    <color name="blue">#268bd2</color>
+    <color name="cyan">#2aa198</color>
+    <color name="green">#859900</color>
 
-    <color name="background">#fdf6e3</color>
-    <color name="background_emph">#eee8d5</color>
-    <color name="text_light">#93a1a1</color>
-    <color name="text">#657b83</color>
-    <color name="main_accent">#d33682</color>
-    <color name="main_accent_dark">#6c71c4</color>
-    <color name="second_accent">#6c71c4</color>
-    <color name="second_accent_dark">#073642</color>
-    <color name="link">#268bd2</color>
-    <color name="link_visited">#2aa198</color>
-    <color name="url_bar">#002b36</color>
-    <color name="url_bar_loading">#fdf6e3</color>
-    <!--
-    Based on Solarized - https://ethanschoonover.com/solarized/
-    SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-    base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-    base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-    base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-    base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-    base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-    base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-    base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-    base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-    yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-    orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-    red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-    magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-    violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-    blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-    cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-    green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-    -->
+    <color name="background">@color/base3</color>
+    <color name="background_emph">@color/base2</color>
+    <color name="text">@color/base00</color>
+    <color name="text_light">@color/base01</color>
+    <color name="main_accent">@color/magenta</color>
+    <color name="main_accent_dark">@color/violet</color>
+    <color name="second_accent">@color/violet</color>
+    <color name="second_accent_dark">@color/base02</color>
+    <color name="link">@color/blue</color>
+    <color name="link_visited">@color/cyan</color>
+    <color name="url_bar">@color/base3</color>
+    <color name="url_bar_loading">@color/base02</color>
 </resources>
\ No newline at end of file