diff --git a/.storybook/fonts.css b/.storybook/fonts.css index 906490c3a9d9..05002d893e61 100644 --- a/.storybook/fonts.css +++ b/.storybook/fonts.css @@ -1,52 +1,59 @@ @font-face { - font-family: ExpensifyNeue-Regular; + font-family: Expensify Neue; font-weight: 400; font-style: normal; src: url('../assets/fonts/web/ExpensifyNeue-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Regular.woff') format('woff'); } @font-face { - font-family: ExpensifyNeue-Regular; + font-family: Expensify Neue; font-weight: 700; font-style: normal; src: url('../assets/fonts/web/ExpensifyNeue-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Bold.woff') format('woff'); } @font-face { - font-family: ExpensifyNeue-Regular; + font-family: Expensify Neue; font-weight: 400; font-style: italic; src: url('../assets/fonts/web/ExpensifyNeue-Italic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Italic.woff') format('woff'); } @font-face { - font-family: ExpensifyNeue-Regular; + font-family: Expensify Neue; font-weight: 700; font-style: italic; src: url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff') format('woff'); } @font-face { - font-family: ExpensifyMono-Regular; + font-family: Expensify Mono; font-weight: 400; font-style: normal; src: url('../assets/fonts/web/ExpensifyMono-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Regular.woff') format('woff'); } @font-face { - font-family: ExpensifyMono-Bold; + font-family: Expensify Mono; font-weight: 700; font-style: normal; src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Bold.woff') format('woff'); } @font-face { - font-family: ExpensifyNewKansas-Medium; - font-weight: 400; + font-family: Expensify New Kansas; + font-weight: 500; font-style: normal; src: url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff') format('woff'); } +@font-face { + font-family: Expensify New Kansas; + font-weight: 500; + font-style: italic; + src: url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff') format('woff'); +} + * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/.storybook/theme.ts b/.storybook/theme.ts index 7fc55a549a4a..ace6208bdb3b 100644 --- a/.storybook/theme.ts +++ b/.storybook/theme.ts @@ -6,7 +6,7 @@ import colors from '../src/styles/theme/colors'; const theme: ThemeVars = create({ brandTitle: 'New Expensify UI Docs', brandImage: 'logomark.svg', - fontBase: 'ExpensifyNeue-Regular', + fontBase: 'Expensify Neue', fontCode: 'monospace', base: 'dark', appBg: colors.productDark200, diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.kt b/android/app/src/main/java/com/expensify/chat/MainApplication.kt index e660a871359d..dac9e68b705b 100644 --- a/android/app/src/main/java/com/expensify/chat/MainApplication.kt +++ b/android/app/src/main/java/com/expensify/chat/MainApplication.kt @@ -1,5 +1,7 @@ package com.expensify.chat +import com.facebook.react.common.assets.ReactFontManager + import android.app.ActivityManager import android.content.res.Configuration import android.database.CursorWindow @@ -42,6 +44,9 @@ class MainApplication : MultiDexApplication(), ReactApplication { override fun onCreate() { super.onCreate() + ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas) + ReactFontManager.getInstance().addCustomFont(this, "Expensify Neue", R.font.expensify_neue) + ReactFontManager.getInstance().addCustomFont(this, "Expensify Mono", R.font.expensify_mono) RNPerformance.getInstance().mark("appCreationStart", false); diff --git a/android/app/src/main/res/font/expensify_mono.xml b/android/app/src/main/res/font/expensify_mono.xml new file mode 100644 index 000000000000..346a34ba22b6 --- /dev/null +++ b/android/app/src/main/res/font/expensify_mono.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/font/expensify_neue.xml b/android/app/src/main/res/font/expensify_neue.xml new file mode 100644 index 000000000000..74cd402c5535 --- /dev/null +++ b/android/app/src/main/res/font/expensify_neue.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/android/app/src/main/res/font/expensify_new_kansas.xml b/android/app/src/main/res/font/expensify_new_kansas.xml new file mode 100644 index 000000000000..18c2426cdad2 --- /dev/null +++ b/android/app/src/main/res/font/expensify_new_kansas.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/res/font/expensifymono_bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf rename to android/app/src/main/res/font/expensifymono_bold.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/res/font/expensifymono_regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf rename to android/app/src/main/res/font/expensifymono_regular.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/res/font/expensifyneue_bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf rename to android/app/src/main/res/font/expensifyneue_bold.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/res/font/expensifyneue_bolditalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf rename to android/app/src/main/res/font/expensifyneue_bolditalic.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/res/font/expensifyneue_italic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf rename to android/app/src/main/res/font/expensifyneue_italic.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/res/font/expensifyneue_regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf rename to android/app/src/main/res/font/expensifyneue_regular.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/res/font/expensifynewkansas_medium.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf rename to android/app/src/main/res/font/expensifynewkansas_medium.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/res/font/expensifynewkansas_mediumitalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf rename to android/app/src/main/res/font/expensifynewkansas_mediumitalic.otf diff --git a/android/app/src/main/res/font/expneuebold.otf b/android/app/src/main/res/font/expneuebold.otf deleted file mode 100755 index 7534aecda322..000000000000 Binary files a/android/app/src/main/res/font/expneuebold.otf and /dev/null differ diff --git a/android/app/src/main/res/font/expneueregular.otf b/android/app/src/main/res/font/expneueregular.otf deleted file mode 100755 index d4d8cbe63b44..000000000000 Binary files a/android/app/src/main/res/font/expneueregular.otf and /dev/null differ diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index a040598e982d..75126afbd407 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -24,7 +24,7 @@ @@ -37,15 +37,15 @@