From d36ad43700c0958860177b76675f0ed117d11508 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 28 Aug 2023 22:26:53 +0200
Subject: [PATCH] fix reporting crashing the app

---
 .../ui/displayitems/StatusDisplayItem.java    |  2 +-
 .../layout/display_item_header_checkable.xml  | 94 +++++--------------
 .../res/layout/fragment_report_comment.xml    | 44 ---------
 3 files changed, 23 insertions(+), 117 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index cdc569f8a..810c55b19 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -306,7 +306,7 @@ public abstract class StatusDisplayItem{
 		int i=1;
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
-		if(inset || footer==null){
+		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
 			items.add(new DummyStatusDisplayItem(parentID, fragment));
 			// in case we ever need the dummy to display a margin for the media grid again:
 			// (i forgot why we apparently don't need this anymore)
diff --git a/mastodon/src/main/res/layout/display_item_header_checkable.xml b/mastodon/src/main/res/layout/display_item_header_checkable.xml
index 410011ef2..7b51fa150 100644
--- a/mastodon/src/main/res/layout/display_item_header_checkable.xml
+++ b/mastodon/src/main/res/layout/display_item_header_checkable.xml
@@ -8,83 +8,33 @@
 	android:paddingLeft="16dp"
 	android:clipToPadding="false">
 
-	<View
-		android:id="@+id/checkbox"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:layout_marginStart="-4dp"
-		android:layout_marginTop="-8dp"
-		android:layout_marginEnd="12dp"
-		android:duplicateParentState="true"/>
+	<FrameLayout
+		android:id="@+id/checkbox_wrap"
+		android:layout_width="wrap_content"
+		android:layout_height="46sp"
+		android:duplicateParentState="true">
 
-	<ImageView
-		android:id="@+id/more"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentEnd="true"
-		android:layout_marginTop="-2dp"
-		android:layout_marginEnd="-2dp"
-		android:background="?android:selectableItemBackgroundBorderless"
-		android:scaleType="center"
-		android:tint="?colorM3OnSurfaceVariant"
-		android:contentDescription="@string/more_options"
-		android:src="@drawable/ic_fluent_more_vertical_20_filled" />
+		<View
+			android:id="@+id/checkbox"
+			android:layout_gravity="center_vertical"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginStart="-4dp"
+			android:layout_marginTop="0dp"
+			android:layout_marginEnd="12dp"
+			android:duplicateParentState="true"/>
 
-	<ImageView
-		android:id="@+id/avatar"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentTop="true"
-		android:layout_toEndOf="@id/checkbox"
-		android:layout_marginTop="2dp"
-		android:layout_marginEnd="8dp" />
+	</FrameLayout>
 
-	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
-		android:id="@+id/name_wrap"
+	<FrameLayout
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_toStartOf="@id/more"
-		android:layout_marginEnd="8dp">
+		android:layout_height="wrap_content"
+		android:layout_marginTop="-16dp"
+		android:layout_marginStart="-16dp"
+		android:layout_toEndOf="@id/checkbox_wrap">
 
-		<TextView
-			android:id="@+id/name"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:textColor="?colorM3OnSurface"
-			android:gravity="start|center_vertical"
-			tools:text="Eugen" />
+		<include layout="@layout/display_item_header" />
 
-		<TextView
-			android:id="@+id/extra_text"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:layout_marginStart="8dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:fontFamily="sans-serif"
-			android:textAlignment="viewStart"
-			android:textColor="?colorM3OnSurface"
-			tools:text="boosted your cat picture" />
-
-	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
-
-	<TextView
-		android:id="@+id/time_and_username"
-		android:layout_width="match_parent"
-		android:layout_height="20dp"
-		android:layout_below="@id/name_wrap"
-		android:layout_toEndOf="@id/avatar"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:textAppearance="@style/m3_title_small"
-		android:gravity="center_vertical"
-		android:textColor="?colorM3OnSurfaceVariant"
-		tools:text="9h ago · \@Gargron@mastodon.social"/>
+	</FrameLayout>
 
 </org.joinmastodon.android.ui.views.CheckableRelativeLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_report_comment.xml b/mastodon/src/main/res/layout/fragment_report_comment.xml
index 9ff461272..29364afb6 100644
--- a/mastodon/src/main/res/layout/fragment_report_comment.xml
+++ b/mastodon/src/main/res/layout/fragment_report_comment.xml
@@ -91,50 +91,6 @@
 
 			</RelativeLayout>
 
-			<LinearLayout
-				android:id="@+id/forward_report"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="16dp"
-				android:paddingHorizontal="8dp"
-				android:paddingVertical="8dp"
-				android:gravity="center_vertical"
-				android:layoutDirection="locale"
-				android:background="?android:selectableItemBackground">
-
-				<ImageView
-					android:id="@+id/icon"
-					android:layout_width="24dp"
-					android:layout_height="24dp"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="32dp"
-					android:importantForAccessibility="no"
-					android:tint="?android:textColorPrimary"
-					android:src="@drawable/ic_fluent_arrow_forward_24_regular"/>
-
-				<TextView
-					android:id="@+id/forward_report_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:paddingVertical="8dp"
-					android:textSize="16sp"
-					android:text="@string/sk_forward_report_to"
-					android:textColor="?android:textColorPrimary" />
-
-				<Switch
-					android:id="@+id/forward_report_switch"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:duplicateParentState="true"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="12dp"
-					android:focusable="false"
-					android:clickable="false"/>
-
-			</LinearLayout>
-
 		</LinearLayout>
 
 	</ScrollView>