wbrawner/Simple-Keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing a magic number

Browse source
This commit is contained in:
tibbi 2022-01-22 09:06:53 +01:00
parent a51192ab9a
commit 430fdb5881
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
View file

@ -163,6 +163,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private const val DEBOUNCE_TIME = 70 private const val DEBOUNCE_TIME = 70
private const val REPEAT_INTERVAL = 50 // ~20 keys per second private const val REPEAT_INTERVAL = 50 // ~20 keys per second
private const val REPEAT_START_DELAY = 400 private const val REPEAT_START_DELAY = 400
private const val GENERIC_KEY = -100
private val LONGPRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout() private val LONGPRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout()
private const val MAX_NEARBY_KEYS = 12 private const val MAX_NEARBY_KEYS = 12
} }
@ -390,9 +391,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val paint = mPaint val paint = mPaint
val keys = mKeys val keys = mKeys
paint.color = mTextColor paint.color = mTextColor
val smallLetterPaint = Paint() val smallLetterPaint = Paint().apply {
smallLetterPaint.set(paint) set(paint)
smallLetterPaint.apply {
color = paint.color.adjustAlpha(0.8f) color = paint.color.adjustAlpha(0.8f)
textSize = mTopSmallNumberSize textSize = mTopSmallNumberSize
typeface = Typeface.DEFAULT typeface = Typeface.DEFAULT
@ -402,7 +402,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val keyCount = keys.size val keyCount = keys.size
for (i in 0 until keyCount) { for (i in 0 until keyCount) {
val key = keys[i] val key = keys[i]
val code = key.codes.firstOrNull() ?: -100 val code = key.codes.firstOrNull() ?: GENERIC_KEY
var keyBackground = mKeyBackground var keyBackground = mKeyBackground
if (code == KEYCODE_SPACE) { if (code == KEYCODE_SPACE) {
keyBackground = resources.getDrawable(R.drawable.keyboard_space_background, context.theme) keyBackground = resources.getDrawable(R.drawable.keyboard_space_background, context.theme)
@ -581,7 +581,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
if (mCurrentKeyIndex != NOT_A_KEY && keys.size > mCurrentKeyIndex) { if (mCurrentKeyIndex != NOT_A_KEY && keys.size > mCurrentKeyIndex) {
val newKey = keys[mCurrentKeyIndex] val newKey = keys[mCurrentKeyIndex]
val code = newKey.codes.firstOrNull() ?: -100 val code = newKey.codes.firstOrNull() ?: GENERIC_KEY
if (code == KEYCODE_SHIFT || code == KEYCODE_MODE_CHANGE || code == KEYCODE_DELETE || code == KEYCODE_ENTER || code == KEYCODE_SPACE) { if (code == KEYCODE_SHIFT || code == KEYCODE_MODE_CHANGE || code == KEYCODE_DELETE || code == KEYCODE_ENTER || code == KEYCODE_SPACE) {
newKey.pressed = true newKey.pressed = true
} }