From e2c907eb104f406df3ca7d3e58ca905e2adedd1f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 6 Feb 2023 11:04:38 +0100
Subject: [PATCH] don't hide collapse button

---
 .../android/ui/displayitems/HeaderStatusDisplayItem.java       | 3 ++-
 .../src/main/res/drawable/ic_fluent_chevron_down_20_filled.xml | 3 +++
 .../src/main/res/drawable/ic_fluent_chevron_up_20_filled.xml   | 3 ---
 mastodon/src/main/res/layout/display_item_header.xml           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_chevron_down_20_filled.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_chevron_up_20_filled.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
index 1a09a59d8..b090ea050 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -379,8 +379,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) more.setTooltipText(desc);
 
 			String collapseText = item.parentFragment.getString(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
-			collapseBtn.setVisibility(item.status.textExpandable && item.status.textExpanded ? View.VISIBLE : View.GONE);
+			collapseBtn.setVisibility(item.status.textExpandable ? View.VISIBLE : View.GONE);
 			collapseBtn.setContentDescription(collapseText);
+			collapseBtn.animate().scaleY(item.status.textExpanded ? -1 : 1).start();
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) collapseBtn.setTooltipText(collapseText);
 		}
 
diff --git a/mastodon/src/main/res/drawable/ic_fluent_chevron_down_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_chevron_down_20_filled.xml
new file mode 100644
index 000000000..c5dceeb7d
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_chevron_down_20_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M15.794 7.733c0.286 0.3 0.274 0.774-0.026 1.06l-5.25 5.001c-0.29 0.276-0.745 0.276-1.035 0l-5.25-5c-0.3-0.287-0.312-0.761-0.026-1.061 0.286-0.3 0.76-0.312 1.06-0.026l4.734 4.509 4.733-4.51c0.3-0.285 0.774-0.273 1.06 0.027z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_chevron_up_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_chevron_up_20_filled.xml
deleted file mode 100644
index eb8494db7..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_chevron_up_20_filled.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M4.207 12.267c-0.286-0.3-0.274-0.775 0.026-1.06l5.25-5.002c0.29-0.276 0.745-0.276 1.035 0l5.25 5.001c0.3 0.286 0.312 0.76 0.026 1.06-0.286 0.3-0.76 0.312-1.06 0.026L10 7.784l-4.734 4.508c-0.3 0.286-0.774 0.275-1.06-0.025z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 729ba897c..3d08921a8 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -48,7 +48,7 @@
 		android:layout_toStartOf="@id/visibility"
 		android:background="?android:actionBarItemBackground"
 		android:scaleType="center"
-		android:src="@drawable/ic_fluent_chevron_up_20_filled"
+		android:src="@drawable/ic_fluent_chevron_down_20_filled"
 		android:visibility="gone"
 		android:tint="?android:textColorSecondary" />