From 07fa99b4586402fc2054a4ab532aa1810a456f46 Mon Sep 17 00:00:00 2001
From: Tak! <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 8 Dec 2023 13:04:25 +0100
Subject: [PATCH 1/4] Move the statistics bar in the detailed view below the
 button bar

---
 app/src/main/res/layout/item_status_detailed.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index b9f64bd3b9..4dab2dd405 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -295,7 +295,7 @@
         android:importantForAccessibility="no"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@id/status_meta_info" />
+        app:layout_constraintTop_toBottomOf="@id/status_reply" />
 
     <TextView
         android:id="@+id/status_reblogs"
@@ -345,7 +345,7 @@
         android:importantForAccessibility="no"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@id/status_counters_barrier" />
+        app:layout_constraintTop_toBottomOf="@id/status_meta_info" />
 
     <ImageButton
         android:id="@+id/status_reply"
@@ -355,7 +355,6 @@
         android:contentDescription="@string/action_reply"
         android:importantForAccessibility="no"
         android:padding="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/status_inset"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"

From f05ecc3cf7ddf6e3c5db2952549294573c42d400 Mon Sep 17 00:00:00 2001
From: Tak! <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 5 Jan 2024 11:30:31 +0100
Subject: [PATCH 2/4] Move elements in xml to correspond with their movement in
 the layout

---
 .../main/res/layout/item_status_detailed.xml  | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 4dab2dd405..fa56f789e2 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -283,50 +283,6 @@
         app:layout_constraintTop_toBottomOf="@id/status_poll_description"
         tools:text="21 Dec 2018 18:45" />
 
-    <View
-        android:id="@+id/status_info_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/status_meta_info"
-        android:layout_marginStart="14dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="14dp"
-        android:background="?android:attr/listDivider"
-        android:importantForAccessibility="no"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@id/status_reply" />
-
-    <TextView
-        android:id="@+id/status_reblogs"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:background="?attr/selectableItemBackground"
-        android:importantForAccessibility="no"
-        android:padding="4dp"
-        android:textSize="?attr/status_text_medium"
-        app:layout_constraintStart_toStartOf="@id/status_info_divider"
-        app:layout_constraintTop_toBottomOf="@id/status_info_divider"
-        tools:text="4 reblogs"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/status_favourites"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="6dp"
-        android:background="?attr/selectableItemBackground"
-        android:importantForAccessibility="no"
-        android:padding="4dp"
-        android:textSize="?attr/status_text_medium"
-        app:layout_constraintStart_toEndOf="@id/status_reblogs"
-        app:layout_constraintTop_toBottomOf="@id/status_info_divider"
-        app:layout_goneMarginStart="0dp"
-        tools:text="8 favs"
-        tools:visibility="visible" />
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/status_counters_barrier"
         android:layout_width="wrap_content"
@@ -426,4 +382,48 @@
         app:layout_constraintTop_toTopOf="@id/status_reply"
         app:srcCompat="@drawable/ic_more_horiz_24dp" />
 
+    <View
+        android:id="@+id/status_info_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_below="@id/status_meta_info"
+        android:layout_marginStart="14dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="14dp"
+        android:background="?android:attr/listDivider"
+        android:importantForAccessibility="no"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/status_reply" />
+
+    <TextView
+        android:id="@+id/status_reblogs"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:background="?attr/selectableItemBackground"
+        android:importantForAccessibility="no"
+        android:padding="4dp"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintStart_toStartOf="@id/status_info_divider"
+        app:layout_constraintTop_toBottomOf="@id/status_info_divider"
+        tools:text="4 reblogs"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/status_favourites"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="6dp"
+        android:background="?attr/selectableItemBackground"
+        android:importantForAccessibility="no"
+        android:padding="4dp"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintStart_toEndOf="@id/status_reblogs"
+        app:layout_constraintTop_toBottomOf="@id/status_info_divider"
+        app:layout_goneMarginStart="0dp"
+        tools:text="8 favs"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From c01dbc23e616142b8d2035b59339d315f3febf6c Mon Sep 17 00:00:00 2001
From: Tak! <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 5 Jan 2024 11:31:04 +0100
Subject: [PATCH 3/4] Fix margins for interaction button bar

---
 app/src/main/res/layout/item_status_detailed.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index fa56f789e2..32231eb012 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -388,7 +388,6 @@
         android:layout_height="1dp"
         android:layout_below="@id/status_meta_info"
         android:layout_marginStart="14dp"
-        android:layout_marginTop="6dp"
         android:layout_marginEnd="14dp"
         android:background="?android:attr/listDivider"
         android:importantForAccessibility="no"

From c68e943d5e71e3f6407eb283540298d23edc6e45 Mon Sep 17 00:00:00 2001
From: Tak! <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Tue, 20 Feb 2024 09:21:48 +0100
Subject: [PATCH 4/4] Adjust label margins

---
 app/src/main/res/layout/item_status_detailed.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 32231eb012..e0461a0fe9 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -399,7 +399,6 @@
         android:id="@+id/status_reblogs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
         android:background="?attr/selectableItemBackground"
         android:importantForAccessibility="no"
         android:padding="4dp"
@@ -414,7 +413,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="6dp"
         android:background="?attr/selectableItemBackground"
         android:importantForAccessibility="no"
         android:padding="4dp"