Merge branch 'master' into m3_redesign

# Conflicts:
#	mastodon/build.gradle
This commit is contained in:
Grishka
2023-04-12 19:41:39 +03:00
63 changed files with 1421 additions and 708 deletions

View File

@@ -152,6 +152,13 @@
<item name="colorSensitiveOverlay">#80000000</item>
</style>
<style name="Theme.Mastodon.Dark.SplashFragment">
<item name="colorM3Primary">#563ACC</item>
<item name="colorM3OnPrimary">#FFF</item>
<item name="colorM3Outline">#FFF</item>
<item name="colorM3OnSurface">#FFF</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack">
<item name="colorWindowBackground">#000</item>