Merge remote-tracking branch 'megalodon_main/main'

# Conflicts: # mastodon/build.gradle
2023-10-21 09:32:19 -03:00
parent 28e816fd89 b60c1a5db3
commit 894c8cacd6
63 changed files with 298 additions and 157 deletions
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -366,6 +366,7 @@

 				<Button
 					style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+					android:background="@drawable/bg_button_m3_tonal_selector"
 					android:id="@+id/sensitive_item"
 					android:orientation="horizontal"
 					android:layout_width="wrap_content"