From 30759e301e6419235a1c18ed2b1f7d10269c4996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 28 Aug 2023 10:54:30 +0200 Subject: [PATCH 1/9] Add emoji categories to emoji list This closes #229 --- .../keyboard/adapters/EmojisAdapter.kt | 51 ++++++++++--- .../keyboard/helpers/EmojiHelper.kt | 32 +++++++- .../keyboard/views/MyKeyboardView.kt | 75 +++++++++++++++++-- .../drawable/ic_emoji_category_activities.xml | 5 ++ .../drawable/ic_emoji_category_animals.xml | 6 ++ .../res/drawable/ic_emoji_category_flags.xml | 5 ++ .../res/drawable/ic_emoji_category_food.xml | 6 ++ .../drawable/ic_emoji_category_objects.xml | 5 ++ .../res/drawable/ic_emoji_category_people.xml | 6 ++ .../drawable/ic_emoji_category_smileys.xml | 5 ++ .../drawable/ic_emoji_category_symbols.xml | 11 +++ .../res/drawable/ic_emoji_category_travel.xml | 5 ++ app/src/main/res/layout/emoji_list.xml | 8 ++ .../main/res/layout/item_emoji_category.xml | 10 +++ .../res/layout/keyboard_view_keyboard.xml | 17 +++++ app/src/main/res/values/dimens.xml | 2 + 16 files changed, 230 insertions(+), 19 deletions(-) create mode 100644 app/src/main/res/drawable/ic_emoji_category_activities.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_animals.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_flags.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_food.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_objects.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_people.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_smileys.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_symbols.xml create mode 100644 app/src/main/res/drawable/ic_emoji_category_travel.xml create mode 100644 app/src/main/res/layout/emoji_list.xml create mode 100644 app/src/main/res/layout/item_emoji_category.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt index 48b7b167c..b27f20a14 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt @@ -6,39 +6,72 @@ import android.view.View import android.view.ViewGroup import androidx.emoji2.text.EmojiCompat import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.commons.databinding.DividerBinding +import com.simplemobiletools.commons.extensions.beInvisible import com.simplemobiletools.keyboard.databinding.ItemEmojiBinding +import com.simplemobiletools.keyboard.helpers.EmojiData -class EmojisAdapter(val context: Context, var items: List, val itemClick: (emoji: String) -> Unit) : RecyclerView.Adapter() { +class EmojisAdapter(val context: Context, private val items: List, val itemClick: (emoji: EmojiData) -> Unit) : + RecyclerView.Adapter() { private val layoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EmojisAdapter.ViewHolder { - val view = ItemEmojiBinding.inflate(layoutInflater, parent, false).root - return ViewHolder(view) + return when (viewType) { + ITEM_TYPE_EMOJI -> { + val view = ItemEmojiBinding.inflate(layoutInflater, parent, false).root + ViewHolder(view) + } + + else -> { + val view = DividerBinding.inflate(layoutInflater, parent, false).root.apply { beInvisible() } + ViewHolder(view) + } + } } override fun onBindViewHolder(holder: EmojisAdapter.ViewHolder, position: Int) { val item = items[position] - holder.bindView(item) { itemView -> - setupEmoji(itemView, item) + if (item is Item.Emoji) { + holder.bindView(item) { itemView -> + setupEmoji(itemView, item) + } + } + } + + override fun getItemViewType(position: Int): Int { + return if (items[position] is Item.Emoji) { + ITEM_TYPE_EMOJI + } else { + ITEM_TYPE_CATEGORY } } override fun getItemCount() = items.size - private fun setupEmoji(view: View, emoji: String) { - val processed = EmojiCompat.get().process(emoji) + private fun setupEmoji(view: View, emoji: Item.Emoji) { + val processed = EmojiCompat.get().process(emoji.value.emoji) ItemEmojiBinding.bind(view).emojiValue.text = processed } inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - fun bindView(emoji: String, callback: (itemView: View) -> Unit): View { + fun bindView(emoji: Item.Emoji, callback: (itemView: View) -> Unit): View { return itemView.apply { callback(this) setOnClickListener { - itemClick.invoke(emoji) + itemClick.invoke(emoji.value) } } } } + + sealed interface Item { + data class Emoji(val value: EmojiData) : Item + data class Category(val value: String) : Item + } + + companion object { + private const val ITEM_TYPE_EMOJI = 0 + private const val ITEM_TYPE_CATEGORY = 1 + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt index 89d622ad3..6e34c6558 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt @@ -1,10 +1,11 @@ package com.simplemobiletools.keyboard.helpers import android.content.Context +import com.simplemobiletools.keyboard.R import org.json.JSONObject import java.io.InputStream -private var cachedEmojiData: MutableList? = null +private var cachedEmojiData: MutableList? = null val cachedVNTelexData: HashMap = HashMap() /** @@ -14,18 +15,21 @@ val cachedVNTelexData: HashMap = HashMap() * @param context The initiating view's context. * @param path The path to the asset file. */ -fun parseRawEmojiSpecsFile(context: Context, path: String): MutableList { +fun parseRawEmojiSpecsFile(context: Context, path: String): MutableList { if (cachedEmojiData != null) { return cachedEmojiData!! } - val emojis = mutableListOf() + val emojis = mutableListOf() var emojiEditorList: MutableList? = null + var category: String? = null fun commitEmojiEditorList() { emojiEditorList?.let { // add only the base emoji for now, ignore the variations - emojis.add(it.first()) + val base = it.first() + val variants = it.drop(1) + emojis.add(EmojiData(category ?: "none", base, variants)) } emojiEditorList = null } @@ -36,6 +40,7 @@ fun parseRawEmojiSpecsFile(context: Context, path: String): MutableList // Comment line } else if (line.startsWith("[")) { commitEmojiEditorList() + category = line.replace("[", "").replace("]", "") } else if (line.trim().isEmpty()) { // Empty line continue @@ -84,3 +89,22 @@ fun parseRawJsonSpecsFile(context: Context, path: String): HashMap +) { + fun getCategoryIcon(): Int = + when (category) { + "people_body" -> R.drawable.ic_emoji_category_people + "animals_nature" -> R.drawable.ic_emoji_category_animals + "food_drink" -> R.drawable.ic_emoji_category_food + "travel_places" -> R.drawable.ic_emoji_category_travel + "activities" -> R.drawable.ic_emoji_category_activities + "objects" -> R.drawable.ic_emoji_category_objects + "symbols" -> R.drawable.ic_emoji_category_symbols + "flags" -> R.drawable.ic_emoji_category_flags + else -> R.drawable.ic_emoji_category_smileys + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index db67102a7..5cf1bd6a7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -7,6 +7,7 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.content.Intent +import android.content.res.ColorStateList import android.graphics.* import android.graphics.Paint.Align import android.graphics.drawable.* @@ -21,6 +22,7 @@ import android.view.animation.AccelerateInterpolator import android.view.inputmethod.EditorInfo import android.widget.LinearLayout import android.widget.PopupWindow +import android.widget.RadioGroup import android.widget.TextView import android.widget.inline.InlineContentView import androidx.annotation.RequiresApi @@ -29,6 +31,9 @@ import androidx.core.animation.doOnStart import androidx.core.view.* import androidx.emoji2.text.EmojiCompat import androidx.emoji2.text.EmojiCompat.EMOJI_SUPPORTED +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup +import androidx.recyclerview.widget.LinearLayoutManager import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.isPiePlus @@ -37,6 +42,7 @@ import com.simplemobiletools.keyboard.activities.ManageClipboardItemsActivity import com.simplemobiletools.keyboard.activities.SettingsActivity import com.simplemobiletools.keyboard.adapters.ClipsKeyboardAdapter import com.simplemobiletools.keyboard.adapters.EmojisAdapter +import com.simplemobiletools.keyboard.databinding.ItemEmojiCategoryBinding import com.simplemobiletools.keyboard.databinding.KeyboardKeyPreviewBinding import com.simplemobiletools.keyboard.databinding.KeyboardPopupKeyboardBinding import com.simplemobiletools.keyboard.databinding.KeyboardViewKeyboardBinding @@ -1529,8 +1535,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } val emojis = fullEmojiList.filter { emoji -> - systemFontPaint.hasGlyph(emoji) || (EmojiCompat.get().loadState == EmojiCompat.LOAD_STATE_SUCCEEDED && EmojiCompat.get() - .getEmojiMatch(emoji, emojiCompatMetadataVersion) == EMOJI_SUPPORTED) + systemFontPaint.hasGlyph(emoji.emoji) || (EmojiCompat.get().loadState == EmojiCompat.LOAD_STATE_SUCCEEDED && EmojiCompat.get() + .getEmojiMatch(emoji.emoji, emojiCompatMetadataVersion) == EMOJI_SUPPORTED) } Handler(Looper.getMainLooper()).post { @@ -1546,19 +1552,76 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } } - private fun setupEmojiAdapter(emojis: List) { + private fun setupEmojiAdapter(emojis: List) { + val categories = emojis.groupBy { it.category } + val allItems = mutableListOf() + categories.entries.forEach { (category, emojis) -> + allItems.add(EmojisAdapter.Item.Category(category)) + allItems.addAll(emojis.map(EmojisAdapter.Item::Emoji)) + } + val checkIds = mutableMapOf() + val checkedChangedListener: (RadioGroup, Int) -> Unit = { _, checkedId -> + (keyboardViewBinding?.emojisList?.layoutManager as? GridLayoutManager)?.scrollToPositionWithOffset( + allItems.indexOfFirst { it is EmojisAdapter.Item.Category && it.value == checkIds[checkedId] }, + 0 + ) + } + keyboardViewBinding?.emojiCategoriesStrip?.apply { + removeAllViews() + this.setOnCheckedChangeListener(checkedChangedListener) + categories.entries.forEach { (category, emojis) -> + ItemEmojiCategoryBinding.inflate(LayoutInflater.from(context), this, true).apply { + root.id = generateViewId() + checkIds[root.id] = category + root.setButtonDrawable(emojis.first().getCategoryIcon()) + root.buttonTintList = ColorStateList( + arrayOf( + intArrayOf(android.R.attr.state_checked), + intArrayOf(-android.R.attr.state_checked), + ), + intArrayOf( + context.getProperPrimaryColor(), + Color.WHITE + ) + ) + } + } + } keyboardViewBinding?.emojisList?.apply { val emojiItemWidth = context.resources.getDimensionPixelSize(R.dimen.emoji_item_size) val emojiTopBarElevation = context.resources.getDimensionPixelSize(R.dimen.emoji_top_bar_elevation).toFloat() - layoutManager = AutoGridLayoutManager(context, emojiItemWidth) - adapter = EmojisAdapter(context = context, items = emojis) { emoji -> - mOnKeyboardActionListener!!.onText(emoji) + layoutManager = AutoGridLayoutManager(context, emojiItemWidth).apply { + spanSizeLookup = object : SpanSizeLookup() { + override fun getSpanSize(position: Int): Int = + if (allItems[position] is EmojisAdapter.Item.Category) { + spanCount + } else { + 1 + } + } + } + adapter = EmojisAdapter(context = context, items = allItems) { emoji -> + mOnKeyboardActionListener!!.onText(emoji.emoji) vibrateIfNeeded() } + clearOnScrollListeners() onScroll { keyboardViewBinding!!.emojiPaletteTopBar.elevation = if (it > 4) emojiTopBarElevation else 0f + (keyboardViewBinding?.emojisList?.layoutManager as? LinearLayoutManager)?.findFirstCompletelyVisibleItemPosition()?.also { firstVisibleIndex -> + allItems + .withIndex() + .lastOrNull { it.value is EmojisAdapter.Item.Category && it.index <= firstVisibleIndex } + ?.also { activeCategory -> + val id = checkIds.entries.first { it.value == (activeCategory.value as EmojisAdapter.Item.Category).value }.key + keyboardViewBinding?.emojiCategoriesStrip?.apply { + setOnCheckedChangeListener(null) + check(id) + setOnCheckedChangeListener(checkedChangedListener) + } + } + } } } } diff --git a/app/src/main/res/drawable/ic_emoji_category_activities.xml b/app/src/main/res/drawable/ic_emoji_category_activities.xml new file mode 100644 index 000000000..490be0742 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_activities.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_animals.xml b/app/src/main/res/drawable/ic_emoji_category_animals.xml new file mode 100644 index 000000000..1b92b4d62 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_animals.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_flags.xml b/app/src/main/res/drawable/ic_emoji_category_flags.xml new file mode 100644 index 000000000..138d59f98 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_flags.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_food.xml b/app/src/main/res/drawable/ic_emoji_category_food.xml new file mode 100644 index 000000000..5d34b3d70 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_food.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_objects.xml b/app/src/main/res/drawable/ic_emoji_category_objects.xml new file mode 100644 index 000000000..e583c549e --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_objects.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_people.xml b/app/src/main/res/drawable/ic_emoji_category_people.xml new file mode 100644 index 000000000..b48d19e46 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_people.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_smileys.xml b/app/src/main/res/drawable/ic_emoji_category_smileys.xml new file mode 100644 index 000000000..338e483c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_smileys.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_symbols.xml b/app/src/main/res/drawable/ic_emoji_category_symbols.xml new file mode 100644 index 000000000..59c06cdee --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_symbols.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_emoji_category_travel.xml b/app/src/main/res/drawable/ic_emoji_category_travel.xml new file mode 100644 index 000000000..e1aa314cc --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_category_travel.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/emoji_list.xml b/app/src/main/res/layout/emoji_list.xml new file mode 100644 index 000000000..5baf16714 --- /dev/null +++ b/app/src/main/res/layout/emoji_list.xml @@ -0,0 +1,8 @@ + diff --git a/app/src/main/res/layout/item_emoji_category.xml b/app/src/main/res/layout/item_emoji_category.xml new file mode 100644 index 000000000..3fdd618c5 --- /dev/null +++ b/app/src/main/res/layout/item_emoji_category.xml @@ -0,0 +1,10 @@ + + diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml index 83e2f8d83..3ddceccea 100644 --- a/app/src/main/res/layout/keyboard_view_keyboard.xml +++ b/app/src/main/res/layout/keyboard_view_keyboard.xml @@ -164,6 +164,23 @@ android:text="@string/emojis" android:textSize="@dimen/big_text_size" /> + + + + + -10dp 28dp 46dp + 24dp 4dp 42dp 200dp @@ -17,4 +18,5 @@ 26sp 16sp 28sp + 14sp From 5e0eb1fb004d1e7ed6d4b3ddb3cd7e7284ee5b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 28 Aug 2023 10:58:48 +0200 Subject: [PATCH 2/9] Center emoji tabs --- app/src/main/res/layout/keyboard_view_keyboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml index 3ddceccea..f16e5d7cd 100644 --- a/app/src/main/res/layout/keyboard_view_keyboard.xml +++ b/app/src/main/res/layout/keyboard_view_keyboard.xml @@ -167,7 +167,7 @@ From b7383c759468f03a4bb4798d082cfdce52e3dc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 28 Aug 2023 11:01:37 +0200 Subject: [PATCH 3/9] Move categories to bottom bar --- .../res/layout/keyboard_view_keyboard.xml | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml index f16e5d7cd..11a18f1e8 100644 --- a/app/src/main/res/layout/keyboard_view_keyboard.xml +++ b/app/src/main/res/layout/keyboard_view_keyboard.xml @@ -164,23 +164,6 @@ android:text="@string/emojis" android:textSize="@dimen/big_text_size" /> - - - - - + + + + Date: Wed, 30 Aug 2023 09:49:47 +0200 Subject: [PATCH 4/9] Fix emoji category colors on light theme --- .../com/simplemobiletools/keyboard/views/MyKeyboardView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 5cf1bd6a7..72dc67a5f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -1581,7 +1581,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut ), intArrayOf( context.getProperPrimaryColor(), - Color.WHITE + context.getProperTextColor() ) ) } From e91550017115e4eeeb964b30b568802882c07e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 30 Aug 2023 11:25:50 +0200 Subject: [PATCH 5/9] Fix category coloring behavior --- .../keyboard/views/MyKeyboardView.kt | 40 +++++++++---------- .../main/res/layout/item_emoji_category.xml | 6 +-- .../res/layout/keyboard_view_keyboard.xml | 18 +++------ 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 72dc67a5f..259c65b3b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -20,6 +20,7 @@ import android.util.TypedValue import android.view.* import android.view.animation.AccelerateInterpolator import android.view.inputmethod.EditorInfo +import android.widget.ImageButton import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.RadioGroup @@ -1560,30 +1561,25 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut allItems.addAll(emojis.map(EmojisAdapter.Item::Emoji)) } val checkIds = mutableMapOf() - val checkedChangedListener: (RadioGroup, Int) -> Unit = { _, checkedId -> - (keyboardViewBinding?.emojisList?.layoutManager as? GridLayoutManager)?.scrollToPositionWithOffset( - allItems.indexOfFirst { it is EmojisAdapter.Item.Category && it.value == checkIds[checkedId] }, - 0 - ) - } keyboardViewBinding?.emojiCategoriesStrip?.apply { + val strip = this removeAllViews() - this.setOnCheckedChangeListener(checkedChangedListener) categories.entries.forEach { (category, emojis) -> ItemEmojiCategoryBinding.inflate(LayoutInflater.from(context), this, true).apply { root.id = generateViewId() checkIds[root.id] = category - root.setButtonDrawable(emojis.first().getCategoryIcon()) - root.buttonTintList = ColorStateList( - arrayOf( - intArrayOf(android.R.attr.state_checked), - intArrayOf(-android.R.attr.state_checked), - ), - intArrayOf( - context.getProperPrimaryColor(), - context.getProperTextColor() + root.setImageResource(emojis.first().getCategoryIcon()) + root.setOnClickListener { + strip.children.filterIsInstance().forEach { + it.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) + } + root.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor()) + (keyboardViewBinding?.emojisList?.layoutManager as? GridLayoutManager)?.scrollToPositionWithOffset( + allItems.indexOfFirst { it is EmojisAdapter.Item.Category && it.value == category }, + 0 ) - ) + } + root.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) } } } @@ -1615,10 +1611,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut .lastOrNull { it.value is EmojisAdapter.Item.Category && it.index <= firstVisibleIndex } ?.also { activeCategory -> val id = checkIds.entries.first { it.value == (activeCategory.value as EmojisAdapter.Item.Category).value }.key - keyboardViewBinding?.emojiCategoriesStrip?.apply { - setOnCheckedChangeListener(null) - check(id) - setOnCheckedChangeListener(checkedChangedListener) + keyboardViewBinding?.emojiCategoriesStrip?.children?.filterIsInstance()?.forEach { + if (it.id == id) { + it.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor()) + } else { + it.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) + } } } } diff --git a/app/src/main/res/layout/item_emoji_category.xml b/app/src/main/res/layout/item_emoji_category.xml index 3fdd618c5..4ba7223f6 100644 --- a/app/src/main/res/layout/item_emoji_category.xml +++ b/app/src/main/res/layout/item_emoji_category.xml @@ -1,10 +1,10 @@ - + android:src="@drawable/ic_emoji_category_activities" /> diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml index 11a18f1e8..9ff0921a5 100644 --- a/app/src/main/res/layout/keyboard_view_keyboard.xml +++ b/app/src/main/res/layout/keyboard_view_keyboard.xml @@ -202,21 +202,15 @@ android:text="@string/abc" android:textStyle="bold" /> - - - + android:gravity="center" + android:orientation="horizontal" /> Date: Wed, 30 Aug 2023 11:41:28 +0200 Subject: [PATCH 6/9] Make categories fit available screen size --- .../com/simplemobiletools/keyboard/views/MyKeyboardView.kt | 7 ++++++- app/src/main/res/layout/item_emoji_category.xml | 3 ++- app/src/main/res/layout/keyboard_view_keyboard.xml | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 259c65b3b..e3ab2f748 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -23,7 +23,6 @@ import android.view.inputmethod.EditorInfo import android.widget.ImageButton import android.widget.LinearLayout import android.widget.PopupWindow -import android.widget.RadioGroup import android.widget.TextView import android.widget.inline.InlineContentView import androidx.annotation.RequiresApi @@ -1562,6 +1561,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } val checkIds = mutableMapOf() keyboardViewBinding?.emojiCategoriesStrip?.apply { + weightSum = categories.count().toFloat() val strip = this removeAllViews() categories.entries.forEach { (category, emojis) -> @@ -1569,6 +1569,11 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut root.id = generateViewId() checkIds[root.id] = category root.setImageResource(emojis.first().getCategoryIcon()) + root.layoutParams = LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, + 1f + ) root.setOnClickListener { strip.children.filterIsInstance().forEach { it.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) diff --git a/app/src/main/res/layout/item_emoji_category.xml b/app/src/main/res/layout/item_emoji_category.xml index 4ba7223f6..0942705af 100644 --- a/app/src/main/res/layout/item_emoji_category.xml +++ b/app/src/main/res/layout/item_emoji_category.xml @@ -6,5 +6,6 @@ android:background="@drawable/ripple_all_corners_medium" android:gravity="center" android:importantForAccessibility="no" - android:padding="@dimen/small_margin" + android:padding="@dimen/tiny_margin" + android:scaleType="centerInside" android:src="@drawable/ic_emoji_category_activities" /> diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml index 9ff0921a5..5883afcd5 100644 --- a/app/src/main/res/layout/keyboard_view_keyboard.xml +++ b/app/src/main/res/layout/keyboard_view_keyboard.xml @@ -207,6 +207,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" + android:layout_marginStart="@dimen/medium_margin" + android:layout_marginEnd="@dimen/medium_margin" android:layout_toStartOf="@+id/emoji_palette_backspace" android:layout_toEndOf="@+id/emoji_palette_mode_change" android:gravity="center" From 967485bd449ff69ddb21050558a7305a03eafcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 30 Aug 2023 13:50:32 +0200 Subject: [PATCH 7/9] Use same color as surrounding buttons for inactive emoji category icon --- .../com/simplemobiletools/keyboard/views/MyKeyboardView.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index e3ab2f748..4b017579d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -1560,6 +1560,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut allItems.addAll(emojis.map(EmojisAdapter.Item::Emoji)) } val checkIds = mutableMapOf() + val inactiveColor = mTextColor.darkenColor() keyboardViewBinding?.emojiCategoriesStrip?.apply { weightSum = categories.count().toFloat() val strip = this @@ -1576,7 +1577,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut ) root.setOnClickListener { strip.children.filterIsInstance().forEach { - it.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) + it.imageTintList = ColorStateList.valueOf(inactiveColor) } root.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor()) (keyboardViewBinding?.emojisList?.layoutManager as? GridLayoutManager)?.scrollToPositionWithOffset( @@ -1584,7 +1585,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut 0 ) } - root.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) + root.imageTintList = ColorStateList.valueOf(inactiveColor) } } } @@ -1620,7 +1621,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut if (it.id == id) { it.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor()) } else { - it.imageTintList = ColorStateList.valueOf(context.getProperTextColor()) + it.imageTintList = ColorStateList.valueOf(inactiveColor) } } } From 0ea9f39ce264ae1cc32bb33c88aa337c9122d48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 30 Aug 2023 13:52:26 +0200 Subject: [PATCH 8/9] Stop active scroll when emoji category is tapped --- .../com/simplemobiletools/keyboard/views/MyKeyboardView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 4b017579d..895117e78 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -1580,6 +1580,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut it.imageTintList = ColorStateList.valueOf(inactiveColor) } root.imageTintList = ColorStateList.valueOf(context.getProperPrimaryColor()) + keyboardViewBinding?.emojisList?.stopScroll() (keyboardViewBinding?.emojisList?.layoutManager as? GridLayoutManager)?.scrollToPositionWithOffset( allItems.indexOfFirst { it is EmojisAdapter.Item.Category && it.value == category }, 0 From 8137b71a32a229642190522514cda1122e941bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 30 Aug 2023 15:27:50 +0200 Subject: [PATCH 9/9] Fix emoji palette bottom bar colors --- .../keyboard/views/MyKeyboardView.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 895117e78..d164f899d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -1474,9 +1474,8 @@ 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() @@ -1484,7 +1483,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } 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() - 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().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) } } }