fenix
/
Simple-Keyboard
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate code

This commit is contained in:
Jacob Kapitein 2022-08-03 18:24:40 +02:00
parent b31a5c2298
commit d39ce2bb91
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
View File

@ -248,12 +248,7 @@ class MyKeyboard {
mDefaultHorizontalGap = 0 mDefaultHorizontalGap = 0
mDefaultWidth = mDisplayWidth / 10 mDefaultWidth = mDisplayWidth / 10
mDefaultHeight = mDefaultWidth mDefaultHeight = mDefaultWidth
mKeyboardHeightMultiplier = when (context.config.keyboardHeightMultiplier) { mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightMultiplier);
KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1F
KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
else -> 1F
}
mKeys = ArrayList() mKeys = ArrayList()
mEnterKeyType = enterKeyType mEnterKeyType = enterKeyType
loadKeyboard(context, context.resources.getXml(xmlLayoutResId)) loadKeyboard(context, context.resources.getXml(xmlLayoutResId))
@ -277,12 +272,7 @@ class MyKeyboard {
row.defaultHeight = mDefaultHeight row.defaultHeight = mDefaultHeight
row.defaultWidth = keyWidth row.defaultWidth = keyWidth
row.defaultHorizontalGap = mDefaultHorizontalGap row.defaultHorizontalGap = mDefaultHorizontalGap
mKeyboardHeightMultiplier = when (context.config.keyboardHeightMultiplier) { mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightMultiplier);
KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1F
KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
else -> 1F
}
characters.forEachIndexed { index, character -> characters.forEachIndexed { index, character ->
val key = Key(row) val key = Key(row)
@ -393,4 +383,13 @@ class MyKeyboard {
mDefaultHorizontalGap = getDimensionOrFraction(a, R.styleable.MyKeyboard_horizontalGap, mDisplayWidth, 0) mDefaultHorizontalGap = getDimensionOrFraction(a, R.styleable.MyKeyboard_horizontalGap, mDisplayWidth, 0)
a.recycle() a.recycle()
} }
private fun getKeyboardHeightMultiplier(multiplierType: Int): Float {
return when(multiplierType) {
KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1.0F
KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
else -> 1.0F
}
}
} }