From db661b56cb834b33793253057a20dc390c49067a Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 13 Oct 2023 22:17:45 +0200
Subject: [PATCH] fix inconsistent styles, fix non-sp font

closes sk22#862
---
 .../src/main/res/layout/fragment_profile.xml  |  28 +++--
 .../main/res/layout/item_discover_account.xml | 110 +++++++++++-------
 2 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 86d37f3ee..67b7884e2 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -291,20 +291,18 @@
 					android:id="@+id/profile_counters"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginLeft="8dp"
-					android:layout_marginRight="8dp">
+					android:layout_marginHorizontal="4dp">
 
 					<LinearLayout
+						style="@style/Widget.Mastodon.M3.Button.Text"
 						android:id="@+id/followers_btn"
 						android:layout_width="wrap_content"
-						android:layout_height="48dp"
-						android:background="@drawable/bg_button_borderless_rounded"
+						android:layout_height="wrap_content"
+						android:minHeight="48dp"
 						android:gravity="center_horizontal"
 						android:orientation="horizontal"
-						android:paddingLeft="8dp"
-						android:paddingTop="4dp"
-						android:paddingRight="8dp"
-						android:paddingBottom="4dp">
+						android:paddingStart="12dp"
+						android:paddingEnd="12dp">
 
 						<TextView
 							android:id="@+id/followers_count"
@@ -335,6 +333,7 @@
 						android:id="@+id/profile_counters_separator"
 						android:layout_width="wrap_content"
 						android:layout_height="48dp"
+						android:layout_marginHorizontal="-4dp"
 						android:gravity="center"
 						android:text="@string/sk_separator"
 						android:textAppearance="@style/m3_label_large"
@@ -342,16 +341,15 @@
 						android:textColor="?colorM3OnSurfaceVariant" />
 
 					<LinearLayout
+						style="@style/Widget.Mastodon.M3.Button.Text"
 						android:id="@+id/following_btn"
 						android:layout_width="wrap_content"
-						android:layout_height="48dp"
-						android:background="@drawable/bg_button_borderless_rounded"
+						android:layout_height="wrap_content"
+						android:minHeight="48dp"
 						android:gravity="center_horizontal"
 						android:orientation="horizontal"
-						android:paddingLeft="8dp"
-						android:paddingTop="4dp"
-						android:paddingRight="8dp"
-						android:paddingBottom="4dp">
+						android:paddingStart="12dp"
+						android:paddingEnd="12dp">
 
 						<TextView
 							android:id="@+id/following_count"
@@ -359,11 +357,11 @@
 							android:layout_height="match_parent"
 							android:layout_marginEnd="4dp"
 							android:ellipsize="end"
+							android:textAppearance="@style/m3_label_large"
 							android:fontFamily="sans-serif-black"
 							android:gravity="center_vertical"
 							android:singleLine="true"
 							android:textColor="?colorM3OnSurfaceVariant"
-							android:textSize="14dp"
 							tools:text="123" />
 
 						<TextView
diff --git a/mastodon/src/main/res/layout/item_discover_account.xml b/mastodon/src/main/res/layout/item_discover_account.xml
index 75762cdea..7759332c2 100644
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -130,7 +130,7 @@
 			android:layout_marginBottom="16dp"
 			android:layout_marginStart="16dp"
 			android:layout_gravity="bottom"
-			android:paddingTop="4dp"
+			android:paddingTop="6dp"
 			android:gravity="center_vertical"
 			android:minHeight="44dp">
 
@@ -142,23 +142,66 @@
 				android:layout_marginEnd="8dp"
 				android:gravity="center_vertical"
 				android:orientation="horizontal">
+
 				<TextView
 					android:id="@+id/posts_count"
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="@style/m3_title_medium"
-					android:singleLine="true"
+					android:layout_height="match_parent"
+					android:layout_marginEnd="4dp"
 					android:ellipsize="end"
+					android:textAppearance="@style/m3_label_large"
+					android:fontFamily="sans-serif-black"
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textColor="?colorM3OnSurfaceVariant"
 					tools:text="123" />
+
 				<TextView
 					android:id="@+id/posts_label"
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="4sp"
-					android:textAppearance="@style/m3_body_large"
-					android:singleLine="true"
+					android:layout_height="match_parent"
 					android:ellipsize="middle"
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textAppearance="@style/m3_label_large"
+					android:textColor="?colorM3OnSurfaceVariant"
 					tools:text="posts" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/followers_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="2dp"
+				android:layout_marginEnd="8dp"
+				android:orientation="horizontal"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:id="@+id/followers_count"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_marginEnd="4dp"
+					android:ellipsize="end"
+					android:textAppearance="@style/m3_label_large"
+					android:fontFamily="sans-serif-black"
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textColor="?colorM3OnSurfaceVariant"
+					tools:text="123" />
+
+				<TextView
+					android:id="@+id/followers_label"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:ellipsize="middle"
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textAppearance="@style/m3_label_large"
+					android:textColor="?colorM3OnSurfaceVariant"
+					tools:text="followers" />
+
 			</LinearLayout>
 
 			<LinearLayout
@@ -169,50 +212,33 @@
 				android:layout_marginEnd="8dp"
 				android:orientation="horizontal"
 				android:gravity="center_vertical">
+
 				<TextView
 					android:id="@+id/following_count"
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="@style/m3_title_medium"
-					android:singleLine="true"
+					android:layout_height="match_parent"
+					android:layout_marginEnd="4dp"
 					android:ellipsize="end"
-					tools:text="123"/>
+					android:textAppearance="@style/m3_label_large"
+					android:fontFamily="sans-serif-black"
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textColor="?colorM3OnSurfaceVariant"
+					tools:text="123" />
+
 				<TextView
 					android:id="@+id/following_label"
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="4sp"
-					android:textAppearance="@style/m3_body_large"
-					android:singleLine="true"
+					android:layout_height="match_parent"
 					android:ellipsize="middle"
-					tools:text="following"/>
+					android:gravity="center_vertical"
+					android:singleLine="true"
+					android:textAppearance="@style/m3_label_large"
+					android:textColor="?colorM3OnSurfaceVariant"
+					tools:text="following" />
+
 			</LinearLayout>
 
-			<LinearLayout
-				android:id="@+id/followers_btn"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="2dp"
-				android:orientation="horizontal"
-				android:gravity="center_vertical">
-				<TextView
-					android:id="@+id/followers_count"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="@style/m3_title_medium"
-					android:singleLine="true"
-					android:ellipsize="end"
-					tools:text="123"/>
-				<TextView
-					android:id="@+id/followers_label"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="4sp"
-					android:textAppearance="@style/m3_body_large"
-					android:singleLine="true"
-					android:ellipsize="middle"
-					tools:text="followers"/>
-			</LinearLayout>
 		</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
 		<FrameLayout