From 887060140246cdf4507f8c2b023bc4945c218ac5 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 6 Apr 2024 19:33:11 +0200
Subject: [PATCH] remove unnecessary rounded close icon, see #649 and rename
 closeView to close, as the icon can be more generic than the toolbar key

---
 .../helium314/keyboard/latin/utils/ToolbarUtils.kt   |  2 +-
 .../res/drawable/{ic_close_view.xml => ic_close.xml} |  0
 app/src/main/res/drawable/ic_close_view_rounded.xml  | 12 ------------
 app/src/main/res/values/attrs.xml                    |  2 +-
 app/src/main/res/values/keyboard-icons-holo.xml      |  2 +-
 app/src/main/res/values/keyboard-icons-lxx-light.xml |  2 +-
 app/src/main/res/values/keyboard-icons-rounded.xml   |  2 +-
 7 files changed, 5 insertions(+), 17 deletions(-)
 rename app/src/main/res/drawable/{ic_close_view.xml => ic_close.xml} (100%)
 delete mode 100644 app/src/main/res/drawable/ic_close_view_rounded.xml

diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index 58ca8d318..54f29f491 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -78,7 +78,7 @@ private fun getStyleableIconId(key: ToolbarKey) = when (key) {
     FULL_LEFT -> R.styleable.Keyboard_iconFullLeft
     FULL_RIGHT -> R.styleable.Keyboard_iconFullRight
     SELECT_WORD -> R.styleable.Keyboard_iconSelectWord
-    CLOSE_HISTORY -> R.styleable.Keyboard_iconCloseView
+    CLOSE_HISTORY -> R.styleable.Keyboard_iconClose
 }
 
 fun getToolbarIconByName(name: String, context: Context): Drawable? {
diff --git a/app/src/main/res/drawable/ic_close_view.xml b/app/src/main/res/drawable/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_view.xml
rename to app/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_close_view_rounded.xml b/app/src/main/res/drawable/ic_close_view_rounded.xml
deleted file mode 100644
index 5dfc36d10..000000000
--- a/app/src/main/res/drawable/ic_close_view_rounded.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-    icon available in Android Studio
-    SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="960"
-    android:viewportWidth="960"  >
-    <path android:fillColor="#FFF"
-        android:pathData="m256,760 l-56,-56 224,-224 -224,-224 56,-56 224,224 224,-224 56,56 -224,224 224,224 -56,56 -224,-224 -224,224Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d9d3668f5..e9e4103fd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -278,7 +278,7 @@
         <attr name="iconBin" format="reference" />
         <attr name="iconUndo" format="reference" />
         <attr name="iconRedo" format="reference" />
-        <attr name="iconCloseView" format="reference" />
+        <attr name="iconClose" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="Keyboard_Key">
diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml
index c7781265d..afb7fc3f3 100644
--- a/app/src/main/res/values/keyboard-icons-holo.xml
+++ b/app/src/main/res/values/keyboard-icons-holo.xml
@@ -47,6 +47,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start</item>
         <item name="iconFullRight">@drawable/ic_to_end</item>
         <item name="iconSelectWord">@drawable/ic_select</item>
-        <item name="iconCloseView">@drawable/ic_close_view</item>
+        <item name="iconClose">@drawable/ic_close</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index bb6bf19f9..6dfaa8c6d 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -52,6 +52,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start</item>
         <item name="iconFullRight">@drawable/ic_to_end</item>
         <item name="iconSelectWord">@drawable/ic_select</item>
-        <item name="iconCloseView">@drawable/ic_close_view</item>
+        <item name="iconClose">@drawable/ic_close</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/keyboard-icons-rounded.xml b/app/src/main/res/values/keyboard-icons-rounded.xml
index a7dce0946..c7f0f4ef7 100644
--- a/app/src/main/res/values/keyboard-icons-rounded.xml
+++ b/app/src/main/res/values/keyboard-icons-rounded.xml
@@ -51,6 +51,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start_rounded</item>
         <item name="iconFullRight">@drawable/ic_to_end_rounded</item>
         <item name="iconSelectWord">@drawable/ic_select_rounded</item>
-        <item name="iconCloseView">@drawable/ic_close_view_rounded</item>
+        <item name="iconClose">@drawable/ic_close</item>
     </style>
 </resources>
\ No newline at end of file