fenix/Simple-Keyboard
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git synced 2025-03-03 19:19:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

use 2 rows at mini keyboard if necessary

Browse Source
This commit is contained in:
tibbi 2022-01-15 18:14:08 +01:00
parent 3c4d2f0ee3
commit ef3eb40f5b
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
View File

@ -3,3 +3,6 @@ package com.simplemobiletools.keyboard.helpers
const val SHIFT_OFF = 0 const val SHIFT_OFF = 0
const val SHIFT_ON_ONE_CHAR = 1 const val SHIFT_ON_ONE_CHAR = 1
const val SHIFT_ON_PERMANENT = 2 const val SHIFT_ON_PERMANENT = 2
// limit the count of alternative characters that show up at long pressing a key
const val MAX_KEYS_PER_MINI_ROW = 5

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

@ -418,11 +418,8 @@ class MyKeyboard {
* @param layoutTemplateResId the layout template file, containing no keys. * @param layoutTemplateResId the layout template file, containing no keys.
* @param characters the list of characters to display on the keyboard. One key will be created * @param characters the list of characters to display on the keyboard. One key will be created
* for each character. * for each character.
* @param columns the number of columns of keys to display. If this number is greater than the
* number of keys that can fit in a row, it will be ignored. If this number is -1, the
* keyboard will fit as many keys as possible in each row.
*/ */
constructor(context: Context, layoutTemplateResId: Int, characters: CharSequence, columns: Int, horizontalPadding: Int) : constructor(context: Context, layoutTemplateResId: Int, characters: CharSequence, horizontalPadding: Int) :
this(context, layoutTemplateResId) { this(context, layoutTemplateResId) {
var x = 0 var x = 0
var y = 0 var y = 0
@ -434,25 +431,21 @@ class MyKeyboard {
row.defaultHorizontalGap = mDefaultHorizontalGap row.defaultHorizontalGap = mDefaultHorizontalGap
row.verticalGap = mDefaultVerticalGap row.verticalGap = mDefaultVerticalGap
row.rowEdgeFlags = EDGE_TOP or EDGE_BOTTOM row.rowEdgeFlags = EDGE_TOP or EDGE_BOTTOM
val maxColumns = if (columns == -1) {
Int.MAX_VALUE
} else {
columns
}
for (element in characters) {
val c = element
if (column >= maxColumns || x + mDefaultWidth + horizontalPadding > mDisplayWidth) {
x = 0
y += mDefaultVerticalGap + mDefaultHeight
column = 0
}
characters.forEachIndexed { index, character ->
val key = Key(row) val key = Key(row)
if (column >= MAX_KEYS_PER_MINI_ROW) {
column = 0
x = 0
y += mDefaultHeight
rows.add(row)
row.mKeys.clear()
}
key.x = x key.x = x
key.y = y key.y = y
key.label = c.toString() key.label = character.toString()
key.codes = arrayListOf(c.toInt()) key.codes = arrayListOf(character.toInt())
column++ column++
x += key.width + key.gap x += key.width + key.gap
mKeys!!.add(key) mKeys!!.add(key)