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

some more cleanup

This commit is contained in:
tibbi 2022-01-21 18:15:16 +01:00
parent d095e36912
commit 048ba00eb4
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
View File

@ -93,7 +93,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
var onKeyboardActionListener: OnKeyboardActionListener? = null var onKeyboardActionListener: OnKeyboardActionListener? = null
private var mVerticalCorrection = 0 private var mVerticalCorrection = 0
private var mProximityThreshold = 0 private var mProximityThreshold = 0
private val mPreviewCentered = false
/** /**
* Returns the enabled state of the key feedback popup. * Returns the enabled state of the key feedback popup.
* @return whether or not the key feedback popup is enabled * @return whether or not the key feedback popup is enabled
@ -109,8 +108,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private var mPopupPreviewY = 0 private var mPopupPreviewY = 0
private var mLastX = 0 private var mLastX = 0
private var mLastY = 0 private var mLastY = 0
private var mStartX = 0
private var mStartY = 0
/** /**
* Returns true if proximity correction is enabled. * Returns true if proximity correction is enabled.
*/ */
@ -128,18 +125,16 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private var mLastCodeX = 0 private var mLastCodeX = 0
private var mLastCodeY = 0 private var mLastCodeY = 0
private var mCurrentKey: Int = NOT_A_KEY private var mCurrentKey: Int = NOT_A_KEY
private var mDownKey: Int = NOT_A_KEY private var mLastKeyTime = 0L
private var mLastKeyTime: Long = 0 private var mCurrentKeyTime = 0L
private var mCurrentKeyTime: Long = 0
private val mKeyIndices = IntArray(12) private val mKeyIndices = IntArray(12)
private var mPopupX = 0 private var mPopupX = 0
private var mPopupY = 0 private var mPopupY = 0
private var mRepeatKeyIndex: Int = NOT_A_KEY private var mRepeatKeyIndex = NOT_A_KEY
private var mPopupLayout = 0 private var mPopupLayout = 0
private var mAbortKey = false private var mAbortKey = false
private var mInvalidatedKey: MyKeyboard.Key? = null private var mInvalidatedKey: MyKeyboard.Key? = null
private val mClipRegion = Rect(0, 0, 0, 0) private val mClipRegion = Rect(0, 0, 0, 0)
private var mPossiblePoly = false
private var mIsLongPressingSpace = false private var mIsLongPressingSpace = false
private var mLastSpaceMoveX = 0 private var mLastSpaceMoveX = 0
private var mPopupMaxMoveDistance = 0f private var mPopupMaxMoveDistance = 0f
@ -770,14 +765,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
lp?.width = popupWidth lp?.width = popupWidth
lp?.height = popupHeight lp?.height = popupHeight
if (!mPreviewCentered) {
mPopupPreviewX = key.x - mPreviewText!!.paddingLeft + paddingLeft mPopupPreviewX = key.x - mPreviewText!!.paddingLeft + paddingLeft
mPopupPreviewY = key.y - popupHeight mPopupPreviewY = key.y - popupHeight
} else {
// TODO: Fix this if centering is brought back
mPopupPreviewX = 160 - mPreviewText!!.measuredWidth / 2
mPopupPreviewY = -mPreviewText!!.measuredHeight
}
mHandler!!.removeMessages(MSG_REMOVE_PREVIEW) mHandler!!.removeMessages(MSG_REMOVE_PREVIEW)
getLocationInWindow(mCoordinates) getLocationInWindow(mCoordinates)
@ -1020,21 +1009,21 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
if (pointerCount == 1) { if (pointerCount == 1) {
// Send a down event for the latest pointer // Send a down event for the latest pointer
val down = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, me.x, me.y, me.metaState) val down = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, me.x, me.y, me.metaState)
result = onModifiedTouchEvent(down, false) result = onModifiedTouchEvent(down)
down.recycle() down.recycle()
// If it's an up action, then deliver the up as well. // If it's an up action, then deliver the up as well.
if (action == MotionEvent.ACTION_UP) { if (action == MotionEvent.ACTION_UP) {
result = onModifiedTouchEvent(me, true) result = onModifiedTouchEvent(me)
} }
} else { } else {
// Send an up event for the last pointer // Send an up event for the last pointer
val up = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, mOldPointerX, mOldPointerY, me.metaState) val up = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, mOldPointerX, mOldPointerY, me.metaState)
result = onModifiedTouchEvent(up, true) result = onModifiedTouchEvent(up)
up.recycle() up.recycle()
} }
} else { } else {
if (pointerCount == 1) { if (pointerCount == 1) {
result = onModifiedTouchEvent(me, false) result = onModifiedTouchEvent(me)
mOldPointerX = me.x mOldPointerX = me.x
mOldPointerY = me.y mOldPointerY = me.y
} else { } else {
@ -1100,7 +1089,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
return result return result
} }
private fun onModifiedTouchEvent(me: MotionEvent, possiblePoly: Boolean): Boolean { private fun onModifiedTouchEvent(me: MotionEvent): Boolean {
var touchX = me.x.toInt() - paddingLeft var touchX = me.x.toInt() - paddingLeft
var touchY = me.y.toInt() - paddingTop var touchY = me.y.toInt() - paddingTop
if (touchY >= -mVerticalCorrection) { if (touchY >= -mVerticalCorrection) {
@ -1110,7 +1099,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val action = me.action val action = me.action
val eventTime = me.eventTime val eventTime = me.eventTime
val keyIndex = getKeyIndices(touchX, touchY, null) val keyIndex = getKeyIndices(touchX, touchY, null)
mPossiblePoly = possiblePoly
// Ignore all motion events until a DOWN. // Ignore all motion events until a DOWN.
if (mAbortKey && action != MotionEvent.ACTION_DOWN && action != MotionEvent.ACTION_CANCEL) { if (mAbortKey && action != MotionEvent.ACTION_DOWN && action != MotionEvent.ACTION_CANCEL) {
@ -1126,15 +1114,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
when (action) { when (action) {
MotionEvent.ACTION_DOWN -> { MotionEvent.ACTION_DOWN -> {
mAbortKey = false mAbortKey = false
mStartX = touchX
mStartY = touchY
mLastCodeX = touchX mLastCodeX = touchX
mLastCodeY = touchY mLastCodeY = touchY
mLastKeyTime = 0 mLastKeyTime = 0
mCurrentKeyTime = 0 mCurrentKeyTime = 0
mLastKey = NOT_A_KEY mLastKey = NOT_A_KEY
mCurrentKey = keyIndex mCurrentKey = keyIndex
mDownKey = keyIndex
mDownTime = me.eventTime mDownTime = me.eventTime
mLastMoveTime = mDownTime mLastMoveTime = mDownTime
checkMultiTap(eventTime, keyIndex) checkMultiTap(eventTime, keyIndex)