From 873711939dc4cfafc9d6240841a4ed471d045f36 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sat, 20 Apr 2024 06:51:30 +0300
Subject: [PATCH] Post header tap area thing (AND-160)

---
 .../displayitems/HeaderStatusDisplayItem.java | 10 +++++----
 .../displayitems/TextStatusDisplayItem.java   |  2 +-
 .../main/res/drawable/bg_status_header.xml    |  9 ++++++++
 .../main/res/layout/display_item_header.xml   | 22 ++++++++++++++++---
 4 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_status_header.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 8b2a056c..c998434e 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
@@ -119,6 +119,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		private final TextView name, timeAndUsername, extraText;
 		private final ImageView avatar, more;
 		private final PopupMenu optionsMenu;
+		private final View clickableThing;
 
 		public Holder(Activity activity, ViewGroup parent){
 			this(activity, R.layout.display_item_header, parent);
@@ -131,7 +132,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			extraText=findViewById(R.id.extra_text);
-			avatar.setOnClickListener(this::onAvaClick);
+			clickableThing=findViewById(R.id.clickable_thing);
+			clickableThing.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(10));
 			avatar.setClipToOutline(true);
 			more.setOnClickListener(this::onMoreClick);
@@ -262,7 +264,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				time=item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt));
 
 			timeAndUsername.setText(time+" · @"+item.user.acct);
-			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
+			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : V.dp(4));
 			if(TextUtils.isEmpty(item.extraText)){
 				extraText.setVisibility(View.GONE);
 			}else{
@@ -270,8 +272,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				extraText.setText(item.extraText);
 			}
 			more.setVisibility(item.inset ? View.GONE : View.VISIBLE);
-			avatar.setClickable(!item.inset);
-			avatar.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
+			clickableThing.setClickable(!item.inset);
+			clickableThing.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
 		}
 
 		@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
index d7959c16..7466873f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -94,7 +94,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			itemView.setClickable(false);
-			text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(16), text.getPaddingRight(), text.getPaddingBottom());
+			text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(12), text.getPaddingRight(), text.getPaddingBottom());
 			text.setTextColor(UiUtils.getThemeColor(text.getContext(), item.inset ? R.attr.colorM3OnSurfaceVariant : R.attr.colorM3OnSurface));
 			updateTranslation(false);
 		}
diff --git a/mastodon/src/main/res/drawable/bg_status_header.xml b/mastodon/src/main/res/drawable/bg_status_header.xml
new file mode 100644
index 00000000..b2d14174
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_status_header.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_primary_overlay">
+	<item android:id="@android:id/mask">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="14dp"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 9151d986..80b8714c 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -4,8 +4,9 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:paddingTop="16dp"
-	android:paddingRight="16dp"
-	android:paddingLeft="16dp">
+	android:paddingHorizontal="16dp"
+	android:paddingBottom="4dp"
+	android:clipToPadding="false">
 
 	<ImageView
 		android:id="@+id/more"
@@ -21,6 +22,18 @@
 		android:contentDescription="@string/more_options"
 		android:src="@drawable/ic_more_vert_20px" />
 
+	<View
+		android:id="@+id/clickable_thing"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="-4dp"
+		android:layout_marginVertical="-4dp"
+		android:layout_alignLeft="@id/avatar"
+		android:layout_alignRight="@id/time_and_username"
+		android:layout_alignTop="@id/avatar"
+		android:layout_alignBottom="@id/avatar"
+		android:background="@drawable/bg_status_header"/>
+
 	<ImageView
 		android:id="@+id/avatar"
 		android:layout_width="40dp"
@@ -28,7 +41,8 @@
 		android:layout_alignParentStart="true"
 		android:layout_alignParentTop="true"
 		android:layout_marginTop="2dp"
-		android:layout_marginEnd="8dp" />
+		android:layout_marginEnd="8dp"
+		android:importantForAccessibility="no"/>
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
@@ -70,6 +84,8 @@
 		android:layout_height="20dp"
 		android:layout_below="@id/name_wrap"
 		android:layout_toEndOf="@id/avatar"
+		android:layout_toStartOf="@id/more"
+		android:layout_marginEnd="8dp"
 		android:singleLine="true"
 		android:ellipsize="end"
 		android:textAppearance="@style/m3_body_medium"