From eb7b8881a054862abd870435b1e306083907d459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Wed, 18 Sep 2024 22:02:12 +0200
Subject: [PATCH] Fix progress bar colors when using dynamic

---
 .../com/beemdevelopment/aegis/helpers/ThemeHelper.java    | 3 +++
 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 ++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
index 082e0052..0bd1dcfc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
@@ -33,7 +33,10 @@ public class ThemeHelper {
             DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
             if (getConfiguredTheme().equals(Theme.AMOLED)) {
                 optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Amoled);
+            } else if (getConfiguredTheme().equals(Theme.DARK)) {
+                optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Dark);
             }
+
             DynamicColors.applyToActivityIfAvailable(_activity, optsBuilder.build());
         }
     }
diff --git a/app/src/main/res/drawable/progress_horizontal.xml b/app/src/main/res/drawable/progress_horizontal.xml
index 676fb863..f6b62766 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 f9127dd4..0c24c596 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 f6529d4c..199847b2 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,6 +159,11 @@
         <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="colorProgressbar">?attr/colorCode</item>
     </style>
 
     <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
@@ -172,6 +179,7 @@
         <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">