From f4c4e00a44eaefafa8f286457c84170414aaf8f6 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Thu, 22 Aug 2024 16:37:11 +1000
Subject: [PATCH] Tweaks

---
 .../securesms/conversation/v2/MessageDetailActivity.kt   | 2 +-
 .../securesms/preferences/SettingsActivity.kt            | 2 +-
 app/src/main/res/drawable/ic_delete.xml                  | 9 +++++++++
 app/src/main/res/drawable/ic_message_details__trash.xml  | 9 ---------
 .../main/res/drawable/media_camera_button_background.xml | 7 +------
 .../main/res/drawable/media_count_button_background.xml  | 1 +
 6 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_delete.xml
 delete mode 100644 app/src/main/res/drawable/ic_message_details__trash.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index 9514552d28..b6f9e148b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -235,7 +235,7 @@ fun CellButtons(
             }
             LargeItemButton(
                 R.string.delete,
-                R.drawable.ic_message_details__trash,
+                R.drawable.ic_delete,
                 colors = dangerButtonColors(),
                 onClick = onDelete
             )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index fc52541987..ce86ce8381 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -518,7 +518,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     }
                     LargeItemButton(R.string.activity_settings_help_button, R.drawable.ic_help, Modifier.contentDescription(R.string.AccessibilityId_help)) { show<HelpSettingsActivity>() }
                     Divider()
-                    LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_message_details__trash, Modifier.contentDescription(R.string.AccessibilityId_clear_data), dangerButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") }
+                    LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_delete, Modifier.contentDescription(R.string.AccessibilityId_clear_data), dangerButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") }
                 }
             }
         }
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000000..1a3e8b4001
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M11.165,26.962H20.827C22.7,26.962 23.523,26.037 23.812,24.174L25.284,9.692L23.521,9.768L22.057,24.071C21.925,24.916 21.499,25.256 20.744,25.256H11.256C10.486,25.256 10.067,24.916 9.943,24.071L8.478,9.768L6.715,9.692L8.187,24.174C8.469,26.044 9.299,26.962 11.165,26.962ZM6.818,10.644H25.183C26.419,10.644 27.13,9.853 27.13,8.627V7.296C27.13,6.071 26.419,5.28 25.183,5.28H6.818C5.63,5.28 4.869,6.071 4.869,7.296V8.627C4.869,9.853 5.584,10.644 6.818,10.644ZM7.168,9.021C6.75,9.021 6.568,8.831 6.568,8.412V7.51C6.568,7.091 6.75,6.902 7.168,6.902H24.839C25.256,6.902 25.431,7.091 25.431,7.51V8.412C25.431,8.831 25.256,9.021 24.839,9.021H7.168Z"
+      android:fillColor="#FF3A3A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_details__trash.xml b/app/src/main/res/drawable/ic_message_details__trash.xml
deleted file mode 100644
index 85d4216958..0000000000
--- a/app/src/main/res/drawable/ic_message_details__trash.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
-  <path
-      android:pathData="M8.749,24.43H19.167C21.186,24.43 22.073,23.433 22.385,21.427L23.972,5.825L22.071,5.907L20.492,21.315C20.35,22.226 19.89,22.591 19.076,22.591H8.847C8.017,22.591 7.566,22.226 7.432,21.315L5.853,5.907L3.952,5.825L5.539,21.427C5.843,23.441 6.738,24.43 8.749,24.43ZM4.063,6.85H23.863C25.195,6.85 25.962,5.998 25.962,4.677V3.244C25.962,1.924 25.195,1.072 23.863,1.072H4.063C2.782,1.072 1.962,1.924 1.962,3.244V4.677C1.962,5.998 2.732,6.85 4.063,6.85ZM4.44,5.102C3.99,5.102 3.794,4.898 3.794,4.446V3.474C3.794,3.023 3.99,2.819 4.44,2.819H23.492C23.942,2.819 24.13,3.023 24.13,3.474V4.446C24.13,4.898 23.942,5.102 23.492,5.102H4.44Z"
-      android:fillColor="#FF3A3A"/>
-</vector>
diff --git a/app/src/main/res/drawable/media_camera_button_background.xml b/app/src/main/res/drawable/media_camera_button_background.xml
index d0c63b6d00..c60e199823 100644
--- a/app/src/main/res/drawable/media_camera_button_background.xml
+++ b/app/src/main/res/drawable/media_camera_button_background.xml
@@ -2,15 +2,10 @@
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/core_grey_45">
-    <item android:id="@+id/mask">
-        <shape>
-            <corners android:radius="1000dp" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
     <item>
         <shape android:shape="oval">
             <solid android:color="?backgroundSecondary" />
+            <stroke android:color="?elementBorderColor" android:width="1dp" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml
index 73c91ccefb..40e8c4ebb6 100644
--- a/app/src/main/res/drawable/media_count_button_background.xml
+++ b/app/src/main/res/drawable/media_count_button_background.xml
@@ -6,6 +6,7 @@
         <shape>
             <corners android:radius="1000dp" />
             <solid android:color="?backgroundSecondary" />
+            <stroke android:color="?elementBorderColor" android:width="1dp" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file