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 @@ - - - - \ 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 @@ - + 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 @@ @drawable/ic_to_start @drawable/ic_to_end @drawable/ic_select - @drawable/ic_close_view + @drawable/ic_close 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 @@ @drawable/ic_to_start @drawable/ic_to_end @drawable/ic_select - @drawable/ic_close_view + @drawable/ic_close 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 @@ @drawable/ic_to_start_rounded @drawable/ic_to_end_rounded @drawable/ic_select_rounded - @drawable/ic_close_view_rounded + @drawable/ic_close \ No newline at end of file