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

always set AllowRedundantPopupKeys in the same place

Browse source
This commit is contained in:
Helium314 2024-05-12 19:06:04 +02:00
parent 3862d1e9b2
commit 1d1e0cc987
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardBuilder.kt
View file

@ -43,19 +43,18 @@ open class KeyboardBuilder<KP : KeyboardParams>(protected val mContext: Context,
mParams.GRID_HEIGHT = res.getInteger(R.integer.config_keyboard_grid_height) mParams.GRID_HEIGHT = res.getInteger(R.integer.config_keyboard_grid_height)
} }
fun setAllowRedundantPopupKeys(enabled: Boolean) {
mParams.mAllowRedundantPopupKeys = enabled
}
fun load(id: KeyboardId): KeyboardBuilder<KP> { fun load(id: KeyboardId): KeyboardBuilder<KP> {
mParams.mId = id mParams.mId = id
if (id.isEmojiKeyboard) { if (id.isEmojiKeyboard) {
setAllowRedundantPopupKeys(true) mParams.mAllowRedundantPopupKeys = true
readAttributes(R.xml.kbd_emoji) readAttributes(R.xml.kbd_emoji)
keysInRows = EmojiParser(mParams, mContext).parse() keysInRows = EmojiParser(mParams, mContext).parse()
} else { } else {
try { try {
val sv = Settings.getInstance().current val sv = Settings.getInstance().current
// previously was false for nordic and serbian_qwertz, true for all others
// todo: add setting? maybe users want it in a custom layout
mParams.mAllowRedundantPopupKeys = mParams.mId.mElementId != KeyboardId.ELEMENT_SYMBOLS
addLocaleKeyTextsToParams(mContext, mParams, sv.mShowMorePopupKeys) addLocaleKeyTextsToParams(mContext, mParams, sv.mShowMorePopupKeys)
mParams.mPopupKeyTypes.addAll(sv.mPopupKeyTypes) mParams.mPopupKeyTypes.addAll(sv.mPopupKeyTypes)
// add label source only if popup key type enabled // add label source only if popup key type enabled

6
app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
View file

@ -63,7 +63,6 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
fun parseLayoutString(layoutContent: String): ArrayList<ArrayList<KeyParams>> { fun parseLayoutString(layoutContent: String): ArrayList<ArrayList<KeyParams>> {
params.readAttributes(context, null) params.readAttributes(context, null)
params.mProximityCharsCorrectionEnabled = infos.enableProximityCharsCorrection params.mProximityCharsCorrectionEnabled = infos.enableProximityCharsCorrection
params.mAllowRedundantPopupKeys = infos.allowRedundantPopupKeys
if (infos.touchPositionCorrectionData == null) // need to set correctly, as it's not properly done in readAttributes with attr = null if (infos.touchPositionCorrectionData == null) // need to set correctly, as it's not properly done in readAttributes with attr = null
params.mTouchPositionCorrection.load(emptyArray()) params.mTouchPositionCorrection.load(emptyArray())
else else
@ -551,7 +550,6 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
params.mId.mElementId == KeyboardId.ELEMENT_ALPHABET params.mId.mElementId == KeyboardId.ELEMENT_ALPHABET
else -> true else -> true
} }
val allowRedundantPopupKeys = params.mId.mElementId != KeyboardId.ELEMENT_SYMBOLS // todo: always set to false?
// essentially this is default for 4 row and non-alphabet layouts, maybe this could be determined automatically instead of using a list // essentially this is default for 4 row and non-alphabet layouts, maybe this could be determined automatically instead of using a list
// todo: check the difference between default (i.e. none) and holo (test behavior on keyboard) // todo: check the difference between default (i.e. none) and holo (test behavior on keyboard)
val touchPositionCorrectionData = if (params.mId.isAlphabetKeyboard && layout in listOf("armenian_phonetic", "khmer", "lao", "malayalam", "pcqwerty", "thai")) val touchPositionCorrectionData = if (params.mId.isAlphabetKeyboard && layout in listOf("armenian_phonetic", "khmer", "lao", "malayalam", "pcqwerty", "thai"))
@ -561,7 +559,7 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
val hasShiftKey = !params.mId.isAlphabetKeyboard val hasShiftKey = !params.mId.isAlphabetKeyboard
|| layout !in listOf("hindi_compact", "bengali", "arabic", "arabic_pc", "hebrew", "kannada", "kannada_extended","malayalam", "marathi", "farsi", "tamil", "telugu") || layout !in listOf("hindi_compact", "bengali", "arabic", "arabic_pc", "hebrew", "kannada", "kannada_extended","malayalam", "marathi", "farsi", "tamil", "telugu")
val numbersOnTopRow = layout !in listOf("pcqwerty", "lao", "thai", "korean_sebeolsik_390", "korean_sebeolsik_final") val numbersOnTopRow = layout !in listOf("pcqwerty", "lao", "thai", "korean_sebeolsik_390", "korean_sebeolsik_final")
return LayoutInfos(enableProximityCharsCorrection, allowRedundantPopupKeys, touchPositionCorrectionData, hasShiftKey, numbersOnTopRow) return LayoutInfos(enableProximityCharsCorrection, touchPositionCorrectionData, hasShiftKey, numbersOnTopRow)
} }
} }
@ -572,8 +570,6 @@ data class LayoutInfos(
// disabled by default, but enabled for all alphabet layouts // disabled by default, but enabled for all alphabet layouts
// currently set in keyboardLayoutSet // currently set in keyboardLayoutSet
val enableProximityCharsCorrection: Boolean = false, val enableProximityCharsCorrection: Boolean = false,
// previously was false for nordic and serbian_qwertz, true for all others
val allowRedundantPopupKeys: Boolean = true,
// there is holo, default and null // there is holo, default and null
// null only for popupKeys keyboard // null only for popupKeys keyboard
val touchPositionCorrectionData: Int? = null, val touchPositionCorrectionData: Int? = null,