From 884a2fc2119e62fa39e8ece8aac0d1a70e2e9d4f Mon Sep 17 00:00:00 2001
From: Lakoja <github@aquilian.de>
Date: Fri, 4 Aug 2023 09:51:27 +0200
Subject: [PATCH 1/3] 3477: (related) Only use color references in theme color
 files

---
 app/src/main/res/values-night/theme_colors.xml | 5 ++---
 app/src/main/res/values/colors.xml             | 4 +++-
 app/src/main/res/values/theme_colors.xml       | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index e47febfcb..60d6c0c5e 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <color name="colorSurface">@color/tusky_grey_30</color>
     <color name="colorPrimaryDark">@color/tusky_grey_25</color>
 
@@ -31,6 +30,6 @@
     <color name="toolbar_icon_background">#CC444B5D</color>
 
     <!-- colors used to show inserted/deleted text -->
-    <color name="view_edits_background_insert">#00731B</color>
-    <color name="view_edits_background_delete">#DF0000</color>
+    <color name="view_edits_background_insert">@color/tusky_green</color>
+    <color name="view_edits_background_delete">@color/tusky_red</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 79a16f803..569aac893 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,9 +4,11 @@
     <color name="tusky_blue_light">#56a7e1</color>
     <color name="tusky_orange">#ca8f04</color>
     <color name="tusky_orange_light">#fab207</color>
-    <color name="tusky_green">#19a341</color>
+    <color name="tusky_green">#00731B</color>
     <color name="tusky_green_light">#25d069</color>
+    <color name="tusky_green_lighter">#CCFFD8</color>
     <color name="tusky_red">#DF1553</color>
+    <color name="tusky_red_lighter">#FFC0C0</color>
 
     <color name="white">#fff</color>
     <color name="black">#000</color>
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index a309873fb..de8d50054 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <color name="colorSurface">@color/tusky_grey_95</color>
     <color name="colorPrimaryDark">@color/tusky_grey_70</color>
 
@@ -31,6 +30,6 @@
     <color name="toolbar_icon_background">#CCEBEFF4</color>
 
     <!-- colors used to show inserted/deleted text -->
-    <color name="view_edits_background_insert">#CCFFD8</color>
-    <color name="view_edits_background_delete">#FFC0C0</color>
+    <color name="view_edits_background_insert">@color/tusky_green_lighter</color>
+    <color name="view_edits_background_delete">@color/tusky_red_lighter</color>
 </resources>

From fdca12d85a415f4029fdc271c9841d03bc524955 Mon Sep 17 00:00:00 2001
From: Lakoja <github@aquilian.de>
Date: Fri, 4 Aug 2023 10:31:33 +0200
Subject: [PATCH 2/3] 3477: (related) Group theme blocks

---
 app/src/main/res/values/styles.xml | 35 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5115cb15d..b74c3ba97 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -91,6 +91,23 @@
         <item name="preferenceTheme">@style/TuskyPreferenceTheme</item>
     </style>
 
+    <style name="TuskyBlackThemeBase" parent="TuskyBaseTheme">
+        <item name="colorPrimaryDark">@color/tusky_grey_05</item>
+
+        <item name="android:colorBackground">@color/black</item>
+        <item name="windowBackgroundColor">@color/black</item>
+
+        <item name="colorSurface">@color/tusky_grey_10</item>
+
+        <item name="iconColor">@color/tusky_grey_40</item>
+        <item name="colorBackgroundHighlight">@color/tusky_grey_40</item>
+        <item name="colorBackgroundAccent">@color/tusky_grey_20</item>
+
+        <item name="dividerColor">@color/tusky_grey_20</item>
+    </style>
+
+    <style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />
+
     <style name="ViewMediaActivity.AppBarLayout" parent="ThemeOverlay.AppCompat">
         <item name="android:colorControlNormal">@color/white</item>
     </style>
@@ -144,24 +161,6 @@
         <item name="android:textColorHint">?android:attr/textColorTertiary</item>
     </style>
 
-    <!--Black Application Theme Styles-->
-    <style name="TuskyBlackThemeBase" parent="TuskyBaseTheme">
-        <item name="colorPrimaryDark">@color/tusky_grey_05</item>
-
-        <item name="android:colorBackground">@color/black</item>
-        <item name="windowBackgroundColor">@color/black</item>
-
-        <item name="colorSurface">@color/tusky_grey_10</item>
-
-        <item name="iconColor">@color/tusky_grey_40</item>
-        <item name="colorBackgroundHighlight">@color/tusky_grey_40</item>
-        <item name="colorBackgroundAccent">@color/tusky_grey_20</item>
-
-        <item name="dividerColor">@color/tusky_grey_20</item>
-    </style>
-
-    <style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />
-
     <style name="TuskyDrawerStyle" parent ="Widget.MaterialDrawerStyle">
         <item name="materialDrawerBackground">?android:colorBackground</item>
         <item name="materialDrawerPrimaryIcon">?iconColor</item>

From c4573caea22a7b49857522a728fcc65a16d18a06 Mon Sep 17 00:00:00 2001
From: Lakoja <github@aquilian.de>
Date: Fri, 4 Aug 2023 15:18:58 +0200
Subject: [PATCH 3/3] 3477: Make background darker in dark theme and highlight
 colors darker in light theme

---
 app/src/main/res/values-night/theme_colors.xml | 2 ++
 app/src/main/res/values/colors.xml             | 2 ++
 app/src/main/res/values/styles.xml             | 4 ++--
 app/src/main/res/values/theme_colors.xml       | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index 60d6c0c5e..23d4c8343 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorPrimary">@color/tusky_blue</color>
+    <color name="colorSecondary">@color/tusky_blue</color>
     <color name="colorSurface">@color/tusky_grey_30</color>
     <color name="colorPrimaryDark">@color/tusky_grey_25</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 569aac893..7d31b9a13 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="tusky_blue">#2b90d9</color>
+    <color name="tusky_blue_darker">#217aba</color>
     <color name="tusky_blue_light">#56a7e1</color>
     <color name="tusky_orange">#ca8f04</color>
     <color name="tusky_orange_light">#fab207</color>
@@ -18,6 +19,7 @@
     <!-- the number roughly corresponds to the % lightness of the grey -->
     <color name="tusky_grey_05">#070b14</color>
     <color name="tusky_grey_10">#16191f</color>
+    <color name="tusky_grey_15">#21222c</color>
     <color name="tusky_grey_20">#282c37</color>
     <color name="tusky_grey_25">#313543</color>
     <color name="tusky_grey_30">#444b5d</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b74c3ba97..a5caeeab8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,10 +48,10 @@
         <item name="status_text_medium">16sp</item>
         <item name="status_text_large">18sp</item>
 
-        <item name="colorPrimary">@color/tusky_blue</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorOnPrimary">@color/white</item>
 
-        <item name="colorSecondary">@color/tusky_blue</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorOnSecondary">@color/white</item>
 
         <item name="colorSurface">@color/colorSurface</item>
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index de8d50054..417e52448 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorPrimary">@color/tusky_blue_darker</color>
+    <color name="colorSecondary">@color/tusky_blue_darker</color>
     <color name="colorSurface">@color/tusky_grey_95</color>
     <color name="colorPrimaryDark">@color/tusky_grey_70</color>