n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automatically add morekeys_misc and actions based on morekeys and qwertysyms

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-07-24 21:33:30 +03:00
parent db82511d92
commit 5c025bec86
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
View File

@ -51,6 +51,36 @@ private fun getKind(moreKey: String): LongPressKey? {
} }
} }
val alphabet = "abcdefghijklmnopqrstuvwxyz".toSet()
private fun getBestMatchForMisc(moreKeys: List<String>): String? {
if(moreKeys.any { getKind(it) == LongPressKey.MiscLetters }) return null
return moreKeys.firstOrNull { getKind(it) == LongPressKey.LanguageKeys }?.let {
val k = it.replace("!text/morekeys_", "")
if(k.length == 1 && alphabet.contains(k[0])) {
"!text/morekeys_misc_$k"
} else {
null
}
}
}
private fun getBestMatchForAction(moreKeys: List<String>): String? {
if(moreKeys.any { getKind(it) == LongPressKey.QuickActions }) return null
return moreKeys.firstOrNull { getKind(it) == LongPressKey.Symbols }?.let {
val k = it.replace("!text/qwertysyms_", "")
if(k.length == 1 && alphabet.contains(k[0])) {
"!text/actions_$k"
} else {
null
}
}
}
val LongPressKeyLayoutSetting = SettingsKey( val LongPressKeyLayoutSetting = SettingsKey(
stringPreferencesKey("longPressKeyOrdering"), stringPreferencesKey("longPressKeyOrdering"),
"${LongPressKey.Numbers.ordinal},${LongPressKey.LanguageKeys.ordinal},${LongPressKey.Symbols.ordinal},${LongPressKey.QuickActions.ordinal},${LongPressKey.MiscLetters.ordinal}" "${LongPressKey.Numbers.ordinal},${LongPressKey.LanguageKeys.ordinal},${LongPressKey.Symbols.ordinal},${LongPressKey.QuickActions.ordinal},${LongPressKey.MiscLetters.ordinal}"
@ -74,7 +104,10 @@ class LongPressKeySettings(val context: Context) {
private val currentSetting = context.getSettingBlocking(LongPressKeyLayoutSetting).toLongPressKeyLayoutItems() private val currentSetting = context.getSettingBlocking(LongPressKeyLayoutSetting).toLongPressKeyLayoutItems()
fun reorderMoreKeys(moreKeys: String): String { fun reorderMoreKeys(moreKeys: String): String {
val keys = MoreKeySpec.splitKeySpecs(moreKeys)?.toList() ?: listOf(moreKeys) val keys = (MoreKeySpec.splitKeySpecs(moreKeys)?.toList() ?: listOf(moreKeys)).toMutableList()
getBestMatchForMisc(keys)?.let { keys.add(it) }
getBestMatchForAction(keys)?.let { keys.add(it) }
val finalKeys = mutableListOf<String>() val finalKeys = mutableListOf<String>()