From c542f97df02e05ea7d468ba57af4d671ad458688 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Thu, 3 Apr 2025 16:33:52 +0530
Subject: [PATCH 1/2] Add some content descriptions

---
 .../mastodon/ui/drawer/ComposeAdapter.java    |  2 ++
 .../layouts/mastodon/layout/drawer_status.xml |  6 +++---
 .../mastodon/layout/drawer_status_compose.xml | 11 +++++++++++
 .../mastodon/layout/fragment_login_main.xml   |  1 +
 .../fragment_notification_container.xml       |  1 +
 app/src/main/res/values/strings.xml           | 19 +++++++++++++++++++
 6 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 93f301ec..a3161817 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -1697,9 +1697,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 if (holder.binding.contentSpoiler.getVisibility() == View.VISIBLE) {
                     statusDraft.spoilerChecked = false;
                     holder.binding.contentSpoiler.setVisibility(View.GONE);
+                    holder.binding.buttonSensitive.setContentDescription(context.getString(R.string.add_content_warning));
                 } else {
                     holder.binding.contentSpoiler.setVisibility(View.VISIBLE);
                     statusDraft.spoilerChecked = true;
+                    holder.binding.buttonSensitive.setContentDescription(context.getString(R.string.remove_content_warning));
                 }
             });
             //Last compose drawer
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
index 4f1b889b..bab84261 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
@@ -707,7 +707,7 @@
                     android:layout_height="48dp"
                     android:adjustViewBounds="true"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/reblog_add"
+                    android:contentDescription="@string/action_reblog"
                     app:activeImage="@drawable/ic_round_repeat_active_24"
                     app:iconSize="28dp"
                     app:inactiveImage="@drawable/ic_round_repeat_24"
@@ -734,7 +734,7 @@
                 android:adjustViewBounds="true"
                 android:background="@color/transparent"
                 android:clickable="true"
-                android:contentDescription="@string/translate"
+                android:contentDescription="@string/action_quote"
                 android:focusable="true"
                 android:src="@drawable/ic_baseline_format_quote_24"
                 android:visibility="gone"
@@ -760,7 +760,7 @@
                     android:layout_height="48dp"
                     android:layout_gravity="center"
                     android:adjustViewBounds="true"
-                    android:contentDescription="@string/favourite_add"
+                    android:contentDescription="@string/action_favourite"
                     app:activeImage="@drawable/ic_round_star_24"
                     app:animationSpeed="1.5"
                     app:inactiveImage="@drawable/ic_round_star_border_24"
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
index 506fb0a9..7ccb3799 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
@@ -179,6 +179,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
             android:layout_marginStart="6dp"
+            android:contentDescription="@string/open_new_attachment_panel"
             app:icon="@drawable/ic_compose_attach"
             app:layout_constraintBottom_toBottomOf="@id/action_buttons_barrier"
             app:layout_constraintStart_toStartOf="parent"
@@ -191,6 +192,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
             android:checkable="true"
+            android:contentDescription="@string/add_content_warning"
             app:icon="@drawable/ic_compose_sensitive"
             app:layout_constraintBottom_toBottomOf="@id/action_buttons_barrier"
             app:layout_constraintStart_toEndOf="@id/button_attach"
@@ -203,6 +205,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
+            android:contentDescription="@string/change_visibility"
             app:icon="@drawable/ic_compose_visibility_public"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -216,6 +219,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
+            android:contentDescription="@string/set_language"
             android:fontFamily="monospace"
             android:minWidth="72dp"
             app:layout_constraintBottom_toBottomOf="@id/action_buttons_barrier"
@@ -253,6 +257,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
             android:layout_marginEnd="6dp"
+            android:contentDescription="@string/action_publish"
             app:icon="@drawable/ic_compose_post"
             app:layout_constraintBottom_toBottomOf="@id/action_buttons_barrier"
             app:layout_constraintEnd_toEndOf="parent"
@@ -276,6 +281,7 @@
             style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/attach_images"
             app:icon="@drawable/ic_compose_attach_image" />
 
         <com.google.android.material.button.MaterialButton
