luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-20 08:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add emoji toolbar key (#845)

Browse source
This commit is contained in:
codokie 2024-06-07 09:21:13 +03:00 • committed by GitHub
parent a841777b92
commit d11237ba23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
View file

@ -59,6 +59,7 @@ fun getCodeForToolbarKey(key: ToolbarKey) = when (key) {
SELECT_WORD -> KeyCode.CLIPBOARD_SELECT_WORD SELECT_WORD -> KeyCode.CLIPBOARD_SELECT_WORD
CLEAR_CLIPBOARD -> KeyCode.CLIPBOARD_CLEAR_HISTORY CLEAR_CLIPBOARD -> KeyCode.CLIPBOARD_CLEAR_HISTORY
CLOSE_HISTORY -> KeyCode.ALPHA CLOSE_HISTORY -> KeyCode.ALPHA
EMOJI -> KeyCode.EMOJI
} }
fun getCodeForToolbarKeyLongClick(key: ToolbarKey) = when (key) { fun getCodeForToolbarKeyLongClick(key: ToolbarKey) = when (key) {
@ -95,6 +96,7 @@ fun getStyleableIconId(key: ToolbarKey) = when (key) {
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_iconClose CLOSE_HISTORY -> R.styleable.Keyboard_iconClose
EMOJI -> R.styleable.Keyboard_iconEmojiNormalKey
} }
fun getToolbarIconByName(name: String, context: Context): Drawable? { fun getToolbarIconByName(name: String, context: Context): Drawable? {
@ -109,14 +111,14 @@ fun getToolbarIconByName(name: String, context: Context): Drawable? {
// names need to be aligned with resources strings (using lowercase of key.name) // names need to be aligned with resources strings (using lowercase of key.name)
enum class ToolbarKey { enum class ToolbarKey {
VOICE, CLIPBOARD, UNDO, REDO, SETTINGS, SELECT_ALL, SELECT_WORD, COPY, CUT, ONE_HANDED, LEFT, RIGHT, UP, DOWN, VOICE, CLIPBOARD, UNDO, REDO, SETTINGS, SELECT_ALL, SELECT_WORD, COPY, CUT, ONE_HANDED, LEFT, RIGHT, UP, DOWN,
FULL_LEFT, FULL_RIGHT, INCOGNITO, AUTOCORRECT, CLEAR_CLIPBOARD, CLOSE_HISTORY FULL_LEFT, FULL_RIGHT, INCOGNITO, AUTOCORRECT, CLEAR_CLIPBOARD, CLOSE_HISTORY, EMOJI
} }
val toolbarKeyStrings: Set<String> = entries.mapTo(HashSet()) { it.toString().lowercase(Locale.US) } val toolbarKeyStrings: Set<String> = entries.mapTo(HashSet()) { it.toString().lowercase(Locale.US) }
val defaultToolbarPref = entries.filterNot { it == CLOSE_HISTORY }.joinToString(";") { val defaultToolbarPref = entries.filterNot { it == CLOSE_HISTORY }.joinToString(";") {
when (it) { when (it) {
INCOGNITO, AUTOCORRECT, UP, DOWN, ONE_HANDED, FULL_LEFT, FULL_RIGHT, CUT, CLEAR_CLIPBOARD -> "${it.name},false" INCOGNITO, AUTOCORRECT, UP, DOWN, ONE_HANDED, FULL_LEFT, FULL_RIGHT, CUT, CLEAR_CLIPBOARD, EMOJI -> "${it.name},false"
else -> "${it.name},true" else -> "${it.name},true"
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -252,6 +252,7 @@
<string name="undo" tools:keep="@string/undo">Undo</string> <string name="undo" tools:keep="@string/undo">Undo</string>
<string name="redo" tools:keep="@string/redo">Redo</string> <string name="redo" tools:keep="@string/redo">Redo</string>
<string name="close_history" tools:keep="@string/close_history">Close clipboard history</string> <string name="close_history" tools:keep="@string/close_history">Close clipboard history</string>
<string name="emoji" tools:keep="@string/emoji">Emoji</string>
<!-- Title of the setting to set clipboard toolbar keys --> <!-- Title of the setting to set clipboard toolbar keys -->
<string name="clipboard_toolbar_keys">Select clipboard toolbar keys</string> <string name="clipboard_toolbar_keys">Select clipboard toolbar keys</string>
<!-- Title of the setting to set pinned toolbar keys --> <!-- Title of the setting to set pinned toolbar keys -->