diff --git a/app/src/main/res/values/emoji-categories.xml b/app/src/main/res/values/emoji-categories.xml
index e11d71ae..3fd482dc 100644
--- a/app/src/main/res/values/emoji-categories.xml
+++ b/app/src/main/res/values/emoji-categories.xml
@@ -1,4 +1,8 @@
+
+
@@ -77,11 +81,14 @@
- 1F62E,200D,1F4A8||31
- 1F925||24
- 1FAE8||33
+ - 1F642,200D,2194,FE0F||34
+ - 1F642,200D,2195,FE0F||34
- 1F60C
- 1F614
- 1F62A
- 1F924||24
- 1F634
+ - 1FAE9||35
- 1F637
- 1F912||23
- 1F915||23
@@ -440,24 +447,42 @@
- 1F6B6
- 1F6B6,200D,2642,FE0F||25
- 1F6B6,200D,2640,FE0F||25
+ - 1F6B6,200D,27A1,FE0F||34
+ - 1F6B6,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F6B6,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F9CD||29
- 1F9CD,200D,2642,FE0F||29
- 1F9CD,200D,2640,FE0F||29
- 1F9CE||29
- 1F9CE,200D,2642,FE0F||29
- 1F9CE,200D,2640,FE0F||29
+ - 1F9CE,200D,27A1,FE0F||34
+ - 1F9CE,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F9CE,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F9D1,200D,1F9AF||30
+ - 1F9D1,200D,1F9AF,200D,27A1,FE0F||34
- 1F468,200D,1F9AF||29
+ - 1F468,200D,1F9AF,200D,27A1,FE0F||34
- 1F469,200D,1F9AF||29
+ - 1F469,200D,1F9AF,200D,27A1,FE0F||34
- 1F9D1,200D,1F9BC||30
+ - 1F9D1,200D,1F9BC,200D,27A1,FE0F||34
- 1F468,200D,1F9BC||29
+ - 1F468,200D,1F9BC,200D,27A1,FE0F||34
- 1F469,200D,1F9BC||29
+ - 1F469,200D,1F9BC,200D,27A1,FE0F||34
- 1F9D1,200D,1F9BD||30
+ - 1F9D1,200D,1F9BD,200D,27A1,FE0F||34
- 1F468,200D,1F9BD||29
+ - 1F468,200D,1F9BD,200D,27A1,FE0F||34
- 1F469,200D,1F9BD||29
+ - 1F469,200D,1F9BD,200D,27A1,FE0F||34
- 1F3C3
- 1F3C3,200D,2642,FE0F||25
- 1F3C3,200D,2640,FE0F||25
+ - 1F3C3,200D,27A1,FE0F||34
+ - 1F3C3,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F3C3,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F483
- 1F57A||24
- 1F574,FE0F||23
@@ -530,7 +555,6 @@
- 1F469,200D,2764,FE0F,200D,1F468||26
- 1F468,200D,2764,FE0F,200D,1F468||23
- 1F469,200D,2764,FE0F,200D,1F469||23
- - 1F46A
- 1F468,200D,1F469,200D,1F466||25
- 1F468,200D,1F469,200D,1F467||23
- 1F468,200D,1F469,200D,1F467,200D,1F466||23
@@ -560,7 +584,13 @@
- 1F464
- 1F465
- 1FAC2||30
+ - 1F46A
+ - 1F9D1,200D,1F9D1,200D,1F9D2||34
+ - 1F9D1,200D,1F9D1,200D,1F9D2,200D,1F9D2||34
+ - 1F9D1,200D,1F9D2||34
+ - 1F9D1,200D,1F9D2,200D,1F9D2||34
- 1F463
+ - 1FAC6||35
1F470,1F3FB,200D,2642,FE0F||30;1F470,1F3FC,200D,2642,FE0F||30;1F470,1F3FD,200D,2642,FE0F||30;1F470,1F3FE,200D,2642,FE0F||30;1F470,1F3FF,200D,2642,FE0F||30
- 1F470,1F3FB,200D,2640,FE0F||30;1F470,1F3FC,200D,2640,FE0F||30;1F470,1F3FD,200D,2640,FE0F||30;1F470,1F3FE,200D,2640,FE0F||30;1F470,1F3FF,200D,2640,FE0F||30
- 1F930,1F3FB||24;1F930,1F3FC||24;1F930,1F3FD||24;1F930,1F3FE||24;1F930,1F3FF||24
- - 1FAC3,1F3FB||32;1FAC3,1F3FD||32;1FAC3,1F3FE||32;1FAC3,1F3FF||32
+ - 1FAC3,1F3FB||32;1FAC3,1F3FC||32;1FAC3,1F3FD||32;1FAC3,1F3FE||32;1FAC3,1F3FF||32
- 1FAC4,1F3FB||32;1FAC4,1F3FC||32;1FAC4,1F3FD||32;1FAC4,1F3FE||32;1FAC4,1F3FF||32
- 1F931,1F3FB||26;1F931,1F3FC||26;1F931,1F3FD||26;1F931,1F3FE||26;1F931,1F3FF||26
- 1F469,1F3FB,200D,1F37C||30;1F469,1F3FC,200D,1F37C||30;1F469,1F3FD,200D,1F37C||30;1F469,1F3FE,200D,1F37C||30;1F469,1F3FF,200D,1F37C||30
@@ -808,24 +838,42 @@
- 1F6B6,1F3FB||24;1F6B6,1F3FC||24;1F6B6,1F3FD||24;1F6B6,1F3FE||24;1F6B6,1F3FF||24
- 1F6B6,1F3FB,200D,2642,FE0F||25;1F6B6,1F3FC,200D,2642,FE0F||25;1F6B6,1F3FD,200D,2642,FE0F||25;1F6B6,1F3FE,200D,2642,FE0F||25;1F6B6,1F3FF,200D,2642,FE0F||25
- 1F6B6,1F3FB,200D,2640,FE0F||25;1F6B6,1F3FC,200D,2640,FE0F||25;1F6B6,1F3FD,200D,2640,FE0F||25;1F6B6,1F3FE,200D,2640,FE0F||25;1F6B6,1F3FF,200D,2640,FE0F||25
+ - 1F6B6,1F3FB,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,27A1,FE0F||34
+ - 1F6B6,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F6B6,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F9CD,1F3FB||29;1F9CD,1F3FC||29;1F9CD,1F3FD||29;1F9CD,1F3FE||29;1F9CD,1F3FF||29
- 1F9CD,1F3FB,200D,2642,FE0F||29;1F9CD,1F3FC,200D,2642,FE0F||29;1F9CD,1F3FD,200D,2642,FE0F||29;1F9CD,1F3FE,200D,2642,FE0F||29;1F9CD,1F3FF,200D,2642,FE0F||29
- 1F9CD,1F3FB,200D,2640,FE0F||29;1F9CD,1F3FC,200D,2640,FE0F||29;1F9CD,1F3FD,200D,2640,FE0F||29;1F9CD,1F3FE,200D,2640,FE0F||29;1F9CD,1F3FF,200D,2640,FE0F||29
- 1F9CE,1F3FB||29;1F9CE,1F3FC||29;1F9CE,1F3FD||29;1F9CE,1F3FE||29;1F9CE,1F3FF||29
- 1F9CE,1F3FB,200D,2642,FE0F||29;1F9CE,1F3FC,200D,2642,FE0F||29;1F9CE,1F3FD,200D,2642,FE0F||29;1F9CE,1F3FE,200D,2642,FE0F||29;1F9CE,1F3FF,200D,2642,FE0F||29
- 1F9CE,1F3FB,200D,2640,FE0F||29;1F9CE,1F3FC,200D,2640,FE0F||29;1F9CE,1F3FD,200D,2640,FE0F||29;1F9CE,1F3FE,200D,2640,FE0F||29;1F9CE,1F3FF,200D,2640,FE0F||29
+ - 1F9CE,1F3FB,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,27A1,FE0F||34
+ - 1F9CE,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F9CE,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F9D1,1F3FB,200D,1F9AF||30;1F9D1,1F3FC,200D,1F9AF||30;1F9D1,1F3FD,200D,1F9AF||30;1F9D1,1F3FE,200D,1F9AF||30;1F9D1,1F3FF,200D,1F9AF||30
+ - 1F9D1,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9AF,200D,27A1,FE0F||34
- 1F468,1F3FB,200D,1F9AF||29;1F468,1F3FC,200D,1F9AF||29;1F468,1F3FD,200D,1F9AF||29;1F468,1F3FE,200D,1F9AF||29;1F468,1F3FF,200D,1F9AF||29
+ - 1F468,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9AF,200D,27A1,FE0F||34
- 1F469,1F3FB,200D,1F9AF||29;1F469,1F3FC,200D,1F9AF||29;1F469,1F3FD,200D,1F9AF||29;1F469,1F3FE,200D,1F9AF||29;1F469,1F3FF,200D,1F9AF||29
+ - 1F469,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9AF,200D,27A1,FE0F||34
- 1F9D1,1F3FB,200D,1F9BC||30;1F9D1,1F3FC,200D,1F9BC||30;1F9D1,1F3FD,200D,1F9BC||30;1F9D1,1F3FE,200D,1F9BC||30;1F9D1,1F3FF,200D,1F9BC||30
+ - 1F9D1,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9BC,200D,27A1,FE0F||34
- 1F468,1F3FB,200D,1F9BC||29;1F468,1F3FC,200D,1F9BC||29;1F468,1F3FD,200D,1F9BC||29;1F468,1F3FE,200D,1F9BC||29;1F468,1F3FF,200D,1F9BC||29
+ - 1F468,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9BC,200D,27A1,FE0F||34
- 1F469,1F3FB,200D,1F9BC||29;1F469,1F3FC,200D,1F9BC||29;1F469,1F3FD,200D,1F9BC||29;1F469,1F3FE,200D,1F9BC||29;1F469,1F3FF,200D,1F9BC||29
+ - 1F469,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9BC,200D,27A1,FE0F||34
- 1F9D1,1F3FB,200D,1F9BD||30;1F9D1,1F3FC,200D,1F9BD||30;1F9D1,1F3FD,200D,1F9BD||30;1F9D1,1F3FE,200D,1F9BD||30;1F9D1,1F3FF,200D,1F9BD||30
+ - 1F9D1,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9BD,200D,27A1,FE0F||34
- 1F468,1F3FB,200D,1F9BD||29;1F468,1F3FC,200D,1F9BD||29;1F468,1F3FD,200D,1F9BD||29;1F468,1F3FE,200D,1F9BD||29;1F468,1F3FF,200D,1F9BD||29
+ - 1F468,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9BD,200D,27A1,FE0F||34
- 1F469,1F3FB,200D,1F9BD||29;1F469,1F3FC,200D,1F9BD||29;1F469,1F3FD,200D,1F9BD||29;1F469,1F3FE,200D,1F9BD||29;1F469,1F3FF,200D,1F9BD||29
+ - 1F469,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9BD,200D,27A1,FE0F||34
- 1F3C3,1F3FB||24;1F3C3,1F3FC||24;1F3C3,1F3FD||24;1F3C3,1F3FE||24;1F3C3,1F3FF||24
- 1F3C3,1F3FB,200D,2642,FE0F||25;1F3C3,1F3FC,200D,2642,FE0F||25;1F3C3,1F3FD,200D,2642,FE0F||25;1F3C3,1F3FE,200D,2642,FE0F||25;1F3C3,1F3FF,200D,2642,FE0F||25
- 1F3C3,1F3FB,200D,2640,FE0F||25;1F3C3,1F3FC,200D,2640,FE0F||25;1F3C3,1F3FD,200D,2640,FE0F||25;1F3C3,1F3FE,200D,2640,FE0F||25;1F3C3,1F3FF,200D,2640,FE0F||25
+ - 1F3C3,1F3FB,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,27A1,FE0F||34
+ - 1F3C3,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34
+ - 1F3C3,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34
- 1F483,1F3FB||24;1F483,1F3FC||24;1F483,1F3FD||24;1F483,1F3FE||24;1F483,1F3FF||24
- 1F57A,1F3FB||24;1F57A,1F3FC||24;1F57A,1F3FD||24;1F57A,1F3FE||24;1F57A,1F3FF||24
- 1F574,1F3FB||26;1F574,1F3FC||26;1F574,1F3FD||26;1F574,1F3FE||26;1F574,1F3FF||26
@@ -929,6 +977,11 @@
- 1F426,200D,2B1B||33
- 1FABF||33
+ - 1F426,200D,1F525||34
- 1F438
- 1F40A
- 1F422
@@ -1042,6 +1096,11 @@
- 1F41A
- 1FAB8||32
- 1FABC||33
+ - 1F980||23
+ - 1F99E||28
+ - 1F990||24
+ - 1F991||24
+ - 1F9AA||29
- 1F40C
- 1F98B||24
- 1F41B
@@ -1086,6 +1145,7 @@
- 1FAB9||32
- 1FABA||32
- 1F344
+ - 1FABE||35
1F349
- 1F34A
- 1F34B
+ - 1F34B,200D,1F7E9||34
- 1F34C
- 1F34D
- 1F96D||28
@@ -1127,6 +1188,8 @@
- 1F330
- 1FADA||33
- 1FADB||33
+ - 1F344,200D,1F7EB||34
+ - 1FADC||35
- 1F35E
- 1F950||24
- 1F956||24
@@ -1178,11 +1241,6 @@
- 1F95F||26
- 1F960||26
- 1F961||26
- - 1F980||23
- - 1F99E||28
- - 1F990||24
- - 1F991||24
- - 1F9AA||29
- 1F366
- 1F367
- 1F368
@@ -1618,6 +1676,7 @@
- 1FA98||30
- 1FA87||33
- 1FA88||33
+ - 1FA89||35
- 1F4F1
- 1F4F2
- 260E,FE0F
@@ -1750,11 +1809,13 @@
- 2696,FE0F||23
- 1F9AF||29
- 1F517
+ - 26D3,FE0F,200D,1F4A5||34
- 26D3,FE0F||23
- 1FA9D||30
- 1F9F0||28
- 1F9F2||28
- 1FA9C||30
+ - 1FA8F||35
- 2697,FE0F||23
- 1F9EA||28
- 1F9EB||28
@@ -1945,6 +2006,7 @@
- A9,FE0F
- AE,FE0F
- 2122,FE0F
+ - 1FADF||35
- 1F1E6
- 1F1E7
- 1F1E8
@@ -1971,18 +2033,18 @@
- 1F1FD
- 1F1FE
- 1F1FF
- - 23,FE0F,20E3||21
+ - 23,FE0F,20E3
- 2A,FE0F,20E3||23
- - 30,FE0F,20E3||21
- - 31,FE0F,20E3||21
- - 32,FE0F,20E3||21
- - 33,FE0F,20E3||21
- - 34,FE0F,20E3||21
- - 35,FE0F,20E3||21
- - 36,FE0F,20E3||21
- - 37,FE0F,20E3||21
- - 38,FE0F,20E3||21
- - 39,FE0F,20E3||21
+ - 30,FE0F,20E3
+ - 31,FE0F,20E3
+ - 32,FE0F,20E3
+ - 33,FE0F,20E3
+ - 34,FE0F,20E3
+ - 35,FE0F,20E3
+ - 36,FE0F,20E3
+ - 37,FE0F,20E3
+ - 38,FE0F,20E3
+ - 39,FE0F,20E3
- 1F51F
- 1F520
- 1F521
@@ -2071,251 +2133,264 @@
- 1F3F3,FE0F,200D,26A7,FE0F||30
- 1F3F4,200D,2620,FE0F||28
- 1F1E6,1F1E8||24
- - 1F1E6,1F1E9||21
- - 1F1E6,1F1EA||21
- - 1F1E6,1F1EB||21
- - 1F1E6,1F1EC||21
- - 1F1E6,1F1EE||21
- - 1F1E6,1F1F1||21
- - 1F1E6,1F1F2||21
- - 1F1E6,1F1F4||21
+ - 1F1E6,1F1E9
+ - 1F1E6,1F1EA
+ - 1F1E6,1F1EB
+ - 1F1E6,1F1EC
+ - 1F1E6,1F1EE
+ - 1F1E6,1F1F1
+ - 1F1E6,1F1F2
+ - 1F1E6,1F1F4
- 1F1E6,1F1F6||24
- - 1F1E6,1F1F7||21
- - 1F1E6,1F1F8||21
- - 1F1E6,1F1F9||21
- - 1F1E6,1F1FA||21
- - 1F1E6,1F1FC||21
- - 1F1E6,1F1FD||21
- - 1F1E6,1F1FF||21
- - 1F1E7,1F1E6||21
- - 1F1E7,1F1E7||21
- - 1F1E7,1F1E9||21
- - 1F1E7,1F1EA||21
- - 1F1E7,1F1EB||21
- - 1F1E7,1F1EC||21
- - 1F1E7,1F1ED||21
- - 1F1E7,1F1EE||21
- - 1F1E7,1F1EF||21
+ - 1F1E6,1F1F7
+ - 1F1E6,1F1F8
+ - 1F1E6,1F1F9
+ - 1F1E6,1F1FA
+ - 1F1E6,1F1FC
+ - 1F1E6,1F1FD
+ - 1F1E6,1F1FF
+ - 1F1E7,1F1E6
+ - 1F1E7,1F1E7
+ - 1F1E7,1F1E9
+ - 1F1E7,1F1EA
+ - 1F1E7,1F1EB
+ - 1F1E7,1F1EC
+ - 1F1E7,1F1ED
+ - 1F1E7,1F1EE
+ - 1F1E7,1F1EF
- 1F1E7,1F1F1||29
- - 1F1E7,1F1F2||21
- - 1F1E7,1F1F3||21
- - 1F1E7,1F1F4||21
+ - 1F1E7,1F1F2
+ - 1F1E7,1F1F3
+ - 1F1E7,1F1F4
- 1F1E7,1F1F6||29
- - 1F1E7,1F1F7||21
- - 1F1E7,1F1F8||21
- - 1F1E7,1F1F9||21
+ - 1F1E7,1F1F7
+ - 1F1E7,1F1F8
+ - 1F1E7,1F1F9
- 1F1E7,1F1FB||24
- - 1F1E7,1F1FC||21
- - 1F1E7,1F1FE||21
- - 1F1E7,1F1FF||21
- - 1F1E8,1F1E6||21
- - 1F1E8,1F1E8||21
- - 1F1E8,1F1E9||21
- - 1F1E8,1F1EB||21
- - 1F1E8,1F1EC||21
- - 1F1E8,1F1ED||21
- - 1F1E8,1F1EE||21
- - 1F1E8,1F1F0||21
- - 1F1E8,1F1F1||21
- - 1F1E8,1F1F2||21
- - 1F1E8,1F1F3||21
- - 1F1E8,1F1F4||21
+ - 1F1E7,1F1FC
+ - 1F1E7,1F1FE
+ - 1F1E7,1F1FF
+ - 1F1E8,1F1E6
+ - 1F1E8,1F1E8
+ - 1F1E8,1F1E9
+ - 1F1E8,1F1EB
+ - 1F1E8,1F1EC
+ - 1F1E8,1F1ED
+ - 1F1E8,1F1EE
+ - 1F1E8,1F1F0
+ - 1F1E8,1F1F1
+ - 1F1E8,1F1F2
+ - 1F1E8,1F1F3
+ - 1F1E8,1F1F4
- 1F1E8,1F1F5||24
- - 1F1E8,1F1F7||21
- - 1F1E8,1F1FA||21
- - 1F1E8,1F1FB||21
- - 1F1E8,1F1FC||21
- - 1F1E8,1F1FD||21
- - 1F1E8,1F1FE||21
- - 1F1E8,1F1FF||21
- - 1F1E9,1F1EA||21
- - 1F1E9,1F1EF||21
- - 1F1E9,1F1F0||21
- - 1F1E9,1F1F2||21
- - 1F1E9,1F1F4||21
- - 1F1E9,1F1FF||21
- - 1F1EA,1F1E8||21
- - 1F1EA,1F1EA||21
- - 1F1EA,1F1EC||21
- - 1F1EA,1F1F7||21
- - 1F1EA,1F1F8||21
- - 1F1EA,1F1F9||21
- - 1F1EA,1F1FA||21
- - 1F1EB,1F1EE||21
- - 1F1EB,1F1EF||21
- - 1F1EB,1F1F2||21
- - 1F1EB,1F1F4||21
- - 1F1EB,1F1F7||21
- - 1F1EC,1F1E6||21
- - 1F1EC,1F1E7||21
- - 1F1EC,1F1E9||21
- - 1F1EC,1F1EA||21
- - 1F1EC,1F1EC||21
- - 1F1EC,1F1ED||21
- - 1F1EC,1F1EE||21
- - 1F1EC,1F1F1||21
- - 1F1EC,1F1F2||21
- - 1F1EC,1F1F3||21
- - 1F1EC,1F1F6||21
- - 1F1EC,1F1F7||21
- - 1F1EC,1F1F9||21
- - 1F1EC,1F1FA||21
- - 1F1EC,1F1FC||21
- - 1F1EC,1F1FE||21
- - 1F1ED,1F1F0||21
+ - 1F1E8,1F1F6||35
+ - 1F1E8,1F1F7
+ - 1F1E8,1F1FA
+ - 1F1E8,1F1FB
+ - 1F1E8,1F1FC
+ - 1F1E8,1F1FD
+ - 1F1E8,1F1FE
+ - 1F1E8,1F1FF
+ - 1F1E9,1F1EA
+ - 1F1E9,1F1EC||30
+ - 1F1E9,1F1EF
+ - 1F1E9,1F1F0
+ - 1F1E9,1F1F2
+ - 1F1E9,1F1F4
+ - 1F1E9,1F1FF
+ - 1F1EA,1F1E6||30
+ - 1F1EA,1F1E8
+ - 1F1EA,1F1EA
+ - 1F1EA,1F1EC
+ - 1F1EA,1F1ED||30
+ - 1F1EA,1F1F7
+ - 1F1EA,1F1F8
+ - 1F1EA,1F1F9
+ - 1F1EA,1F1FA
+ - 1F1EB,1F1EE
+ - 1F1EB,1F1EF
+ - 1F1EB,1F1F0||30
+ - 1F1EB,1F1F2
+ - 1F1EB,1F1F4
+ - 1F1EB,1F1F7
+ - 1F1EC,1F1E6
+ - 1F1EC,1F1E7
+ - 1F1EC,1F1E9
+ - 1F1EC,1F1EA
+ - 1F1EC,1F1EB||30
+ - 1F1EC,1F1EC
+ - 1F1EC,1F1ED
+ - 1F1EC,1F1EE
+ - 1F1EC,1F1F1
+ - 1F1EC,1F1F2
+ - 1F1EC,1F1F3
+ - 1F1EC,1F1F5||30
+ - 1F1EC,1F1F6
+ - 1F1EC,1F1F7
+ - 1F1EC,1F1F8||30
+ - 1F1EC,1F1F9
+ - 1F1EC,1F1FA
+ - 1F1EC,1F1FC
+ - 1F1EC,1F1FE
+ - 1F1ED,1F1F0
- 1F1ED,1F1F2||24
- - 1F1ED,1F1F3||21
- - 1F1ED,1F1F7||21
- - 1F1ED,1F1F9||21
- - 1F1ED,1F1FA||21
+ - 1F1ED,1F1F3
+ - 1F1ED,1F1F7
+ - 1F1ED,1F1F9
+ - 1F1ED,1F1FA
- 1F1EE,1F1E8||24
- - 1F1EE,1F1E9||21
- - 1F1EE,1F1EA||21
- - 1F1EE,1F1F1||21
- - 1F1EE,1F1F2||21
- - 1F1EE,1F1F3||21
- - 1F1EE,1F1F4||21
- - 1F1EE,1F1F6||21
- - 1F1EE,1F1F7||21
- - 1F1EE,1F1F8||21
- - 1F1EE,1F1F9||21
- - 1F1EF,1F1EA||21
- - 1F1EF,1F1F2||21
- - 1F1EF,1F1F4||21
- - 1F1EF,1F1F5||21
- - 1F1F0,1F1EA||21
- - 1F1F0,1F1EC||21
- - 1F1F0,1F1ED||21
- - 1F1F0,1F1EE||21
- - 1F1F0,1F1F2||21
- - 1F1F0,1F1F3||21
- - 1F1F0,1F1F5||21
- - 1F1F0,1F1F7||21
- - 1F1F0,1F1FC||21
- - 1F1F0,1F1FE||21
- - 1F1F0,1F1FF||21
- - 1F1F1,1F1E6||21
- - 1F1F1,1F1E7||21
- - 1F1F1,1F1E8||21
- - 1F1F1,1F1EE||21
- - 1F1F1,1F1F0||21
- - 1F1F1,1F1F7||21
- - 1F1F1,1F1F8||21
- - 1F1F1,1F1F9||21
- - 1F1F1,1F1FA||21
- - 1F1F1,1F1FB||21
- - 1F1F1,1F1FE||21
- - 1F1F2,1F1E6||21
- - 1F1F2,1F1E8||21
- - 1F1F2,1F1E9||21
- - 1F1F2,1F1EA||21
- - 1F1F2,1F1EC||21
- - 1F1F2,1F1ED||21
- - 1F1F2,1F1F0||21
- - 1F1F2,1F1F1||21
- - 1F1F2,1F1F2||21
- - 1F1F2,1F1F3||21
- - 1F1F2,1F1F4||21
- - 1F1F2,1F1F5||21
+ - 1F1EE,1F1E9
+ - 1F1EE,1F1EA
+ - 1F1EE,1F1F1
+ - 1F1EE,1F1F2
+ - 1F1EE,1F1F3
+ - 1F1EE,1F1F4
+ - 1F1EE,1F1F6
+ - 1F1EE,1F1F7
+ - 1F1EE,1F1F8
+ - 1F1EE,1F1F9
+ - 1F1EF,1F1EA
+ - 1F1EF,1F1F2
+ - 1F1EF,1F1F4
+ - 1F1EF,1F1F5
+ - 1F1F0,1F1EA
+ - 1F1F0,1F1EC
+ - 1F1F0,1F1ED
+ - 1F1F0,1F1EE
+ - 1F1F0,1F1F2
+ - 1F1F0,1F1F3
+ - 1F1F0,1F1F5
+ - 1F1F0,1F1F7
+ - 1F1F0,1F1FC
+ - 1F1F0,1F1FE
+ - 1F1F0,1F1FF
+ - 1F1F1,1F1E6
+ - 1F1F1,1F1E7
+ - 1F1F1,1F1E8
+ - 1F1F1,1F1EE
+ - 1F1F1,1F1F0
+ - 1F1F1,1F1F7
+ - 1F1F1,1F1F8
+ - 1F1F1,1F1F9
+ - 1F1F1,1F1FA
+ - 1F1F1,1F1FB
+ - 1F1F1,1F1FE
+ - 1F1F2,1F1E6
+ - 1F1F2,1F1E8
+ - 1F1F2,1F1E9
+ - 1F1F2,1F1EA
+ - 1F1F2,1F1EB||30
+ - 1F1F2,1F1EC
+ - 1F1F2,1F1ED
+ - 1F1F2,1F1F0
+ - 1F1F2,1F1F1
+ - 1F1F2,1F1F2
+ - 1F1F2,1F1F3
+ - 1F1F2,1F1F4
+ - 1F1F2,1F1F5
- 1F1F2,1F1F6||29
- - 1F1F2,1F1F7||21
- - 1F1F2,1F1F8||21
- - 1F1F2,1F1F9||21
- - 1F1F2,1F1FA||21
- - 1F1F2,1F1FB||21
- - 1F1F2,1F1FC||21
- - 1F1F2,1F1FD||21
- - 1F1F2,1F1FE||21
- - 1F1F2,1F1FF||21
- - 1F1F3,1F1E6||21
- - 1F1F3,1F1EA||21
- - 1F1F3,1F1EB||21
- - 1F1F3,1F1EC||21
- - 1F1F3,1F1EE||21
- - 1F1F3,1F1F1||21
- - 1F1F3,1F1F4||21
- - 1F1F3,1F1F5||21
- - 1F1F3,1F1F7||21
- - 1F1F3,1F1FA||21
- - 1F1F3,1F1FF||21
- - 1F1F4,1F1F2||21
- - 1F1F5,1F1E6||21
- - 1F1F5,1F1EA||21
- - 1F1F5,1F1EB||21
- - 1F1F5,1F1EC||21
- - 1F1F5,1F1ED||21
- - 1F1F5,1F1F0||21
- - 1F1F5,1F1F1||21
- - 1F1F5,1F1F3||21
- - 1F1F5,1F1F7||21
- - 1F1F5,1F1F8||21
- - 1F1F5,1F1F9||21
- - 1F1F5,1F1FC||21
- - 1F1F5,1F1FE||21
- - 1F1F6,1F1E6||21
+ - 1F1F2,1F1F7
+ - 1F1F2,1F1F8
+ - 1F1F2,1F1F9
+ - 1F1F2,1F1FA
+ - 1F1F2,1F1FB
+ - 1F1F2,1F1FC
+ - 1F1F2,1F1FD
+ - 1F1F2,1F1FE
+ - 1F1F2,1F1FF
+ - 1F1F3,1F1E6
+ - 1F1F3,1F1E8||30
+ - 1F1F3,1F1EA
+ - 1F1F3,1F1EB
+ - 1F1F3,1F1EC
+ - 1F1F3,1F1EE
+ - 1F1F3,1F1F1
+ - 1F1F3,1F1F4
+ - 1F1F3,1F1F5
+ - 1F1F3,1F1F7
+ - 1F1F3,1F1FA
+ - 1F1F3,1F1FF
+ - 1F1F4,1F1F2
+ - 1F1F5,1F1E6
+ - 1F1F5,1F1EA
+ - 1F1F5,1F1EB
+ - 1F1F5,1F1EC
+ - 1F1F5,1F1ED
+ - 1F1F5,1F1F0
+ - 1F1F5,1F1F1
+ - 1F1F5,1F1F2||30
+ - 1F1F5,1F1F3
+ - 1F1F5,1F1F7
+ - 1F1F5,1F1F8
+ - 1F1F5,1F1F9
+ - 1F1F5,1F1FC
+ - 1F1F5,1F1FE
+ - 1F1F6,1F1E6
- 1F1F7,1F1EA||29
- - 1F1F7,1F1F4||21
- - 1F1F7,1F1F8||21
- - 1F1F7,1F1FA||21
- - 1F1F7,1F1FC||21
- - 1F1F8,1F1E6||21
- - 1F1F8,1F1E7||21
- - 1F1F8,1F1E8||21
- - 1F1F8,1F1E9||21
- - 1F1F8,1F1EA||21
- - 1F1F8,1F1EC||21
+ - 1F1F7,1F1F4
+ - 1F1F7,1F1F8
+ - 1F1F7,1F1FA
+ - 1F1F7,1F1FC
+ - 1F1F8,1F1E6
+ - 1F1F8,1F1E7
+ - 1F1F8,1F1E8
+ - 1F1F8,1F1E9
+ - 1F1F8,1F1EA
+ - 1F1F8,1F1EC
- 1F1F8,1F1ED||24
- - 1F1F8,1F1EE||21
+ - 1F1F8,1F1EE
- 1F1F8,1F1EF||24
- - 1F1F8,1F1F0||21
- - 1F1F8,1F1F1||21
- - 1F1F8,1F1F2||21
- - 1F1F8,1F1F3||21
- - 1F1F8,1F1F4||21
- - 1F1F8,1F1F7||21
- - 1F1F8,1F1F8||21
- - 1F1F8,1F1F9||21
- - 1F1F8,1F1FB||21
- - 1F1F8,1F1FD||21
- - 1F1F8,1F1FE||21
- - 1F1F8,1F1FF||21
+ - 1F1F8,1F1F0
+ - 1F1F8,1F1F1
+ - 1F1F8,1F1F2
+ - 1F1F8,1F1F3
+ - 1F1F8,1F1F4
+ - 1F1F8,1F1F7
+ - 1F1F8,1F1F8
+ - 1F1F8,1F1F9
+ - 1F1F8,1F1FB
+ - 1F1F8,1F1FD
+ - 1F1F8,1F1FE
+ - 1F1F8,1F1FF
- 1F1F9,1F1E6||24
- - 1F1F9,1F1E8||21
- - 1F1F9,1F1E9||21
+ - 1F1F9,1F1E8
+ - 1F1F9,1F1E9
- 1F1F9,1F1EB||29
- - 1F1F9,1F1EC||21
- - 1F1F9,1F1ED||21
- - 1F1F9,1F1EF||21
- - 1F1F9,1F1F0||21
- - 1F1F9,1F1F1||21
- - 1F1F9,1F1F2||21
- - 1F1F9,1F1F3||21
- - 1F1F9,1F1F4||21
- - 1F1F9,1F1F7||21
- - 1F1F9,1F1F9||21
- - 1F1F9,1F1FB||21
- - 1F1F9,1F1FC||21
- - 1F1F9,1F1FF||21
- - 1F1FA,1F1E6||21
- - 1F1FA,1F1EC||21
+ - 1F1F9,1F1EC
+ - 1F1F9,1F1ED
+ - 1F1F9,1F1EF
+ - 1F1F9,1F1F0
+ - 1F1F9,1F1F1
+ - 1F1F9,1F1F2
+ - 1F1F9,1F1F3
+ - 1F1F9,1F1F4
+ - 1F1F9,1F1F7
+ - 1F1F9,1F1F9
+ - 1F1F9,1F1FB
+ - 1F1F9,1F1FC
+ - 1F1F9,1F1FF
+ - 1F1FA,1F1E6
+ - 1F1FA,1F1EC
- 1F1FA,1F1F2||24
- 1F1FA,1F1F3||26
- - 1F1FA,1F1F8||21
- - 1F1FA,1F1FE||21
- - 1F1FA,1F1FF||21
- - 1F1FB,1F1E6||21
- - 1F1FB,1F1E8||21
- - 1F1FB,1F1EA||21
- - 1F1FB,1F1EC||21
- - 1F1FB,1F1EE||21
- - 1F1FB,1F1F3||21
- - 1F1FB,1F1FA||21
- - 1F1FC,1F1F8||21
+ - 1F1FA,1F1F8
+ - 1F1FA,1F1FE
+ - 1F1FA,1F1FF
+ - 1F1FB,1F1E6
+ - 1F1FB,1F1E8
+ - 1F1FB,1F1EA
+ - 1F1FB,1F1EC
+ - 1F1FB,1F1EE
+ - 1F1FB,1F1F3
+ - 1F1FB,1F1FA
+ - 1F1FC,1F1EB||30
+ - 1F1FC,1F1F8
- 1F1FD,1F1F0||29
- - 1F1FE,1F1EA||21
- - 1F1FF,1F1E6||21
- - 1F1FF,1F1F2||21
- - 1F1FF,1F1FC||21
+ - 1F1FE,1F1EA
+ - 1F1FE,1F1F9||30
+ - 1F1FF,1F1E6
+ - 1F1FF,1F1F2
+ - 1F1FF,1F1FC
- 1F3F4,E0067,E0062,E0065,E006E,E0067,E007F||26
- 1F3F4,E0067,E0062,E0073,E0063,E0074,E007F||26
- 1F3F4,E0067,E0062,E0077,E006C,E0073,E007F||26
diff --git a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
index c9b4df3e..223a93a9 100644
--- a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
+++ b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
@@ -121,7 +121,7 @@ class EmojiCategoriesResource(private val jarFile: JarFile) {
it.toString(radix = 16)
.uppercase()
}
- return if (minApi > 19) "$cps||$minApi" else cps
+ return if (minApi > 21) "$cps||$minApi" else cps
}
private fun getMinApi(codes: IntArray, supportData: Map): Int {