luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-20 22:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply dark background colors when combining AMOLED and dynamic colors

Browse source 
Previously, the dark background colors would not be applied for this
combination of settings.

Unfortunately, I couldn't find a way to avoid some duplication in
themes.xml.
This commit is contained in:
Alexander Bakker 2024-03-13 23:18:18 +01:00
parent cffe15735c
commit 8995626d16
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
View file

@ -26,6 +26,7 @@ import com.beemdevelopment.aegis.icons.IconPackManager;
import com.beemdevelopment.aegis.vault.VaultManager;
import com.beemdevelopment.aegis.vault.VaultRepositoryException;
import com.google.android.material.color.DynamicColors;
import com.google.android.material.color.DynamicColorsOptions;
import com.google.android.material.color.MaterialColors;
import java.lang.reflect.Field;
@ -122,7 +123,11 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
setTheme(theme);
if (_prefs.isDynamicColorsEnabled()) {
DynamicColors.applyToActivityIfAvailable(this);
DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
if (getConfiguredTheme().equals(Theme.AMOLED)) {
optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Amoled);
}
DynamicColors.applyToActivityIfAvailable(this, optsBuilder.build());
}
}

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

@ -148,6 +148,19 @@
<item name="colorSurfaceBright">#000000</item>
</style>
<style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
<item name="android:colorBackground">#000000</item>
<item name="colorSurface">#000000</item>
<item name="colorSurfaceVariant">#000000</item>
<item name="colorSurfaceContainerHighest">#000000</item>
<item name="colorSurfaceContainerHigh">#000000</item>
<item name="colorSurfaceContainer">#000000</item>
<item name="colorSurfaceContainerLow">#000000</item>
<item name="colorSurfaceContainerLowest">#000000</item>
<item name="colorSurfaceDim">#000000</item>
<item name="colorSurfaceBright">#000000</item>
</style>
<style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">
</style>
<style name="Theme.Aegis.Light.Fullscreen" parent="Theme.Aegis.Light">