Skip to content

Commit af422c7

Browse files
authored
Merge pull request #59301 from c3024/add-Unicode-custom-emojis
Add Custom Emojis with Unicode Private User Area with a new font
2 parents 8fb6fe9 + 5e142be commit af422c7

31 files changed

Lines changed: 155 additions & 28 deletions

File tree

android/app/src/main/java/com/expensify/chat/MainApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ class MainApplication : MultiDexApplication(), ReactApplication {
6363

6464
override fun onCreate() {
6565
super.onCreate()
66+
ReactFontManager.getInstance().addCustomFont(this, "Custom Emoji Font", R.font.custom_emoji_font)
6667
ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
6768
ReactFontManager.getInstance().addCustomFont(this, "Expensify Neue", R.font.expensify_neue)
6869
ReactFontManager.getInstance().addCustomFont(this, "Expensify Mono", R.font.expensify_mono)
69-
7070
RNPerformance.getInstance().mark("appCreationStart", false);
7171

7272
if (isOnfidoProcess()) {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
3+
<font app:fontStyle="normal" app:fontWeight="400" app:font="@font/custom_emoji_native_font"/>
4+
</font-family>
1.11 KB
Binary file not shown.

android/link-assets-manifest.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"migIndex": 2,
33
"data": [
4+
{
5+
"path": "assets/fonts/native/CustomEmojiNativeFont.ttf",
6+
"sha1": "83acdb6db84b418c51037af51f96ff9c18273a62"
7+
},
48
{
59
"path": "assets/fonts/native/ExpensifyMono-Bold.otf",
610
"sha1": "d70e12540200613e9e6ac9068bed57e4bf477bfe"

assets/css/fonts.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
src: url('/fonts/seguiemj.ttf');
7474
}
7575

76+
@font-face {
77+
font-family: Custom Emoji Font;
78+
src: url('/fonts/CustomEmojiWebFont.ttf') format('truetype');
79+
}
80+
7681
* {
7782
-webkit-font-smoothing: antialiased;
7883
-moz-osx-font-smoothing: grayscale;

assets/emojis/common.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import TravelAndPlaces from '@assets/images/emojiCategoryIcons/plane.svg';
77
import AnimalsAndNature from '@assets/images/emojiCategoryIcons/plant.svg';
88
import Activities from '@assets/images/emojiCategoryIcons/soccer-ball.svg';
99
import FrequentlyUsed from '@assets/images/history.svg';
10+
import CONST from '@src/CONST';
1011
import type {HeaderEmoji, PickerEmojis} from './types';
1112

1213
const skinTones = [
@@ -7862,6 +7863,10 @@ const emojis: PickerEmojis = [
78627863
name: 'wales',
78637864
code: '🏴󠁧󠁢󠁷󠁬󠁳󠁿',
78647865
},
7866+
{
7867+
name: 'global_create',
7868+
code: CONST.CUSTOM_EMOJIS.GLOBAL_CREATE,
7869+
},
78657870
];
78667871

78677872
const categoryFrequentlyUsed: HeaderEmoji = {

assets/emojis/en.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5613,6 +5613,9 @@ const enEmojis: EmojisList = {
56135613
'🏴󠁧󠁢󠁷󠁬󠁳󠁿': {
56145614
keywords: ['flag'],
56155615
},
5616+
'\uE100': {
5617+
keywords: ['fab', 'floating', 'action', 'button', 'green', 'plus'],
5618+
},
56165619
};
56175620

56185621
export default enEmojis;

assets/emojis/es.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7483,6 +7483,10 @@ const esEmojis: EmojisList = {
74837483
name: 'gales',
74847484
keywords: ['bandera', 'bandera-gales'],
74857485
},
7486+
'\uE100': {
7487+
name: 'crear-global',
7488+
keywords: ['fab', 'flotante', 'acción', 'botón', 'verde', 'más'],
7489+
},
74867490
};
74877491

74887492
export default esEmojis;
1.11 KB
Binary file not shown.
1.11 KB
Binary file not shown.

0 commit comments

Comments
 (0)