@@ -283,6 +289,7 @@
             style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/attach_audio"
             app:icon="@drawable/ic_compose_attach_audio" />
 
         <com.google.android.material.button.MaterialButton
@@ -290,6 +297,7 @@
             style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/attach_videos"
             app:icon="@drawable/ic_compose_attach_video" />
 
         <com.google.android.material.button.MaterialButton
@@ -297,6 +305,7 @@
             style="@style/Widget.Material3.Button.IconButton.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/close_new_attachment_panel"
             app:icon="@drawable/ic_baseline_close_24" />
 
         <com.google.android.material.button.MaterialButton
@@ -304,6 +313,7 @@
             style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/add_poll"
             app:icon="@drawable/ic_compose_poll" />
 
         <com.google.android.material.button.MaterialButton
@@ -311,6 +321,7 @@
             style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/attach_files"
             app:icon="@drawable/ic_compose_attach_more" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_login_main.xml b/app/src/main/res/layouts/mastodon/layout/fragment_login_main.xml
index e7351a3a..35ea4309 100644
--- a/app/src/main/res/layouts/mastodon/layout/fragment_login_main.xml
+++ b/app/src/main/res/layouts/mastodon/layout/fragment_login_main.xml
@@ -27,6 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_more"
+        android:contentDescription="@string/more_options"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml b/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
index 742303a1..067d23bf 100644
--- a/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
+++ b/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
@@ -40,6 +40,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
+            android:contentDescription="@string/more_options"
             android:minWidth="48dp"
             app:icon="@drawable/ic_more" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36f21d29..658c9841 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="show_privates">Show direct messages</string>
     <string name="action_open_in_web">Open in browser</string>
     <string name="translate">Translate</string>
+    <string name="more_options">More options</string>
     <!--- Menu -->
     <string name="home_menu">Home</string>
     <string name="local_menu">Local timeline</string>
@@ -77,6 +78,9 @@
     <string name="favourite_add">Add this message to your favourites?</string>
     <string name="favourite_remove">Remove this message from your favourites?</string>
     <string name="reblog_add">Boost this message?</string>
+    <string name="action_favourite">Favorite</string>
+    <string name="action_reblog">Boost</string>
+    <string name="action_quote">Quote</string>
     <string name="warn_boost_no_media_description">Warn if message has no media description before boosting</string>
     <string name="reblog_missing_description">This message has missing media description. Are you sure to boost it?</string>
     <string name="reblog_remove">Unboost this message?</string>
@@ -110,6 +114,21 @@
     <string name="bookmark_remove">Remove bookmark</string>
     <string name="status_bookmarked">Status has been added to bookmarks!</string>
     <string name="status_unbookmarked">Status was removed from bookmarks!</string>
+
+    <!-- Compose -->
+    <string name="add_content_warning">Add content warning</string>
+    <string name="remove_content_warning">Remove content warning</string>
+    <string name="change_visibility">Change visibility</string>
+    <string name="set_language">Set language</string>
+    <string name="action_publish">Publish</string>
+    <string name="open_new_attachment_panel">Open new attachment panel</string>
+    <string name="close_new_attachment_panel">Close new attachment panel</string>
+    <string name="attach_images">Attach images</string>
+    <string name="attach_audio">Attach audio</string>
+    <string name="attach_videos">Attach videos</string>
+    <string name="attach_files">Attach files</string>
+    <string name="add_poll">Add a poll</string>
+
     <!-- Date -->
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>

From dc486381ff7bc7aca04402b80e5cbb57059bf6a4 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Thu, 3 Apr 2025 17:24:29 +0530
Subject: [PATCH 2/2] Update some buttons

---
 .../android/mastodon/helper/Helper.java       | 20 ++++++++++
 .../mastodon/ui/drawer/StatusAdapter.java     |  6 +--
 .../layouts/mastodon/layout/drawer_status.xml | 38 +++++++++----------
 .../fragment_notification_container.xml       |  3 +-
 4 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
index 257820ba..abf2e0c7 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
@@ -34,6 +34,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -99,6 +100,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestOptions;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -1461,6 +1463,24 @@ public class Helper {
         imageView.setColorFilter(color);
     }
 
