owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml
This commit is contained in:
LucasGGamerM
2023-04-14 14:27:42 -03:00
parent 3df62d2516 15fcb0e25d
commit 665a0176b9
63 changed files with 1181 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mastodon/src/main/res/values/styles.xml
View File

@@ -208,6 +208,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>
@@ -423,6 +430,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>