From fcd4d525115fd8554d7e837b8382e16009cd7071 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

---
 .../java/com/beemdevelopment/aegis/helpers/ThemeHelper.java  | 3 +++
 app/src/main/res/values/themes.xml                           | 5 +++++
 2 files changed, 8 insertions(+)

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 082e0052f6..0bd1dcfc0e 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 void setTheme(Map<Theme, Integer> themeMap) {
             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/values/themes.xml b/app/src/main/res/values/themes.xml
index f6529d4c81..a1f8fbb053 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -159,9 +159,14 @@
         <item name="colorCode">@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>