Merge pull request #1319 from alexbakker/amoled-code-color

Make the code color white for AMOLED

Author: michaelschattgen

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"

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"

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"

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"/>

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" />

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">