diff --git a/app/src/main/assets/emoji/SYMBOLS.txt b/app/src/main/assets/emoji/SYMBOLS.txt index f85cc13bb..02effebc7 100644 --- a/app/src/main/assets/emoji/SYMBOLS.txt +++ b/app/src/main/assets/emoji/SYMBOLS.txt @@ -136,32 +136,6 @@ ®️ ™️ 🫟 -🇦 -🇧 -🇨 -🇩 -🇪 -🇫 -🇬 -🇭 -🇮 -🇯 -🇰 -🇱 -🇲 -🇳 -🇴 -🇵 -🇶 -🇷 -🇸 -🇹 -🇺 -🇻 -🇼 -🇽 -🇾 -🇿 #️⃣ *️⃣ 0️⃣ @@ -247,4 +221,4 @@ 💠 🔘 🔳 -🔲 \ No newline at end of file +🔲 diff --git a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/model/EmojiData.kt b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/model/EmojiData.kt index e8fe8f868..d4f73733a 100644 --- a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/model/EmojiData.kt +++ b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/model/EmojiData.kt @@ -33,36 +33,6 @@ class EmojiData { } private fun onEmojiInserted(group: EmojiGroup, emoji: EmojiSpec): Boolean { - // Unicode RGI does not include letter symbols but Android supports them, so we inject them manually. - if (emoji.codes contentEquals RAW_CPS_KEYCAP_HASH) { - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_A), 2.0f, "regional indicator symbol letter a") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_B), 2.0f, "regional indicator symbol letter b") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_C), 2.0f, "regional indicator symbol letter c") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_D), 2.0f, "regional indicator symbol letter d") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_E), 2.0f, "regional indicator symbol letter e") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_F), 2.0f, "regional indicator symbol letter f") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_G), 2.0f, "regional indicator symbol letter g") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_H), 2.0f, "regional indicator symbol letter h") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_I), 2.0f, "regional indicator symbol letter i") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_J), 2.0f, "regional indicator symbol letter j") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_K), 2.0f, "regional indicator symbol letter k") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_L), 2.0f, "regional indicator symbol letter l") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_M), 2.0f, "regional indicator symbol letter m") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_N), 2.0f, "regional indicator symbol letter n") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_O), 2.0f, "regional indicator symbol letter o") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_P), 2.0f, "regional indicator symbol letter p") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Q), 2.0f, "regional indicator symbol letter q") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_R), 2.0f, "regional indicator symbol letter r") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_S), 2.0f, "regional indicator symbol letter s") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_T), 2.0f, "regional indicator symbol letter t") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_U), 2.0f, "regional indicator symbol letter u") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_V), 2.0f, "regional indicator symbol letter v") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_W), 2.0f, "regional indicator symbol letter w") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_X), 2.0f, "regional indicator symbol letter x") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Y), 2.0f, "regional indicator symbol letter y") - insertEmoji(group, intArrayOf(CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Z), 2.0f, "regional indicator symbol letter z") - } - // Some multi-skin-tone variants use a different base code than their non-multi-skin-tone counterparts, // so they don't get grouped. We drop them here, to prevent each variant from being displayed separately. return ! hasMultipleSkinModifiers(emoji.codes) @@ -118,9 +88,6 @@ class EmojiData { } companion object { - - private val RAW_CPS_KEYCAP_HASH = intArrayOf(0x0023, 0xFE0F, 0x20E3) - const val CP_NUL = 0x0000 private const val CP_ZWJ = 0x200D @@ -136,34 +103,5 @@ class EmojiData { private const val CP_WHITE_HAIR = 0x1F9B3 private const val CP_BARLD = 0x1F9B2 private const val CP_VARIANT_SELECTOR = 0xFE0F - - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_A = 0x1F1E6 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_B = 0x1F1E7 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_C = 0x1F1E8 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_D = 0x1F1E9 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_E = 0x1F1EA - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_F = 0x1F1EB - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_G = 0x1F1EC - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_H = 0x1F1ED - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_I = 0x1F1EE - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_J = 0x1F1EF - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_K = 0x1F1F0 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_L = 0x1F1F1 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_M = 0x1F1F2 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_N = 0x1F1F3 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_O = 0x1F1F4 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_P = 0x1F1F5 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Q = 0x1F1F6 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_R = 0x1F1F7 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_S = 0x1F1F8 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_T = 0x1F1F9 - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_U = 0x1F1FA - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_V = 0x1F1FB - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_W = 0x1F1FC - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_X = 0x1F1FD - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Y = 0x1F1FE - private const val CP_REGIONAL_INDICATOR_SYMBOL_LETTER_Z = 0x1F1FF } - - } diff --git a/tools/make-emoji-keys/src/main/resources/emoji/android-emoji-support.txt b/tools/make-emoji-keys/src/main/resources/emoji/android-emoji-support.txt index 15aff89ab..baaf17988 100644 --- a/tools/make-emoji-keys/src/main/resources/emoji/android-emoji-support.txt +++ b/tools/make-emoji-keys/src/main/resources/emoji/android-emoji-support.txt @@ -3866,31 +3866,5 @@ U+1F532 # black square button U+1F3C1 # chequered flag U+1F6A9 # triangular flag U+1F38C # crossed flags -U+1F1E6 # regional indicator symbol letter a -U+1F1E7 # regional indicator symbol letter b -U+1F1E8 # regional indicator symbol letter c -U+1F1E9 # regional indicator symbol letter d -U+1F1EA # regional indicator symbol letter e -U+1F1EB # regional indicator symbol letter f -U+1F1EC # regional indicator symbol letter g -U+1F1ED # regional indicator symbol letter h -U+1F1EE # regional indicator symbol letter i -U+1F1EF # regional indicator symbol letter j -U+1F1F0 # regional indicator symbol letter k -U+1F1F1 # regional indicator symbol letter l -U+1F1F2 # regional indicator symbol letter m -U+1F1F3 # regional indicator symbol letter n -U+1F1F4 # regional indicator symbol letter o -U+1F1F5 # regional indicator symbol letter p -U+1F1F6 # regional indicator symbol letter q -U+1F1F7 # regional indicator symbol letter r -U+1F1F8 # regional indicator symbol letter s -U+1F1F9 # regional indicator symbol letter t -U+1F1FA # regional indicator symbol letter u -U+1F1FB # regional indicator symbol letter v -U+1F1FC # regional indicator symbol letter w -U+1F1FD # regional indicator symbol letter x -U+1F1FE # regional indicator symbol letter y -U+1F1FF # regional indicator symbol letter z # Above emojis are supported from Android 4.4 (API level 19)