Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk
2023-04-13 21:46:45 +02:00
58 changed files with 1155 additions and 759 deletions

View File

@@ -198,6 +198,13 @@
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</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="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
@@ -413,6 +420,13 @@
<item name="android:paddingRight">24dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Outlined">
<item name="android:background">@drawable/bg_button_m3_outlined</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
</style>
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
<item name="android:textAppearance">@style/m3_body_large</item>