+    /**
+     * change color of a drawable
+     *
+     * @param materialButton {@link MaterialButton}
+     * @param hexaColor example 0xffff00
+     */
+    public static void changeDrawableColor(Context context, MaterialButton materialButton, int hexaColor) {
+        if (materialButton == null)
+            return;
+        int color;
+        try {
+            color = context.getResources().getColor(hexaColor);
+        } catch (Resources.NotFoundException e) {
+            color = hexaColor;
+        }
+        materialButton.setIconTint(ColorStateList.valueOf(color));
+    }
+
     /**
      * change color of a drawable
      *
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 694e600e..612416ff 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
@@ -1279,8 +1279,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         holder.binding.actionButtonReply.getLayoutParams().height = (int) (normalSize * scaleIcon);
         holder.binding.actionButtonReply.requestLayout();
 
-        holder.binding.actionButtonTranslate.getLayoutParams().width = (int) (normalSize * scaleIcon);
-        holder.binding.actionButtonTranslate.getLayoutParams().height = (int) (normalSize * scaleIcon);
+        holder.binding.actionButtonTranslate.setIconSize((int) (normalSize * scaleIcon));
         holder.binding.actionButtonTranslate.requestLayout();
 
         holder.binding.actionButtonBoost.setImageSize((int) (normalSize * scaleIcon));
@@ -1292,8 +1291,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         holder.binding.statusAddCustomEmoji.getLayoutParams().height = (int) (normalSize * scaleIcon);
         holder.binding.statusAddCustomEmoji.requestLayout();
 
-        holder.binding.actionButtonQuote.getLayoutParams().width = (int) (normalSize * scaleIcon);
-        holder.binding.actionButtonQuote.getLayoutParams().height = (int) (normalSize * scaleIcon);
+        holder.binding.actionButtonQuote.setIconSize((int) (normalSize * scaleIcon));
         holder.binding.actionButtonQuote.requestLayout();
 
         holder.binding.statusEmoji.getLayoutParams().width = (int) (normalSize * scaleIcon);
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
index bab84261..1f76b85f 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
@@ -726,23 +726,20 @@
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/action_button_quote"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:layout_gravity="center"
-                android:adjustViewBounds="true"
-                android:background="@color/transparent"
-                android:clickable="true"
+                style="@style/Widget.Material3.Button.IconButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
                 android:contentDescription="@string/action_quote"
-                android:focusable="true"
-                android:src="@drawable/ic_baseline_format_quote_24"
-                android:visibility="gone"
+                app:icon="@drawable/ic_baseline_format_quote_24"
+                app:iconGravity="textStart"
+                app:iconSize="28dp"
+                app:iconTint="?colorControlNormal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/action_button_favorite_container"
                 app:layout_constraintStart_toEndOf="@+id/action_button_boost_container"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/action_button_favorite_container"
@@ -797,18 +794,17 @@
                 sparkbutton:iconSize="28dp" />
 
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/action_button_translate"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:layout_gravity="center"
-                android:adjustViewBounds="true"
-                android:background="@color/transparent"
-                android:clickable="true"
+                style="@style/Widget.Material3.Button.IconButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
                 android:contentDescription="@string/translate"
-                android:focusable="true"
-                android:src="@drawable/ic_baseline_translate_24"
                 android:visibility="gone"
+                app:icon="@drawable/ic_baseline_translate_24"
+                app:iconGravity="textStart"
+                app:iconSize="28dp"
+                app:iconTint="?colorControlNormal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/action_button_maths"
                 app:layout_constraintStart_toEndOf="@+id/action_button_bookmark"
diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml b/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
index 067d23bf..cf25f709 100644
--- a/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
+++ b/app/src/main/res/layouts/mastodon/layout/fragment_notification_container.xml
@@ -36,12 +36,11 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/settings"
-            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            style="@style/Widget.Material3.Button.IconButton.Outlined"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
             android:contentDescription="@string/more_options"
-            android:minWidth="48dp"
             app:icon="@drawable/ic_more" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>