From c0e43c677dad17daed32e4f6d188c2686d62702c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Tue, 12 Nov 2024 00:10:33 +0100
Subject: [PATCH] Fix progress bar colors when using dynamic

---
 app/src/main/res/drawable/progress_horizontal.xml | 2 +-
 app/src/main/res/values/attrs.xml                 | 1 +
 app/src/main/res/values/themes.xml                | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/drawable/progress_horizontal.xml b/app/src/main/res/drawable/progress_horizontal.xml
index 676fb8637a..f6b6276630 100644
--- a/app/src/main/res/drawable/progress_horizontal.xml
+++ b/app/src/main/res/drawable/progress_horizontal.xml
@@ -2,7 +2,7 @@
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape>
-                <solid android:color="?attr/colorPrimaryAlternative"/>
+                <solid android:color="?attr/colorProgressbar"/>
                 <corners
                     android:topLeftRadius="0dp"
                     android:topRightRadius="2dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f9127dd426..0c24c596bb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,7 @@
     <attr name="dropdownStyle" format="reference" />
     <attr name="colorFavorite" format="color" />
     <attr name="colorPrimaryAlternative" format="color" />
+    <attr name="colorProgressbar" format="color" />
     <attr name="colorOnDark" />
     <attr name="colorSuccess" />
     <attr name="colorOnSurfaceDim" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a1f8fbb053..45758a4866 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -57,6 +57,7 @@
         <!-- Custom colors -->
         <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
         <item name="colorPrimaryAlternative">?attr/colorPrimary</item>
+        <item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
         <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>
@@ -126,6 +127,7 @@
         <!-- Custom colors -->
         <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
         <item name="colorPrimaryAlternative">?attr/colorPrimaryInverse</item>
+        <item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
         <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>
@@ -157,16 +159,16 @@
         <item name="colorSurfaceDim">#000000</item>
         <item name="colorSurfaceBright">#000000</item>
         <item name="colorCode">@android:color/white</item>
+
+        <item name="colorProgressbar">@android:color/white</item>
     </style>
 
     <style name="ThemeOverlay.Aegis.Dynamic.Dark" parent="ThemeOverlay.Material3.DynamicColors.Dark">
-        <item name="colorPrimaryAlternative">?attr/colorPrimary</item>
     </style>
 
     <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
         <!-- Setting android:colorBackground to #000000 on API 28 and below causes smearing -->
         <item name="android:colorBackground">@android:color/black</item>
-        <item name="colorPrimaryAlternative">@android:color/white</item>
         <item name="colorSurface">#000000</item>
         <item name="colorSurfaceVariant">#000000</item>
         <item name="colorSurfaceContainerHighest">#000000</item>
@@ -177,6 +179,8 @@
         <item name="colorSurfaceDim">#000000</item>
         <item name="colorSurfaceBright">#000000</item>
         <item name="colorCode">@android:color/white</item>
+
+        <item name="colorProgressbar">@android:color/white</item>
     </style>
 
     <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">