Skip to content

Commit 5ccc486

Browse files
bmartybmarty
authored
Merge pull request #8795 from element-hq/sync-emojis
Sync Emojis
2 parents 9b4394b + e337be2 commit 5ccc486

File tree

2 files changed

+97
-35
lines changed

2 files changed

+97
-35
lines changed

‎tools/emojis/emoji_picker_datasource_formatted.json

Lines changed: 96 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2638,18 +2638,20 @@
26382638
"a": "⊛ Head Shaking Horizontally",
26392639
"b": "1F642-200D-2194-FE0F",
26402640
"j": [
2641-
"head shaking horizontally",
26422641
"no",
2643-
"shake"
2642+
"shake",
2643+
"disapprove",
2644+
"indiffernt",
2645+
"left"
26442646
]
26452647
},
26462648
"head-shaking-vertically": {
26472649
"a": "⊛ Head Shaking Vertically",
26482650
"b": "1F642-200D-2195-FE0F",
26492651
"j": [
2650-
"head shaking vertically",
26512652
"nod",
2652-
"yes"
2653+
"yes",
2654+
"down"
26532655
]
26542656
},
26552657
"relieved-face": {
@@ -6941,21 +6943,27 @@
69416943
"a": "⊛ Person Walking Facing Right",
69426944
"b": "1F6B6-200D-27A1-FE0F",
69436945
"j": [
6944-
""
6946+
"",
6947+
"peerson",
6948+
"exercise"
69456949
]
69466950
},
69476951
"woman-walking-facing-right": {
69486952
"a": "⊛ Woman Walking Facing Right",
69496953
"b": "1F6B6-200D-2640-FE0F-200D-27A1-FE0F",
69506954
"j": [
6951-
""
6955+
"",
6956+
"person",
6957+
"exercise"
69526958
]
69536959
},
69546960
"man-walking-facing-right": {
69556961
"a": "⊛ Man Walking Facing Right",
69566962
"b": "1F6B6-200D-2642-FE0F-200D-27A1-FE0F",
69576963
"j": [
6958-
""
6964+
"",
6965+
"person",
6966+
"exercise"
69596967
]
69606968
},
69616969
"person-standing": {
@@ -7019,21 +7027,26 @@
70197027
"a": "⊛ Person Kneeling Facing Right",
70207028
"b": "1F9CE-200D-27A1-FE0F",
70217029
"j": [
7022-
""
7030+
"",
7031+
"pray"
70237032
]
70247033
},
70257034
"woman-kneeling-facing-right": {
70267035
"a": "⊛ Woman Kneeling Facing Right",
70277036
"b": "1F9CE-200D-2640-FE0F-200D-27A1-FE0F",
70287037
"j": [
7029-
""
7038+
"",
7039+
"pray",
7040+
"worship"
70307041
]
70317042
},
70327043
"man-kneeling-facing-right": {
70337044
"a": "⊛ Man Kneeling Facing Right",
70347045
"b": "1F9CE-200D-2642-FE0F-200D-27A1-FE0F",
70357046
"j": [
7036-
""
7047+
"",
7048+
"pray",
7049+
"worship"
70377050
]
70387051
},
70397052
"person-with-white-cane": {
@@ -7049,7 +7062,10 @@
70497062
"a": "⊛ Person with White Cane Facing Right",
70507063
"b": "1F9D1-200D-1F9AF-200D-27A1-FE0F",
70517064
"j": [
7052-
""
7065+
"",
7066+
"walk",
7067+
"visually impaired",
7068+
"blind"
70537069
]
70547070
},
70557071
"man-with-white-cane": {
@@ -7066,7 +7082,11 @@
70667082
"a": "⊛ Man with White Cane Facing Right",
70677083
"b": "1F468-200D-1F9AF-200D-27A1-FE0F",
70687084
"j": [
7069-
""
7085+
"",
7086+
"visually impaired",
7087+
"blind",
7088+
"walk",
7089+
"stick"
70707090
]
70717091
},
70727092
"woman-with-white-cane": {
@@ -7083,7 +7103,10 @@
70837103
"a": "⊛ Woman with White Cane Facing Right",
70847104
"b": "1F469-200D-1F9AF-200D-27A1-FE0F",
70857105
"j": [
7086-
""
7106+
"",
7107+
"stick",
7108+
"visually impaired",
7109+
"blind"
70877110
]
70887111
},
70897112
"person-in-motorized-wheelchair": {
@@ -7099,7 +7122,9 @@
70997122
"a": "⊛ Person in Motorized Wheelchair Facing Right",
71007123
"b": "1F9D1-200D-1F9BC-200D-27A1-FE0F",
71017124
"j": [
7102-
""
7125+
"",
7126+
"accessibility",
7127+
"disability"
71037128
]
71047129
},
71057130
"man-in-motorized-wheelchair": {
@@ -7116,7 +7141,10 @@
71167141
"a": "⊛ Man in Motorized Wheelchair Facing Right",
71177142
"b": "1F468-200D-1F9BC-200D-27A1-FE0F",
71187143
"j": [
7119-
""
7144+
"",
7145+
"disability",
7146+
"accessibility",
7147+
"mobility"
71207148
]
71217149
},
71227150
"woman-in-motorized-wheelchair": {
@@ -7133,7 +7161,10 @@
71337161
"a": "⊛ Woman in Motorized Wheelchair Facing Right",
71347162
"b": "1F469-200D-1F9BC-200D-27A1-FE0F",
71357163
"j": [
7136-
""
7164+
"",
7165+
"mobility",
7166+
"accessibility",
7167+
"disability"
71377168
]
71387169
},
71397170
"person-in-manual-wheelchair": {
@@ -7149,7 +7180,10 @@
71497180
"a": "⊛ Person in Manual Wheelchair Facing Right",
71507181
"b": "1F9D1-200D-1F9BD-200D-27A1-FE0F",
71517182
"j": [
7152-
""
7183+
"",
7184+
"mobility",
7185+
"accessibility",
7186+
"disability"
71537187
]
71547188
},
71557189
"man-in-manual-wheelchair": {
@@ -7166,7 +7200,10 @@
71667200
"a": "⊛ Man in Manual Wheelchair Facing Right",
71677201
"b": "1F468-200D-1F9BD-200D-27A1-FE0F",
71687202
"j": [
7169-
""
7203+
"",
7204+
"mobility",
7205+
"accessibility",
7206+
"disability"
71707207
]
71717208
},
71727209
"woman-in-manual-wheelchair": {
@@ -7183,7 +7220,10 @@
71837220
"a": "⊛ Woman in Manual Wheelchair Facing Right",
71847221
"b": "1F469-200D-1F9BD-200D-27A1-FE0F",
71857222
"j": [
7186-
""
7223+
"",
7224+
"disability",
7225+
"mobility",
7226+
"accessibility"
71877227
]
71887228
},
71897229
"person-running": {
@@ -7226,21 +7266,27 @@
72267266
"a": "⊛ Person Running Facing Right",
72277267
"b": "1F3C3-200D-27A1-FE0F",
72287268
"j": [
7229-
""
7269+
"",
7270+
"exercise",
7271+
"jog"
72307272
]
72317273
},
72327274
"woman-running-facing-right": {
72337275
"a": "⊛ Woman Running Facing Right",
72347276
"b": "1F3C3-200D-2640-FE0F-200D-27A1-FE0F",
72357277
"j": [
7236-
""
7278+
"",
7279+
"exercise",
7280+
"jog"
72377281
]
72387282
},
72397283
"man-running-facing-right": {
72407284
"a": "⊛ Man Running Facing Right",
72417285
"b": "1F3C3-200D-2642-FE0F-200D-27A1-FE0F",
72427286
"j": [
7243-
""
7287+
"",
7288+
"jog",
7289+
"exercise"
72447290
]
72457291
},
72467292
"woman-dancing": {
@@ -8538,28 +8584,40 @@
85388584
"a": "⊛ Family: Adult, Adult, Child",
85398585
"b": "1F9D1-200D-1F9D1-200D-1F9D2",
85408586
"j": [
8541-
"family: adult, adult, child"
8587+
"family: adult, adult, child",
8588+
"family adult, adult, child",
8589+
"kid",
8590+
"parents"
85428591
]
85438592
},
85448593
"family-adult-adult-child-child": {
85458594
"a": "⊛ Family: Adult, Adult, Child, Child",
85468595
"b": "1F9D1-200D-1F9D1-200D-1F9D2-200D-1F9D2",
85478596
"j": [
8548-
"family: adult, adult, child, child"
8597+
"family: adult, adult, child, child",
8598+
"family adult, adult, child, child",
8599+
"children",
8600+
"parents"
85498601
]
85508602
},
85518603
"family-adult-child": {
85528604
"a": "⊛ Family: Adult, Child",
85538605
"b": "1F9D1-200D-1F9D2",
85548606
"j": [
8555-
"family: adult, child"
8607+
"family: adult, child",
8608+
"family adult, child",
8609+
"parent",
8610+
"kid"
85568611
]
85578612
},
85588613
"family-adult-child-child": {
85598614
"a": "⊛ Family: Adult, Child, Child",
85608615
"b": "1F9D1-200D-1F9D2-200D-1F9D2",
85618616
"j": [
8562-
"family: adult, child, child"
8617+
"family: adult, child, child",
8618+
"family adult, child, child",
8619+
"parent",
8620+
"children"
85638621
]
85648622
},
85658623
"footprints": {
@@ -9564,9 +9622,12 @@
95649622
"j": [
95659623
"fantasy",
95669624
"firebird",
9567-
"phoenix",
95689625
"rebirth",
9569-
"reincarnation"
9626+
"reincarnation",
9627+
"immortal",
9628+
"bird",
9629+
"mythtical",
9630+
"reborn"
95709631
]
95719632
},
95729633
"frog": {
@@ -10364,8 +10425,9 @@
1036410425
"j": [
1036510426
"citrus",
1036610427
"fruit",
10367-
"lime",
10368-
"tropical"
10428+
"tropical",
10429+
"acidic",
10430+
"citric"
1036910431
]
1037010432
},
1037110433
"banana": {
@@ -10689,11 +10751,11 @@
1068910751
"a": "⊛ Brown Mushroom",
1069010752
"b": "1F344-200D-1F7EB",
1069110753
"j": [
10692-
"brown mushroom",
1069310754
"food",
1069410755
"fungus",
1069510756
"nature",
10696-
"vegetable"
10757+
"vegetable",
10758+
"toadstool"
1069710759
]
1069810760
},
1069910761
"bread": {
@@ -17986,10 +18048,10 @@
1798618048
"j": [
1798718049
"break",
1798818050
"breaking",
17989-
"broken chain",
1799018051
"chain",
1799118052
"cuffs",
17992-
"freedom"
18053+
"freedom",
18054+
"constraint"
1799318055
]
1799418056
},
1799518057
"chains": {

‎vector/src/main/res/raw/emoji_picker_datasource.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)