fenix/Simple-Keyboard
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git synced 2025-02-17 04:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

lets always recreate the preview popup to avoid some glitches

Browse Source
This commit is contained in:
tibbi 2022-02-02 19:29:23 +01:00
parent 0c6259343e
commit 8cd4ccde78
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private const val MSG_REMOVE_PREVIEW = 1 private const val MSG_REMOVE_PREVIEW = 1
private const val MSG_REPEAT = 2 private const val MSG_REPEAT = 2
private const val MSG_LONGPRESS = 3 private const val MSG_LONGPRESS = 3
private const val DELAY_AFTER_PREVIEW = 70 private const val DELAY_AFTER_PREVIEW = 100
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
@ -778,12 +778,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
if (key.icon != null) { if (key.icon != null) {
mPreviewText!!.setCompoundDrawables(null, null, null, key.icon) mPreviewText!!.setCompoundDrawables(null, null, null, key.icon)
} else { } else {
mPreviewText!!.setCompoundDrawables(null, null, null, null)
try {
mPreviewText!!.text = adjustCase(key.label)
} catch (ignored: Exception) {
}
if (key.label.length > 1) { if (key.label.length > 1) {
mPreviewText!!.setTextSize(TypedValue.COMPLEX_UNIT_PX, mKeyTextSize.toFloat()) mPreviewText!!.setTextSize(TypedValue.COMPLEX_UNIT_PX, mKeyTextSize.toFloat())
mPreviewText!!.typeface = Typeface.DEFAULT_BOLD mPreviewText!!.typeface = Typeface.DEFAULT_BOLD
@ -791,13 +785,19 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
mPreviewText!!.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSizeLarge.toFloat()) mPreviewText!!.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSizeLarge.toFloat())
mPreviewText!!.typeface = Typeface.DEFAULT mPreviewText!!.typeface = Typeface.DEFAULT
} }
mPreviewText!!.setCompoundDrawables(null, null, null, null)
try {
mPreviewText!!.text = adjustCase(key.label)
} catch (ignored: Exception) {
}
} }
val previewBackground = mPreviewText!!.background as LayerDrawable val previewBackground = mPreviewText!!.background as LayerDrawable
previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(mBackgroundColor.darkenColor(4)) previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(mBackgroundColor.darkenColor(4))
previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(getPreviewStrokeColor()) previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(getPreviewStrokeColor())
mPreviewText!!.background = previewBackground mPreviewText!!.background = previewBackground
mPreviewText!!.setTextColor(mTextColor) mPreviewText!!.setTextColor(mTextColor)
mPreviewText!!.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)) mPreviewText!!.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
val popupWidth = Math.max(mPreviewText!!.measuredWidth, key.width) val popupWidth = Math.max(mPreviewText!!.measuredWidth, key.width)
@ -837,17 +837,13 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
mPopupPreviewY += popupHeight mPopupPreviewY += popupHeight
} }
previewPopup.dismiss()
if (key.label.isNotEmpty() && key.code != KEYCODE_MODE_CHANGE && key.code != KEYCODE_SHIFT) { if (key.label.isNotEmpty() && key.code != KEYCODE_MODE_CHANGE && key.code != KEYCODE_SHIFT) {
if (previewPopup.isShowing) { previewPopup.width = popupWidth
previewPopup.update(mPopupPreviewX, mPopupPreviewY, popupWidth, popupHeight) previewPopup.height = popupHeight
} else { previewPopup.showAtLocation(mPopupParent, Gravity.NO_GRAVITY, mPopupPreviewX, mPopupPreviewY)
previewPopup.width = popupWidth
previewPopup.height = popupHeight
previewPopup.showAtLocation(mPopupParent, Gravity.NO_GRAVITY, mPopupPreviewX, mPopupPreviewY)
}
mPreviewText!!.visibility = VISIBLE mPreviewText!!.visibility = VISIBLE
} else {
previewPopup.dismiss()
} }
} }