diff options
author | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
commit | d6e73438115923699127ab8abb840728259e56b7 (patch) | |
tree | 9258d70188b6e93eb1546b9473170e3331ccd0c8 /app/src/main/res/layout/drawer_account.xml | |
parent | 4647167d27267caf097e89bbcb06577ff1d8a548 (diff) | |
parent | ea824daa6d81e412851544867327ac0c05c1177e (diff) |
Merge branch 'develop'
# Conflicts:
# app/build.gradle
Diffstat (limited to 'app/src/main/res/layout/drawer_account.xml')
-rw-r--r-- | app/src/main/res/layout/drawer_account.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml index 08a5370fe..bd00f5c0a 100644 --- a/app/src/main/res/layout/drawer_account.xml +++ b/app/src/main/res/layout/drawer_account.xml @@ -47,7 +47,7 @@ android:id="@+id/account_dn" android:layout_width="match_parent" android:layout_height="wrap_content" - android:maxLines="1" + android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textSize="18sp" /> @@ -55,7 +55,7 @@ android:id="@+id/account_un" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLines="1" + android:singleLine="true" android:textSize="14sp" /> </LinearLayout> @@ -64,7 +64,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:maxLines="1" + android:singleLine="true" android:textSize="16sp" android:visibility="gone" /> @@ -91,7 +91,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:maxLines="1" + android:singleLine="true" android:text="@string/toots" /> <TextView @@ -109,7 +109,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:maxLines="1" + android:singleLine="true" android:text="@string/following" /> <TextView @@ -127,7 +127,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:maxLines="1" + android:singleLine="true" android:text="@string/followers" /> <TextView @@ -153,7 +153,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:maxLines="1" + android:singleLine="true" android:text="@string/request_sent" android:textColor="?colorAccent" android:visibility="gone" /> @@ -175,8 +175,8 @@ android:scaleType="fitXY" android:visibility="gone" app:backgroundTint="?colorAccent" - app:tint="?iconColorMenu" - app:fabSize="mini" /> + app:fabSize="mini" + app:tint="?iconColorMenu" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/account_mute_notification" @@ -189,8 +189,8 @@ android:scaleType="fitXY" android:visibility="gone" app:backgroundTint="?colorAccent" - app:tint="?iconColorMenu" - app:fabSize="mini" /> + app:fabSize="mini" + app:tint="?iconColorMenu" /> </LinearLayout> </LinearLayout>
\ No newline at end of file |