From 5389f05ea85e31b3fd3710e4fdd7bda8b3471c9b Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 22 Mar 2023 21:07:13 -0300
Subject: [PATCH] fix: reimplements the no-alt-text badge and fixes crashes

---
 .../src/main/res/layout/display_item_gifv.xml |  4 +++-
 .../main/res/layout/display_item_photo.xml    | 20 ++-----------------
 .../main/res/layout/display_item_video.xml    |  4 +++-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/mastodon/src/main/res/layout/display_item_gifv.xml b/mastodon/src/main/res/layout/display_item_gifv.xml
index 8f373c682..a60f72ca8 100644
--- a/mastodon/src/main/res/layout/display_item_gifv.xml
+++ b/mastodon/src/main/res/layout/display_item_gifv.xml
@@ -25,4 +25,6 @@
 		android:layout_margin="8dp"
 		android:background="@drawable/ic_gif"/>
 
-</FrameLayout>
\ No newline at end of file
+	<include layout="@layout/alt_badge" />
+
+</FrameLayout>
diff --git a/mastodon/src/main/res/layout/display_item_photo.xml b/mastodon/src/main/res/layout/display_item_photo.xml
index 2ba0d2860..71f4c5099 100644
--- a/mastodon/src/main/res/layout/display_item_photo.xml
+++ b/mastodon/src/main/res/layout/display_item_photo.xml
@@ -11,22 +11,6 @@
 		android:layout_gravity="center"
 		android:scaleType="centerCrop"/>
 
-	<!-- This is hidden from screenreaders because that same alt text is set as content description on the ImageView -->
-	<TextView
-		android:id="@+id/alt_button"
-		android:layout_width="40dp"
-		android:layout_height="22dp"
-		android:layout_gravity="start|bottom"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="8dp"
-		android:importantForAccessibility="no"
-		android:textAppearance="@style/m3_label_large"
-		android:textColor="#FFF"
-		android:gravity="center"
-		android:includeFontPadding="false"
-		android:background="@drawable/bg_image_alt_overlay"
-		android:text="ALT"/>
+	<include layout="@layout/alt_badge" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/mastodon/src/main/res/layout/display_item_video.xml b/mastodon/src/main/res/layout/display_item_video.xml
index 5ecaa5782..17e1e40cd 100644
--- a/mastodon/src/main/res/layout/display_item_video.xml
+++ b/mastodon/src/main/res/layout/display_item_video.xml
@@ -18,4 +18,6 @@
 		android:elevation="3dp"
 		android:background="@drawable/play_button"/>
 
-</FrameLayout>
\ No newline at end of file
+	<include layout="@layout/alt_badge" />
+
+</FrameLayout>