From a2dec4f7cfcaca9462212d94bde5df06115a2079 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Fri, 22 Mar 2024 00:49:42 +0300
Subject: [PATCH] Notification requests tweaks

---
 mastodon/build.gradle                                    | 2 +-
 .../fragments/AccountNotificationsListFragment.java      | 2 +-
 .../src/main/res/drawable/ic_delete_wght700_24px.xml     | 9 +++++++++
 .../src/main/res/drawable/ic_volume_off_wght700_24px.xml | 9 ---------
 .../src/main/res/layout/item_notification_request.xml    | 2 +-
 mastodon/src/main/res/menu/notification_request.xml      | 2 +-
 mastodon/src/main/res/values/strings.xml                 | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_delete_wght700_24px.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_volume_off_wght700_24px.xml

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index c43b31bc..9e37bef6 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,7 +13,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 92
+		versionCode 93
 		versionName "2.4.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountNotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountNotificationsListFragment.java
index 5101f35b..28a36aeb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountNotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountNotificationsListFragment.java
@@ -118,7 +118,7 @@ public class AccountNotificationsListFragment extends BaseNotificationsListFragm
 			tintMenuIcon(allow, R.attr.colorM3OnSurfaceVariant);
 		}
 		if(choiceMade && !allowed){
-			mute.setIcon(R.drawable.ic_volume_off_wght700_24px);
+			mute.setIcon(R.drawable.ic_delete_wght700_24px);
 			tintMenuIcon(mute, R.attr.colorM3Primary);
 		}else{
 			tintMenuIcon(mute, R.attr.colorM3OnSurfaceVariant);
diff --git a/mastodon/src/main/res/drawable/ic_delete_wght700_24px.xml b/mastodon/src/main/res/drawable/ic_delete_wght700_24px.xml
new file mode 100644
index 00000000..e2ac6318
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_delete_wght700_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6.725,21.85Q5.4,21.85 4.488,20.938Q3.575,20.025 3.575,18.7V6.275H2V3.125H8.425V1.55H15.525V3.125H22V6.275H20.425V18.7Q20.425,20.025 19.513,20.938Q18.6,21.85 17.275,21.85ZM17.275,6.275H6.725V18.7Q6.725,18.7 6.725,18.7Q6.725,18.7 6.725,18.7H17.275Q17.275,18.7 17.275,18.7Q17.275,18.7 17.275,18.7ZM8.55,16.975H11.125V7.975H8.55ZM12.875,16.975H15.45V7.975H12.875ZM6.725,6.275V18.7Q6.725,18.7 6.725,18.7Q6.725,18.7 6.725,18.7Q6.725,18.7 6.725,18.7Q6.725,18.7 6.725,18.7Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_volume_off_wght700_24px.xml b/mastodon/src/main/res/drawable/ic_volume_off_wght700_24px.xml
deleted file mode 100644
index de45cef2..00000000
--- a/mastodon/src/main/res/drawable/ic_volume_off_wght700_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20.05,23.4 L16.975,20.275Q16.45,20.575 15.863,20.8Q15.275,21.025 14.625,21.15V18.675Q14.775,18.625 14.925,18.575Q15.075,18.525 15.225,18.45L12.625,15.8V22.025L6.45,15.85H1.95V8.15H5.2L0.55,3.35L2.2,1.7L21.725,21.725ZM20.5,17.075 L18.775,15.3Q19.2,14.55 19.413,13.712Q19.625,12.875 19.625,11.975Q19.625,9.65 18.225,7.812Q16.825,5.975 14.625,5.275V2.8Q17.875,3.525 19.95,6.087Q22.025,8.65 22.025,11.975Q22.025,13.4 21.625,14.675Q21.225,15.95 20.5,17.075ZM8.9,11.925ZM17.175,13.675 L14.625,11.075V7.65Q15.9,8.25 16.713,9.412Q17.525,10.575 17.525,12Q17.525,12.45 17.438,12.875Q17.35,13.3 17.175,13.675ZM12.625,9 L9.175,5.425 12.625,1.975ZM9.475,14.425V12.55L8.275,11.3H5.1V12.7H7.75Z"/>
-</vector>
diff --git a/mastodon/src/main/res/layout/item_notification_request.xml b/mastodon/src/main/res/layout/item_notification_request.xml
index 0e4fae16..5a71f4ca 100644
--- a/mastodon/src/main/res/layout/item_notification_request.xml
+++ b/mastodon/src/main/res/layout/item_notification_request.xml
@@ -50,7 +50,7 @@
 		android:layout_centerVertical="true"
 		style="@style/Widget.Mastodon.M3.Button.Outlined"
 		android:contentDescription="@string/mute_notifications"
-		android:src="@drawable/ic_volume_off_24px"/>
+		android:src="@drawable/ic_delete_24px"/>
 	
 	<TextView
 		android:id="@+id/name"
diff --git a/mastodon/src/main/res/menu/notification_request.xml b/mastodon/src/main/res/menu/notification_request.xml
index e29a33b8..e7151af8 100644
--- a/mastodon/src/main/res/menu/notification_request.xml
+++ b/mastodon/src/main/res/menu/notification_request.xml
@@ -3,7 +3,7 @@
 	<item
 		android:id="@+id/mute"
 		android:title="@string/mute_notifications"
-		android:icon="@drawable/ic_volume_off_24px"
+		android:icon="@drawable/ic_delete_24px"
 		android:checkable="true"
 		android:showAsAction="always"/>
 	<item
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index df4a70b6..ff2b1f09 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -739,12 +739,12 @@
 	<string name="notification_filter_mentions">Unsolicited private mentions</string>
 	<string name="notification_filter_mentions_explanation">Filtered unless it’s in reply to your own mention or if you follow the sender</string>
 	<string name="allow_notifications">Allow notifications</string>
-	<string name="mute_notifications">Mute notifications</string>
+	<string name="mute_notifications">Dismiss notification request</string>
 	<plurals name="x_people_you_may_know">
 		<item quantity="one">%,d person you may know</item>
 		<item quantity="other">%,d people you may know</item>
 	</plurals>
 	<string name="notifications_from_user">Notifications from %s</string>
-	<string name="notifications_muted">Notifications from %s will be muted.</string>
+	<string name="notifications_muted">Notifications from %s have been dismissed.</string>
 	<string name="notifications_allowed">%s will now appear in your notification list.</string>
 </resources>
\ No newline at end of file