From 9873e9ede5385e258203e0a514de129dec102220 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 3 Feb 2023 16:24:30 +0100
Subject: [PATCH] fix text scaling height and margin issues

---
 .../account_list/BaseAccountListFragment.java         |  3 ++-
 mastodon/src/main/res/layout/display_item_header.xml  |  3 ++-
 mastodon/src/main/res/layout/item_account_list.xml    | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
index aea419590..c70e83129 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -129,7 +129,8 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 		super.onViewCreated(view, savedInstanceState);
 //		list.setPadding(0, V.dp(16), 0, V.dp(16));
 		list.setClipToPadding(false);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 72, 16));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1,
+				Math.round(16f + 56f * getResources().getConfiguration().fontScale), 16));
 		updateToolbar();
 	}
 
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 658b8bdaa..0628c4c4f 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -65,7 +65,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="8dp"
-		android:layout_marginTop="7dp"
+		android:layout_marginTop="5dp"
+		android:paddingTop="4sp"
 		android:layout_toStartOf="@id/unread_indicator"
 		android:layout_toEndOf="@id/avatar"
 		android:minHeight="24sp">
diff --git a/mastodon/src/main/res/layout/item_account_list.xml b/mastodon/src/main/res/layout/item_account_list.xml
index f8a0fc18a..0c929bf7d 100644
--- a/mastodon/src/main/res/layout/item_account_list.xml
+++ b/mastodon/src/main/res/layout/item_account_list.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="62dp"
+	android:layout_height="wrap_content"
 	android:paddingLeft="16dp"
 	android:paddingRight="16dp"
 	android:paddingTop="8dp"
@@ -11,8 +11,8 @@
 
 	<ImageView
 		android:id="@+id/avatar"
-		android:layout_width="46dp"
-		android:layout_height="46dp"
+		android:layout_width="46sp"
+		android:layout_height="46sp"
 		android:layout_marginEnd="10dp"
 		android:importantForAccessibility="no"
 		tools:src="#0f0"/>
@@ -29,9 +29,10 @@
 	<TextView
 		android:id="@+id/name"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
+		android:layout_height="24sp"
 		android:layout_toEndOf="@id/avatar"
 		android:layout_toStartOf="@id/button"
+		android:layout_marginTop="2sp"
 		android:singleLine="true"
 		android:ellipsize="end"
 		android:gravity="center_vertical"
@@ -41,7 +42,7 @@
 	<TextView
 		android:id="@+id/username"
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
+		android:layout_height="20sp"
 		android:layout_below="@id/name"
 		android:layout_toEndOf="@id/avatar"
 		android:layout_toStartOf="@id/button"