Fix color of main top panel using dynamic colors

It used a fixed color of the static theme, replaced by the tertiary color of the dynamic color theme.
meikpiep · Jan 23, 2024 · 4efb20e · 4efb20e
1 parent 8058335
commit 4efb20e
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Avoid static color at main top frame when using dynamic colors.
+
 ### Security
 
 ## [0.19.0] - 2024-01-21

diff --git a/gauguin-app/src/main/res/layout/fragment_game_difficulty_level.xml b/gauguin-app/src/main/res/layout/fragment_game_difficulty_level.xml
@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/veryEasy"
         app:layout_constraintBottom_toBottomOf="@+id/veryEasy"
-        android:backgroundTint="@color/mainTopPanelBackground"
+        android:backgroundTint="?colorMainTopPanelBackground"
         style="@style/Widget.Material3.CardView.Outlined"
         />
 
@@ -27,7 +27,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:text="@string/difficulty_no_difficulty_calculated_for_game_variant"
-        android:textColor="@color/mainTopPanelForeground"
+        android:textColor="?colorMainTopPanelForeground"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"

diff --git a/gauguin-app/src/main/res/layout/fragment_main_game_top.xml b/gauguin-app/src/main/res/layout/fragment_main_game_top.xml
@@ -13,8 +13,8 @@
         android:layout_height="match_parent"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="@color/mainTopPanelBackground"
-        android:foregroundTint="@color/mainTopPanelForeground">
+        android:backgroundTint="?colorMainTopPanelBackground"
+        android:foregroundTint="?colorMainTopPanelForeground">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/gauguin_g_title"
-                app:tint="@color/mainTopPanelForeground"
+                app:tint="?colorMainTopPanelForeground"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/app_name"
-                android:textColor="@color/mainTopPanelForeground"
+                android:textColor="?colorMainTopPanelForeground"
                 android:textStyle="bold"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
@@ -60,7 +60,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 app:srcCompat="@drawable/outline_star_20"
-                app:tint="@color/mainTopPanelForeground"
+                app:tint="?colorMainTopPanelForeground"
                 app:layout_constraintStart_toEndOf="@id/appname"
                 app:layout_constraintEnd_toStartOf="@id/ratingStarOne"
                 app:layout_constraintTop_toTopOf="parent"
@@ -72,7 +72,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 app:srcCompat="@drawable/outline_star_20"
-                app:tint="@color/mainTopPanelForeground"
+                app:tint="?colorMainTopPanelForeground"
                 app:layout_constraintStart_toEndOf="@id/ratingStarOne"
                 app:layout_constraintEnd_toStartOf="@id/ratingStarThree"
                 app:layout_constraintTop_toTopOf="parent"
@@ -84,7 +84,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 app:srcCompat="@drawable/outline_star_20"
-                app:tint="@color/mainTopPanelForeground"
+                app:tint="?colorMainTopPanelForeground"
                 app:layout_constraintStart_toEndOf="@id/ratingStarTwo"
                 app:layout_constraintEnd_toStartOf="@id/ratingStarFour"
                 app:layout_constraintTop_toTopOf="parent"
@@ -96,7 +96,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 app:srcCompat="@drawable/outline_star_20"
-                app:tint="@color/mainTopPanelForeground"
+                app:tint="?colorMainTopPanelForeground"
                 app:layout_constraintStart_toEndOf="@id/ratingStarThree"
                 app:layout_constraintEnd_toStartOf="@id/difficulty"
                 app:layout_constraintTop_toTopOf="parent"
@@ -108,7 +108,7 @@
                 style="@style/TextAppearance.Material3.LabelLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/mainTopPanelForeground"
+                android:textColor="?colorMainTopPanelForeground"
                 android:layout_marginStart="4dp"
                 app:layout_constraintStart_toEndOf="@id/ratingStarFour"
                 app:layout_constraintTop_toTopOf="parent"
@@ -124,7 +124,7 @@
                 android:text="@string/time_zero"
                 android:layout_margin="8dp"
                 android:textAlignment="textEnd"
-                android:textColor="@color/mainTopPanelForeground"
+                android:textColor="?colorMainTopPanelForeground"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/gauguin-app/src/main/res/values-night/styles.xml b/gauguin-app/src/main/res/values-night/styles.xml
@@ -7,9 +7,6 @@
     <color name="gridCage">@color/md_theme_dark_secondary</color>
     <fraction name="gradCageOpacity">50%</fraction>
 
-    <color name="mainTopPanelForeground">@color/md_theme_dark_onTertiaryContainer</color>
-    <color name="mainTopPanelBackground">@color/md_theme_dark_tertiaryContainer</color>
-
     <style name="KeypadRegularButton" parent="Widget.Material3.Button">
         <item name="android:layout_width">64dp</item>
         <item name="android:layout_height">64dp</item>

diff --git a/gauguin-app/src/main/res/values-night/themes.xml b/gauguin-app/src/main/res/values-night/themes.xml
@@ -37,5 +37,7 @@
         <item name="colorOnCustomColor2Container">#ffdad8</item>
         <item name="harmonizeCustomColor2">false</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorMainTopPanelForeground">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorMainTopPanelBackground">@color/md_theme_dark_tertiaryContainer</item>
   </style>
 </resources>
diff --git a/gauguin-app/src/main/res/values-v27/themes.xml b/gauguin-app/src/main/res/values-v27/themes.xml
@@ -8,7 +8,8 @@
         <item name="android:immersive">true</item>
     </style>
 
-
     <style name="AppTheme.Overlay" parent="ThemeOverlay.Material3.DynamicColors.DayNight">
+        <item name="colorMainTopPanelForeground">?colorOnTertiary</item>
+        <item name="colorMainTopPanelBackground">?colorTertiary</item>
     </style>
 </resources>
diff --git a/gauguin-app/src/main/res/values/attrs.xml b/gauguin-app/src/main/res/values/attrs.xml
@@ -10,4 +10,6 @@
     <attr name="colorCustomColor2Container" format="color" />
     <attr name="colorOnCustomColor2Container" format="color" />
     <attr name="harmonizeCustomColor2" format="boolean" />
+    <attr name="colorMainTopPanelForeground" format="color" />
+    <attr name="colorMainTopPanelBackground" format="color" />
 </resources>
diff --git a/gauguin-app/src/main/res/values/styles.xml b/gauguin-app/src/main/res/values/styles.xml
@@ -7,9 +7,6 @@
     <color name="gridCage">#512f36</color>
     <fraction name="gradCageOpacity">70%</fraction>
 
-    <color name="mainTopPanelForeground">@color/md_theme_light_onTertiary</color>
-    <color name="mainTopPanelBackground">@color/md_theme_light_tertiary</color>
-
     <style name="LabelChipText" parent="TextAppearance.Material3.LabelMedium"/>
 
     <style name="DifficultyLevelDescriptionLabel" parent="TextAppearance.Material3.TitleMedium">

diff --git a/gauguin-app/src/main/res/values/themes.xml b/gauguin-app/src/main/res/values/themes.xml
@@ -46,5 +46,8 @@
         <item name="colorOnCustomColor2Container">#410006</item>
         <item name="harmonizeCustomColor2">false</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
-    </style>
+        <item name="colorMainTopPanelForeground">@color/md_theme_light_onTertiary</item>
+        <item name="colorMainTopPanelBackground">@color/md_theme_light_tertiary</item>
+
+  </style>
 </resources>