From bd987fe7f10555c6fcff38638e0c7881db91182f Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Mon, 18 Aug 2025 23:26:32 +0530
Subject: [PATCH] Use MaterialButton for sensitive media toggle + make it
 larger

---
 .../android/mastodon/ui/drawer/StatusAdapter.java    |  4 ++--
 .../ui/drawer/StatusDirectMessageAdapter.java        |  4 ++--
 .../res/layouts/mastodon/layout/layout_media.xml     | 12 +++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 8407b229..14af0ef7 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -3016,9 +3016,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
         RequestBuilder<Drawable> requestBuilder = prepareRequestBuilder(context, attachment, mediaW * ratio, mediaH * ratio, focusX, focusY, statusToDeal.sensitive, false);
         if (!statusToDeal.sensitive || expand_media) {
-            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);
+            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_24);
         } else {
-            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_off_24);
+            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_off_24);
         }
         requestBuilder.load(attachment.preview_url).into(layoutMediaBinding.media);
         if (statusToDeal.sensitive) {
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
index e5f69eea..5ff32570 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
@@ -162,9 +162,9 @@ public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerVie
 
         RequestBuilder<Drawable> requestBuilder = prepareRequestBuilder(context, attachment, mediaW * ratio, mediaH * ratio, focusX, focusY, status.sensitive, false);
         if (!status.sensitive || expand_media) {
-            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);
+            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_24);
         } else {
-            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_off_24);
+            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_off_24);
         }
         requestBuilder.load(attachment.preview_url).into(layoutMediaBinding.media);
         if (status.sensitive) {
diff --git a/app/src/main/res/layouts/mastodon/layout/layout_media.xml b/app/src/main/res/layouts/mastodon/layout/layout_media.xml
index 90e88779..e19d0b0c 100644
--- a/app/src/main/res/layouts/mastodon/layout/layout_media.xml
+++ b/app/src/main/res/layouts/mastodon/layout/layout_media.xml
@@ -60,16 +60,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/media" />
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/view_hide"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="5dp"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/visibility"
         android:importantForAccessibility="no"
-        android:src="@drawable/ic_baseline_visibility_24"
+        app:icon="@drawable/ic_baseline_visibility_24"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/media" />