Skip to content

Commit 9eed398

Browse files
fix: reduced primary icon size and made secondary icon relative to primary icon.
1 parent b14f7c6 commit 9eed398

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -618,14 +618,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
618618
val secondaryIcon = key.secondaryIcon
619619

620620
if (secondaryIcon != null) {
621-
val keyIconWidth = keyIcon.intrinsicWidth
622-
val keyIconHeight = keyIcon.intrinsicWidth
623-
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * .6).toInt()
624-
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * .6).toInt()
625-
626-
val paddingTop = 16 // Add padding top to secondaryIcon
627-
secondaryIcon.setBounds(key.width - secondaryIconWidth, paddingTop, key.width, secondaryIconHeight + paddingTop)
628-
secondaryIcon.draw(canvas)
621+
val keyIconWidth = (keyIcon.intrinsicWidth * .8).toInt()
622+
val keyIconHeight = (keyIcon.intrinsicWidth * .8).toInt()
623+
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * .4).toInt()
624+
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * .4).toInt()
629625

630626
val drawableX = (key.width - keyIconWidth) / 2
631627
val drawableY = (key.height - keyIconHeight) / 2
@@ -634,6 +630,17 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
634630

635631
keyIcon.setBounds(0, 0, keyIconWidth, keyIconHeight)
636632
keyIcon.draw(canvas)
633+
634+
val secIconPaddingBottom = 8
635+
val secIconPaddingRight = 4
636+
secondaryIcon.setBounds(
637+
keyIconWidth - secIconPaddingRight,
638+
-secIconPaddingBottom,
639+
(keyIconWidth + secondaryIconWidth) - secIconPaddingRight,
640+
secondaryIconHeight - secIconPaddingBottom
641+
)
642+
secondaryIcon.draw(canvas)
643+
637644
canvas.translate(-drawableX.toFloat(), -drawableY.toFloat())
638645
} else {
639646
val drawableX = (key.width - keyIcon.intrinsicWidth) / 2

0 commit comments

Comments
 (0)