From fe041293b64f092c56bac9a1ca55e448693e43cb Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sun, 5 Jan 2025 18:49:38 +0100
Subject: [PATCH] add label for bin icon and rename drawable

---
 .../keyboard/keyboard/internal/KeyboardIconsSet.kt          | 6 +++---
 .../latin/settings/UserDictionaryAddWordFragment.java       | 2 +-
 app/src/main/res/drawable/{ic_delete.xml => ic_bin.xml}     | 0
 .../drawable/{ic_delete_rounded.xml => ic_bin_rounded.xml}  | 0
 app/src/main/res/layout/language_list_item.xml              | 2 +-
 app/src/main/res/values/strings.xml                         | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename app/src/main/res/drawable/{ic_delete.xml => ic_bin.xml} (100%)
 rename app/src/main/res/drawable/{ic_delete_rounded.xml => ic_bin_rounded.xml} (100%)

diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt
index d828e3f65..553edad1e 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt
@@ -119,7 +119,7 @@ class KeyboardIconsSet private constructor() {
             NAME_SWITCH_ONEHANDED_KEY to        R.drawable.ic_arrow_left,
             NAME_RESIZE_ONEHANDED_KEY to        R.drawable.ic_arrow_horizontal,
             NAME_TOOLBAR_KEY to                 R.drawable.ic_arrow_right,
-            NAME_BIN to                         R.drawable.ic_delete,
+            NAME_BIN to                         R.drawable.ic_bin,
         ).apply {
             ToolbarKey.entries.forEach {
                 put(it.name.lowercase(Locale.US), when (it) {
@@ -179,7 +179,7 @@ class KeyboardIconsSet private constructor() {
             NAME_SWITCH_ONEHANDED_KEY to        R.drawable.ic_arrow_left,
             NAME_RESIZE_ONEHANDED_KEY to        R.drawable.ic_arrow_horizontal,
             NAME_TOOLBAR_KEY to                 R.drawable.ic_arrow_right,
-            NAME_BIN to                         R.drawable.ic_delete,
+            NAME_BIN to                         R.drawable.ic_bin,
         ).apply {
             ToolbarKey.entries.forEach {
                 put(it.name.lowercase(Locale.US), when (it) {
@@ -239,7 +239,7 @@ class KeyboardIconsSet private constructor() {
             NAME_SWITCH_ONEHANDED_KEY to        R.drawable.ic_arrow_left_rounded,
             NAME_RESIZE_ONEHANDED_KEY to        R.drawable.ic_arrow_horizontal_rounded,
             NAME_TOOLBAR_KEY to                 R.drawable.ic_arrow_right_rounded,
-            NAME_BIN to                         R.drawable.ic_delete_rounded,
+            NAME_BIN to                         R.drawable.ic_bin_rounded,
         ).apply {
             ToolbarKey.entries.forEach {
                 put(it.name.lowercase(Locale.US), when (it) {
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/UserDictionaryAddWordFragment.java b/app/src/main/java/helium314/keyboard/latin/settings/UserDictionaryAddWordFragment.java
index 7e2e42c63..6574239d3 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/UserDictionaryAddWordFragment.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/UserDictionaryAddWordFragment.java
@@ -97,7 +97,7 @@ public class UserDictionaryAddWordFragment extends SubScreenFragment {
         saveWordButton.setVisibility(TextUtils.isEmpty(mWordEditText.getText().toString()) ? View.INVISIBLE : View.VISIBLE);
 
         final Button deleteWordButton = mRootView.findViewById(R.id.user_dictionary_delete_button);
-        final Drawable deleteWordIcon = toScaledBitmapDrawable(R.drawable.ic_delete, 0.75f);
+        final Drawable deleteWordIcon = toScaledBitmapDrawable(R.drawable.ic_bin, 0.75f);
         deleteWordButton.setCompoundDrawablesWithIntrinsicBounds(null, null, deleteWordIcon, null);
         deleteWordButton.setOnClickListener(v -> {
             mContents.delete(requireContext());
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_bin.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete.xml
rename to app/src/main/res/drawable/ic_bin.xml
diff --git a/app/src/main/res/drawable/ic_delete_rounded.xml b/app/src/main/res/drawable/ic_bin_rounded.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_rounded.xml
rename to app/src/main/res/drawable/ic_bin_rounded.xml
diff --git a/app/src/main/res/layout/language_list_item.xml b/app/src/main/res/layout/language_list_item.xml
index a561b5865..0f988324d 100644
--- a/app/src/main/res/layout/language_list_item.xml
+++ b/app/src/main/res/layout/language_list_item.xml
@@ -32,7 +32,7 @@
     <ImageView
         android:id="@+id/delete_button"
         android:paddingEnd="10dp"
-        android:src="@drawable/ic_delete"
+        android:src="@drawable/ic_bin"
         app:tint="@color/foreground_weak"
         android:visibility="gone"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7e77be2e..2b359f2be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -911,6 +911,8 @@ New dictionary:
     <string name="label_zwj_key" tools:keep="@string/label_zwj_key">Zero-width joiner</string>
     <!-- Label for zero-width non-joiner key, currently used only for showing the icon name -->
     <string name="label_zwnj_key" tools:keep="@string/label_zwnj_key">Zero-width non-joiner</string>
+    <!-- Label for bin (delete) key, currently used only for showing the icon name -->
+    <string name="label_bin" tools:keep="@string/label_bin">Bin</string>
     <!-- Title of the setting for horizontal spacebar swipe gesture -->
     <string name="show_horizontal_space_swipe">Horizontal spacebar swipe gesture</string>
     <!-- Title of the setting for vertical spacebar swipe gesture -->