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

chore(merging-upstream): bunch of conflicts to solve

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/layout/sheet_pre_reply.xml
View File

@@ -25,9 +25,9 @@
android:layout_alignParentStart="true"
android:layout_marginEnd="16dp"
android:background="@drawable/white_circle"
android:backgroundTint="?colorM3SecondaryContainer"
android:backgroundTint="?colorM3PrimaryContainer"
android:scaleType="center"
android:tint="?colorM3OnSecondaryContainer"
android:tint="?colorM3OnPrimaryContainer"
tools:src="@drawable/ic_waving_hand_24px"
android:importantForAccessibility="no"/>