fenix/Simple-Keyboard
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git synced 2025-06-05 21:49:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix key presses

Browse Source
This commit is contained in:
tibbi
2022-01-09 12:25:37 +01:00
parent d82a72b32d
commit 12a83947a5
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import android.content.res.Resources
import android.content.res.TypedArray import android.content.res.TypedArray
import android.content.res.XmlResourceParser import android.content.res.XmlResourceParser
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.util.SparseArray
import android.util.TypedValue import android.util.TypedValue
import android.util.Xml import android.util.Xml
import androidx.annotation.XmlRes import androidx.annotation.XmlRes
@ -96,7 +97,7 @@ class MyKeyboard {
private var mKeyboardMode = 0 private var mKeyboardMode = 0
private var mCellWidth = 0 private var mCellWidth = 0
private var mCellHeight = 0 private var mCellHeight = 0
private var mGridNeighbors = ArrayList<IntArray?>() private var mGridNeighbors: SparseArray<IntArray?>? = null
private var mProximityThreshold = 0 private var mProximityThreshold = 0
private val rows = ArrayList<Row?>() private val rows = ArrayList<Row?>()
@ -578,7 +579,7 @@ class MyKeyboard {
// Round-up so we don't have any pixels outside the grid // Round-up so we don't have any pixels outside the grid
mCellWidth = (minWidth + GRID_WIDTH - 1) / GRID_WIDTH mCellWidth = (minWidth + GRID_WIDTH - 1) / GRID_WIDTH
mCellHeight = (height + GRID_HEIGHT - 1) / GRID_HEIGHT mCellHeight = (height + GRID_HEIGHT - 1) / GRID_HEIGHT
mGridNeighbors = ArrayList<IntArray?>() mGridNeighbors = SparseArray<IntArray?>(GRID_SIZE)
val indices = IntArray(mKeys!!.size) val indices = IntArray(mKeys!!.size)
val gridWidth: Int = GRID_WIDTH * mCellWidth val gridWidth: Int = GRID_WIDTH * mCellWidth
val gridHeight: Int = GRID_HEIGHT * mCellHeight val gridHeight: Int = GRID_HEIGHT * mCellHeight
@ -597,9 +598,10 @@ class MyKeyboard {
indices[count++] = i indices[count++] = i
} }
} }
val cell = IntArray(count) val cell = IntArray(count)
System.arraycopy(indices, 0, cell, 0, count) System.arraycopy(indices, 0, cell, 0, count)
mGridNeighbors[y / mCellHeight * GRID_WIDTH + x / mCellWidth] = cell mGridNeighbors!!.put(y / mCellHeight * GRID_WIDTH + x / mCellWidth, cell)
y += mCellHeight y += mCellHeight
} }
x += mCellWidth x += mCellWidth
@ -614,12 +616,16 @@ class MyKeyboard {
* point is out of range, then an array of size zero is returned. * point is out of range, then an array of size zero is returned.
*/ */
fun getNearestKeys(x: Int, y: Int): IntArray { fun getNearestKeys(x: Int, y: Int): IntArray {
/*if (x in 0 until minWidth && y >= 0 && y < height) { if (mGridNeighbors == null) {
val index: Int = y / mCellHeight * GRID_WIDTH + x / mCellWidth computeNearestNeighbors()
}
if (x in 0 until minWidth && y >= 0 && y < height) {
val index = y / mCellHeight * GRID_WIDTH + x / mCellWidth
if (index < GRID_SIZE) { if (index < GRID_SIZE) {
return mGridNeighbors[index]!! return mGridNeighbors!![index]!!
} }
}*/ }
return IntArray(0) return IntArray(0)
} }