luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-25 19:29:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix progress bar colors when using dynamic

Browse source
This commit is contained in:
Michael Schättgen 2024-09-18 22:02:12 +02:00 • committed by Alexander Bakker
parent 17f106f70d
commit eb7b8881a0
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
View file

@ -33,7 +33,10 @@ public class ThemeHelper {
DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder(); DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
if (getConfiguredTheme().equals(Theme.AMOLED)) { if (getConfiguredTheme().equals(Theme.AMOLED)) {
optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_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()); DynamicColors.applyToActivityIfAvailable(_activity, optsBuilder.build());
} }
} }

2
app/src/main/res/drawable/progress_horizontal.xml
View file

@ -2,7 +2,7 @@
<item android:id="@android:id/progress"> <item android:id="@android:id/progress">
<scale android:scaleWidth="100%"> <scale android:scaleWidth="100%">
<shape> <shape>
<solid android:color="?attr/colorPrimaryAlternative"/> <solid android:color="?attr/colorProgressbar"/>
<corners <corners
android:topLeftRadius="0dp" android:topLeftRadius="0dp"
android:topRightRadius="2dp" android:topRightRadius="2dp"

1
app/src/main/res/values/attrs.xml
View file

@ -3,6 +3,7 @@
<attr name="dropdownStyle" format="reference" /> <attr name="dropdownStyle" format="reference" />
<attr name="colorFavorite" format="color" /> <attr name="colorFavorite" format="color" />
<attr name="colorPrimaryAlternative" format="color" /> <attr name="colorPrimaryAlternative" format="color" />
<attr name="colorProgressbar" format="color" />
<attr name="colorOnDark" /> <attr name="colorOnDark" />
<attr name="colorSuccess" /> <attr name="colorSuccess" />
<attr name="colorOnSurfaceDim" /> <attr name="colorOnSurfaceDim" />

8
app/src/main/res/values/themes.xml
View file

@ -57,6 +57,7 @@
<!-- Custom colors --> <!-- Custom colors -->
<item name="colorFavorite">@color/aegis_theme_all_favorite</item> <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
<item name="colorPrimaryAlternative">?attr/colorPrimary</item> <item name="colorPrimaryAlternative">?attr/colorPrimary</item>
<item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
<item name="colorOnDark">@android:color/white</item> <item name="colorOnDark">@android:color/white</item>
<item name="colorSuccess">@color/aegis_theme_light_success</item> <item name="colorSuccess">@color/aegis_theme_light_success</item>
<item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item> <item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
@ -126,6 +127,7 @@
<!-- Custom colors --> <!-- Custom colors -->
<item name="colorFavorite">@color/aegis_theme_all_favorite</item> <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
<item name="colorPrimaryAlternative">?attr/colorPrimaryInverse</item> <item name="colorPrimaryAlternative">?attr/colorPrimaryInverse</item>
<item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
<item name="colorOnDark">@android:color/white</item> <item name="colorOnDark">@android:color/white</item>
<item name="colorSuccess">@color/aegis_theme_dark_success</item> <item name="colorSuccess">@color/aegis_theme_dark_success</item>
<item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item> <item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
@ -157,6 +159,11 @@
<item name="colorSurfaceDim">#000000</item> <item name="colorSurfaceDim">#000000</item>
<item name="colorSurfaceBright">#000000</item> <item name="colorSurfaceBright">#000000</item>
<item name="colorCode">@android:color/white</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>
<style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark"> <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
@ -172,6 +179,7 @@
<item name="colorSurfaceDim">#000000</item> <item name="colorSurfaceDim">#000000</item>
<item name="colorSurfaceBright">#000000</item> <item name="colorSurfaceBright">#000000</item>
<item name="colorCode">@android:color/white</item> <item name="colorCode">@android:color/white</item>
<item name="colorProgressbar">@android:color/white</item>
</style> </style>
<style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light"> <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">