From 4c28bf2a12c0ea31779dc14a00774c40fd72e7eb Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 20 Mar 2024 21:11:03 +0100
Subject: [PATCH] Make the code color white for AMOLED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Schättgen <michael@schattgen.me>
---
 app/src/main/res/layout/card_entry.xml         | 2 +-
 app/src/main/res/layout/card_entry_compact.xml | 1 +
 app/src/main/res/layout/card_entry_small.xml   | 1 +
 app/src/main/res/layout/card_entry_tile.xml    | 1 +
 app/src/main/res/values/attrs.xml              | 1 +
 app/src/main/res/values/themes.xml             | 4 ++++
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index a0240535..734cc183 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -119,7 +119,7 @@
                 android:includeFontPadding="false"
                 android:fallbackLineSpacing="false"
                 android:textSize="34sp"
-                android:textColor="?attr/colorPrimary"
+                android:textColor="?attr/colorCode"
                 android:layout_marginStart="6dp"
                 android:layout_alignParentStart="true"
                 android:layout_marginTop="0dp"
diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml
index 54d6e8a4..f563c61e 100644
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@@ -122,6 +122,7 @@
                 android:includeFontPadding="false"
                 android:fallbackLineSpacing="false"
                 android:textSize="26sp"
+                android:textColor="?attr/colorCode"
                 android:layout_marginStart="6dp"
                 android:layout_alignParentStart="true"
                 android:layout_marginTop="0dp"
diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml
index fcca4190..94ababe0 100644
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@@ -120,6 +120,7 @@
                 android:includeFontPadding="false"
                 android:fallbackLineSpacing="false"
                 android:textSize="26sp"
+                android:textColor="?attr/colorCode"
                 android:layout_marginStart="6dp"
                 android:layout_alignParentStart="true"
                 android:layout_marginTop="0dp"
diff --git a/app/src/main/res/layout/card_entry_tile.xml b/app/src/main/res/layout/card_entry_tile.xml
index 6cf46268..d3351fbd 100644
--- a/app/src/main/res/layout/card_entry_tile.xml
+++ b/app/src/main/res/layout/card_entry_tile.xml
@@ -117,6 +117,7 @@
                 android:includeFontPadding="false"
                 android:fallbackLineSpacing="false"
                 android:textSize="26sp"
+                android:textColor="?attr/colorCode"
                 android:layout_alignParentStart="true"
                 android:layout_marginTop="10dp"
                 android:textStyle="normal|bold"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5d684842..f9127dd4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
     <attr name="colorOnDark" />
     <attr name="colorSuccess" />
     <attr name="colorOnSurfaceDim" />
+    <attr name="colorCode" />
 
     <declare-styleable name="SlideIndicator">
         <attr name="dot_radius" format="dimension" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6c1884d5..bb9f316d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -53,6 +53,7 @@
         <item name="colorOnDark">@android:color/white</item>
         <item name="colorSuccess">@color/aegis_theme_light_success</item>
         <item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
+        <item name="colorCode">?attr/colorPrimary</item>
         <!-- Intro colors -->
         <item name="dot_color">?attr/colorSurfaceVariant</item>
         <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
@@ -121,6 +122,7 @@
         <item name="colorOnDark">@android:color/white</item>
         <item name="colorSuccess">@color/aegis_theme_dark_success</item>
         <item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
+        <item name="colorCode">?attr/colorPrimary</item>
         <!-- Intro colors -->
         <item name="dot_color">?attr/colorSurfaceVariant</item>
         <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
@@ -146,6 +148,7 @@
         <item name="colorSurfaceContainerLowest">#000000</item>
         <item name="colorSurfaceDim">#000000</item>
         <item name="colorSurfaceBright">#000000</item>
+        <item name="colorCode">@android:color/white</item>
     </style>
 
     <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
@@ -159,6 +162,7 @@
         <item name="colorSurfaceContainerLowest">#000000</item>
         <item name="colorSurfaceDim">#000000</item>
         <item name="colorSurfaceBright">#000000</item>
+        <item name="colorCode">@android:color/white</item>
     </style>
 
     <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">