Merge pull request #1303 from alexbakker/amoled-dynamic

Apply dark background colors when combining AMOLED and dynamic colors
This commit is contained in:
Michael Schättgen 2024-03-14 20:38:31 +01:00 committed by GitHub
commit dfd720b406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions

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());
}
}

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">