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

12
mastodon/src/main/res/layout/fragment_compose.xml
View File

@@ -73,7 +73,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
@@ -81,6 +80,7 @@
android:id="@+id/self_avatar"
android:layout_width="46sp"
android:layout_height="46sp"
android:layout_marginTop="16dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" />
@@ -90,8 +90,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/self_avatar"
android:paddingTop="3sp"
android:minHeight="24sp"
android:layout_above="@+id/self_username"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
@@ -103,7 +102,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8sp"
android:layout_toEndOf="@id/self_name"
android:paddingTop="3sp"
android:layout_above="@id/self_username"
android:ellipsize="end"
android:fontFamily="sans-serif"
android:singleLine="true"
@@ -112,14 +111,15 @@
tools:text="@string/sk_local_only" />
<TextView
android:id="@+id/self_username"
android:id="@id/self_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/self_name"
android:layout_toEndOf="@id/self_avatar"
android:layout_alignBottom="@id/self_avatar"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_small"
android:paddingBottom="3sp"
tools:text="\@Gargron" />
</RelativeLayout>