remove unnecessary rounded close icon, see #649

and rename closeView to close, as the icon can be more generic than the toolbar key
This commit is contained in:
Helium314 2024-04-06 19:33:11 +02:00
parent 38126d2840
commit 8870601402
7 changed files with 5 additions and 17 deletions

View file

@ -78,7 +78,7 @@ private fun getStyleableIconId(key: ToolbarKey) = when (key) {
FULL_LEFT -> R.styleable.Keyboard_iconFullLeft FULL_LEFT -> R.styleable.Keyboard_iconFullLeft
FULL_RIGHT -> R.styleable.Keyboard_iconFullRight FULL_RIGHT -> R.styleable.Keyboard_iconFullRight
SELECT_WORD -> R.styleable.Keyboard_iconSelectWord 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? { fun getToolbarIconByName(name: String, context: Context): Drawable? {

View file

@ -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>

View file

@ -278,7 +278,7 @@
<attr name="iconBin" format="reference" /> <attr name="iconBin" format="reference" />
<attr name="iconUndo" format="reference" /> <attr name="iconUndo" format="reference" />
<attr name="iconRedo" format="reference" /> <attr name="iconRedo" format="reference" />
<attr name="iconCloseView" format="reference" /> <attr name="iconClose" format="reference" />
</declare-styleable> </declare-styleable>
<declare-styleable name="Keyboard_Key"> <declare-styleable name="Keyboard_Key">

View file

@ -47,6 +47,6 @@
<item name="iconFullLeft">@drawable/ic_to_start</item> <item name="iconFullLeft">@drawable/ic_to_start</item>
<item name="iconFullRight">@drawable/ic_to_end</item> <item name="iconFullRight">@drawable/ic_to_end</item>
<item name="iconSelectWord">@drawable/ic_select</item> <item name="iconSelectWord">@drawable/ic_select</item>
<item name="iconCloseView">@drawable/ic_close_view</item> <item name="iconClose">@drawable/ic_close</item>
</style> </style>
</resources> </resources>

View file

@ -52,6 +52,6 @@
<item name="iconFullLeft">@drawable/ic_to_start</item> <item name="iconFullLeft">@drawable/ic_to_start</item>
<item name="iconFullRight">@drawable/ic_to_end</item> <item name="iconFullRight">@drawable/ic_to_end</item>
<item name="iconSelectWord">@drawable/ic_select</item> <item name="iconSelectWord">@drawable/ic_select</item>
<item name="iconCloseView">@drawable/ic_close_view</item> <item name="iconClose">@drawable/ic_close</item>
</style> </style>
</resources> </resources>

View file

@ -51,6 +51,6 @@
<item name="iconFullLeft">@drawable/ic_to_start_rounded</item> <item name="iconFullLeft">@drawable/ic_to_start_rounded</item>
<item name="iconFullRight">@drawable/ic_to_end_rounded</item> <item name="iconFullRight">@drawable/ic_to_end_rounded</item>
<item name="iconSelectWord">@drawable/ic_select_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> </style>
</resources> </resources>