Fix emoji palette bottom bar colors

esensar · esensar · commit 8137b71a32a2 · 2023-08-30T15:28:00.000+02:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -1474,17 +1474,16 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
             emojiPaletteLabel.setTextColor(textColor)
 
             emojiPaletteBottomBar.background = ColorDrawable(backgroundColor)
-            val bottomTextColor = textColor.darkenColor()
             emojiPaletteModeChange.apply {
-                setTextColor(bottomTextColor)
+                setTextColor(textColor)
                 setOnClickListener {
                     vibrateIfNeeded()
                     closeEmojiPalette()
                 }
             }
 
             emojiPaletteBackspace.apply {
-                applyColorFilter(bottomTextColor)
+                applyColorFilter(textColor)
                 setOnTouchListener { _, event ->
                     when (event.action) {
                         MotionEvent.ACTION_DOWN -> {
@@ -1560,7 +1559,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
             allItems.addAll(emojis.map(EmojisAdapter.Item::Emoji))
         }
         val checkIds = mutableMapOf<Int, String>()
-        val inactiveColor = mTextColor.darkenColor()
         keyboardViewBinding?.emojiCategoriesStrip?.apply {
             weightSum = categories.count().toFloat()
             val strip = this
@@ -1577,7 +1575,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
                     )
                     root.setOnClickListener {
                         strip.children.filterIsInstance<ImageButton>().forEach {
-                            it.imageTintList = ColorStateList.valueOf(inactiveColor)
+                            it.imageTintList = ColorStateList.valueOf(mTextColor)
                         }
                         root.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor())
                         keyboardViewBinding?.emojisList?.stopScroll()
@@ -1586,7 +1584,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
                             0
                         )
                     }
-                    root.imageTintList = ColorStateList.valueOf(inactiveColor)
+                    root.imageTintList = ColorStateList.valueOf(mTextColor)
                 }
             }
         }
@@ -1622,7 +1620,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
                                 if (it.id == id) {
                                     it.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor())
                                 } else {
-                                    it.imageTintList = ColorStateList.valueOf(inactiveColor)
+                                    it.imageTintList = ColorStateList.valueOf(mTextColor)
                                 }
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -1474,17 +1474,16 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut`
`1474`	`1474`	`emojiPaletteLabel.setTextColor(textColor)`
`1475`	`1475`
`1476`	`1476`	`emojiPaletteBottomBar.background = ColorDrawable(backgroundColor)`
`1477`		`- val bottomTextColor = textColor.darkenColor()`
`1478`	`1477`	`emojiPaletteModeChange.apply {`
`1479`		`- setTextColor(bottomTextColor)`
	`1478`	`+ setTextColor(textColor)`
`1480`	`1479`	`setOnClickListener {`
`1481`	`1480`	`vibrateIfNeeded()`
`1482`	`1481`	`closeEmojiPalette()`
`1483`	`1482`	`}`
`1484`	`1483`	`}`
`1485`	`1484`
`1486`	`1485`	`emojiPaletteBackspace.apply {`
`1487`		`- applyColorFilter(bottomTextColor)`
	`1486`	`+ applyColorFilter(textColor)`
`1488`	`1487`	`setOnTouchListener { _, event ->`
`1489`	`1488`	`when (event.action) {`
`1490`	`1489`	`MotionEvent.ACTION_DOWN -> {`
`@@ -1560,7 +1559,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut`
`1560`	`1559`	`allItems.addAll(emojis.map(EmojisAdapter.Item::Emoji))`
`1561`	`1560`	`}`
`1562`	`1561`	`val checkIds = mutableMapOf<Int, String>()`
`1563`		`- val inactiveColor = mTextColor.darkenColor()`
`1564`	`1562`	`keyboardViewBinding?.emojiCategoriesStrip?.apply {`
`1565`	`1563`	`weightSum = categories.count().toFloat()`
`1566`	`1564`	`val strip = this`
`@@ -1577,7 +1575,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut`
`1577`	`1575`	`)`
`1578`	`1576`	`root.setOnClickListener {`
`1579`	`1577`	`strip.children.filterIsInstance<ImageButton>().forEach {`
`1580`		`- it.imageTintList = ColorStateList.valueOf(inactiveColor)`
	`1578`	`+ it.imageTintList = ColorStateList.valueOf(mTextColor)`
`1581`	`1579`	`}`
`1582`	`1580`	`root.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor())`
`1583`	`1581`	`keyboardViewBinding?.emojisList?.stopScroll()`
`@@ -1586,7 +1584,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut`
`1586`	`1584`	`0`
`1587`	`1585`	`)`
`1588`	`1586`	`}`
`1589`		`- root.imageTintList = ColorStateList.valueOf(inactiveColor)`
	`1587`	`+ root.imageTintList = ColorStateList.valueOf(mTextColor)`
`1590`	`1588`	`}`
`1591`	`1589`	`}`
`1592`	`1590`	`}`
`@@ -1622,7 +1620,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut`
`1622`	`1620`	`if (it.id == id) {`
`1623`	`1621`	`it.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor())`
`1624`	`1622`	`} else {`
`1625`		`- it.imageTintList = ColorStateList.valueOf(inactiveColor)`
	`1623`	`+ it.imageTintList = ColorStateList.valueOf(mTextColor)`
`1626`	`1624`	`}`
`1627`	`1625`	`}`
`1628`	`1626`	`}`