From 8dfc1ecae8d0c99ef7bb16c38d6a35c794b20351 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 16 Mar 2023 19:14:28 +0100
Subject: [PATCH] reply part before reblog part

---
 .../displayitems/ReblogOrReplyLineStatusDisplayItem.java  | 3 +++
 .../main/res/layout/display_item_reblog_or_reply_line.xml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
index 6f9766c3d..d64f49a64 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
@@ -96,6 +96,9 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 					int orientation = ((LinearLayout) itemView).getOrientation();
 					extraText.setPaddingRelative(extraText.getPaddingStart(), item.extra != null && orientation == LinearLayout.VERTICAL ? 0 : V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom());
 					separator.setVisibility(item.extra != null && orientation == LinearLayout.HORIZONTAL ? View.VISIBLE : View.GONE);
+					((LinearLayout) itemView).removeView(extraText);
+					if (orientation == LinearLayout.VERTICAL) ((LinearLayout) itemView).addView(extraText);
+					else ((LinearLayout) itemView).addView(extraText, 0);
 					return true;
 				});
 			}
diff --git a/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml b/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
index 2138522c0..b15c5ae8d 100644
--- a/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
+++ b/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
@@ -8,13 +8,13 @@
 	android:layout_marginBottom="-12dp">
 
 	<TextView
-		android:id="@+id/text"
+		android:id="@+id/extra_text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:paddingTop="16dp"
 		android:paddingBottom="6dp"
 		android:textAppearance="@style/m3_title_small"
-		android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
+		android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
 		android:drawableTint="?android:textColorSecondary"
 		android:drawablePadding="6dp"
 		android:singleLine="true"
@@ -34,13 +34,13 @@
 		android:text="@string/sk_separator" />
 
 	<TextView
-		android:id="@+id/extra_text"
+		android:id="@+id/text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:paddingTop="16dp"
 		android:paddingBottom="6dp"
 		android:textAppearance="@style/m3_title_small"
-		android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
+		android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
 		android:drawableTint="?android:textColorSecondary"
 		android:drawablePadding="6dp"
 		android:singleLine="true"