dox4/fcitx5-android
1
0
Fork 0
mirror of https://github.com/fcitx5-android/fcitx5-android.git synced 2026-08-02 04:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reuse EmojiModifier.isValidEmoji in EmojiPickerPolicy

Browse Source
This commit is contained in:
Rocka 2026-06-27 00:12:20 +08:00
parent 6fb7482fc4
commit 9e48162a98
No known key found for this signature in database
GPG Key ID: 28031158FFDD6853
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPolicy.kt
View File

@ -5,7 +5,6 @@
package org.fcitx.fcitx5.android.input.picker
import android.text.TextPaint
import org.fcitx.fcitx5.android.data.prefs.AppPrefs
import org.fcitx.fcitx5.android.input.keyboard.KeyDef
import org.fcitx.fcitx5.android.input.popup.EmojiModifier
@ -60,7 +59,7 @@ class EmojiPickerPolicy : PickerPolicy {
private val prefs get() = Prefs(hideUnsupportedEmojis, defaultSkinTone)
override fun filter(raw: String): Boolean {
return if (hideUnsupportedEmojis) TextPaint().hasGlyph(raw) else true
return if (hideUnsupportedEmojis) EmojiModifier.isValidEmoji(raw) else true
}
override fun transform(raw: String): String {

2
app/src/main/java/org/fcitx/fcitx5/android/input/popup/EmojiModifier.kt
View File

@ -96,7 +96,7 @@ object EmojiModifier {
UnicodeSet("[:RGI_Emoji:]").freeze()
}
private fun isValidEmoji(emoji: String): Boolean {
fun isValidEmoji(emoji: String): Boolean {
// UProperty.RGI_EMOJI is available on 34+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
if (!RGIEmojiSet.contains(emoji)) return false