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

fix: reduced primary icon size and made secondary icon relative to primary icon.

This commit is contained in:
ismailnurudeen 2023-02-10 10:42:55 +01:00
parent b14f7c67cc
commit 9eed3982e0
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,14 +618,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val secondaryIcon = key.secondaryIcon
if (secondaryIcon != null) {
val keyIconWidth = keyIcon.intrinsicWidth
val keyIconHeight = keyIcon.intrinsicWidth
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * .6).toInt()
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * .6).toInt()
val paddingTop = 16 // Add padding top to secondaryIcon
secondaryIcon.setBounds(key.width - secondaryIconWidth, paddingTop, key.width, secondaryIconHeight + paddingTop)
secondaryIcon.draw(canvas)
val keyIconWidth = (keyIcon.intrinsicWidth * .8).toInt()
val keyIconHeight = (keyIcon.intrinsicWidth * .8).toInt()
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * .4).toInt()
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * .4).toInt()
val drawableX = (key.width - keyIconWidth) / 2
val drawableY = (key.height - keyIconHeight) / 2
@ -634,6 +630,17 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
keyIcon.setBounds(0, 0, keyIconWidth, keyIconHeight)
keyIcon.draw(canvas)
val secIconPaddingBottom = 8
val secIconPaddingRight = 4
secondaryIcon.setBounds(
keyIconWidth - secIconPaddingRight,
-secIconPaddingBottom,
(keyIconWidth + secondaryIconWidth) - secIconPaddingRight,
secondaryIconHeight - secIconPaddingBottom
)
secondaryIcon.draw(canvas)
canvas.translate(-drawableX.toFloat(), -drawableY.toFloat())
} else {
val drawableX = (key.width - keyIcon.intrinsicWidth) / 2