fix header username displacement

This commit is contained in:
sk 2023-04-13 21:42:43 +02:00
parent 6ec43a6f86
commit 2385d102ae
1 changed files with 10 additions and 6 deletions

View File

@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="13dp"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:paddingStart="16dp"> android:paddingStart="16dp">
@ -11,6 +10,7 @@
android:id="@+id/more" android:id="@+id/more"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:background="?android:actionBarItemBackground" android:background="?android:actionBarItemBackground"
@ -23,6 +23,7 @@
android:id="@+id/delete_notification" android:id="@+id/delete_notification"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/more" android:layout_toStartOf="@id/more"
android:visibility="gone" android:visibility="gone"
android:background="?android:actionBarItemBackground" android:background="?android:actionBarItemBackground"
@ -36,6 +37,7 @@
android:id="@+id/visibility" android:id="@+id/visibility"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/delete_notification" android:layout_toStartOf="@id/delete_notification"
android:background="?android:actionBarItemBackground" android:background="?android:actionBarItemBackground"
android:scaleType="center" android:scaleType="center"
@ -46,6 +48,7 @@
android:id="@+id/collapse_btn" android:id="@+id/collapse_btn"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/visibility" android:layout_toStartOf="@id/visibility"
android:background="?android:actionBarItemBackground" android:background="?android:actionBarItemBackground"
android:visibility="gone" android:visibility="gone"
@ -70,6 +73,7 @@
android:id="@+id/unread_indicator" android:id="@+id/unread_indicator"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/collapse_btn" android:layout_toStartOf="@id/collapse_btn"
android:visibility="gone" android:visibility="gone"
android:tint="?android:colorAccent" android:tint="?android:colorAccent"
@ -83,18 +87,16 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:layout_marginTop="3dp" /> android:layout_marginTop="16dp" />
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout <org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:id="@+id/name_wrap" android:id="@+id/name_wrap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginTop="3dp"
android:paddingTop="3sp"
android:layout_toStartOf="@id/unread_indicator" android:layout_toStartOf="@id/unread_indicator"
android:layout_toEndOf="@id/avatar" android:layout_toEndOf="@id/avatar"
android:minHeight="24sp"> android:layout_above="@+id/username_wrap">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@ -121,13 +123,15 @@
</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout> </org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout <org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:id="@id/username_wrap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/name_wrap"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_toStartOf="@id/unread_indicator" android:layout_toStartOf="@id/unread_indicator"
android:layout_toEndOf="@id/avatar" android:layout_toEndOf="@id/avatar"
android:layout_alignBottom="@id/avatar"
android:layoutDirection="locale" android:layoutDirection="locale"
android:paddingBottom="3sp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView