diff --git a/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf similarity index 100% rename from assets/fonts/ExpensifyMono-Bold.otf rename to android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf diff --git a/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf similarity index 100% rename from assets/fonts/ExpensifyMono-Regular.otf rename to android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf diff --git a/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf similarity index 100% rename from assets/fonts/ExpensifyNeue-Bold.otf rename to android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf similarity index 100% rename from assets/fonts/ExpensifyNeue-BoldItalic.otf rename to android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf diff --git a/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf similarity index 100% rename from assets/fonts/ExpensifyNeue-Italic.otf rename to android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf diff --git a/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf similarity index 100% rename from assets/fonts/ExpensifyNeue-Regular.otf rename to android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf diff --git a/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf similarity index 100% rename from assets/fonts/ExpensifyNewKansas-Medium.otf rename to android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf diff --git a/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf similarity index 100% rename from assets/fonts/ExpensifyNewKansas-MediumItalic.otf rename to android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json new file mode 100644 index 000000000000..300d198bd626 --- /dev/null +++ b/android/link-assets-manifest.json @@ -0,0 +1,37 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/native/ExpensifyMono-Bold.otf", + "sha1": "6b83b1c1c0c8650f6258fd05771b4e25696c4046" + }, + { + "path": "assets/fonts/native/ExpensifyMono-Regular.otf", + "sha1": "c0522536213e24609badc298ed82a6c47cdb5b20" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Bold.otf", + "sha1": "c61cccfb6091f06381fa5b514272eab7105246d8" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-BoldItalic.otf", + "sha1": "039065b262036e708ebb5f64b236ef08cc4e8f4e" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Italic.otf", + "sha1": "7ddd0652175a9f27380fc63eec4395d65ed189eb" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Regular.otf", + "sha1": "57b2cdd2f4adea3fad34464248502cd4edcaadd7" + }, + { + "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf", + "sha1": "b07181fac8d0602d4b18c339bdbef9589c67c9f9" + }, + { + "path": "assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf", + "sha1": "00636ab2038c9690a123985b70a944c42cf65b8a" + } + ] +} diff --git a/assets/css/fonts.css b/assets/css/fonts.css index 03f4d019b731..6e48be0e2b56 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -6,23 +6,23 @@ } @font-face { - font-family: ExpensifyNeue-Bold; + font-family: ExpensifyNeue-Regular; font-weight: 700; font-style: normal; src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff'); } @font-face { - font-family: ExpensifyNeue-Italic; + font-family: ExpensifyNeue-Regular; font-weight: 400; - font-style: normal; + font-style: italic; src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff'); } @font-face { - font-family: ExpensifyNeue-BoldItalic; + font-family: ExpensifyNeue-Regular; font-weight: 700; - font-style: normal; + font-style: italic; src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff'); } diff --git a/android/app/src/main/assets/fonts/Expensify-Mono-Bold.otf b/assets/fonts/native/ExpensifyMono-Bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Mono-Bold.otf rename to assets/fonts/native/ExpensifyMono-Bold.otf diff --git a/android/app/src/main/assets/fonts/Expensify-Mono-Regular.otf b/assets/fonts/native/ExpensifyMono-Regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Mono-Regular.otf rename to assets/fonts/native/ExpensifyMono-Regular.otf diff --git a/android/app/src/main/assets/fonts/Expensify-Neue-Bold.otf b/assets/fonts/native/ExpensifyNeue-Bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Neue-Bold.otf rename to assets/fonts/native/ExpensifyNeue-Bold.otf diff --git a/android/app/src/main/assets/fonts/Expensify-Neue-BoldItalic.otf b/assets/fonts/native/ExpensifyNeue-BoldItalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Neue-BoldItalic.otf rename to assets/fonts/native/ExpensifyNeue-BoldItalic.otf diff --git a/android/app/src/main/assets/fonts/Expensify-Neue-Italic.otf b/assets/fonts/native/ExpensifyNeue-Italic.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Neue-Italic.otf rename to assets/fonts/native/ExpensifyNeue-Italic.otf diff --git a/android/app/src/main/assets/fonts/Expensify-Neue-Regular.otf b/assets/fonts/native/ExpensifyNeue-Regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-Neue-Regular.otf rename to assets/fonts/native/ExpensifyNeue-Regular.otf diff --git a/android/app/src/main/assets/fonts/Expensify-New-Kansas-Medium.otf b/assets/fonts/native/ExpensifyNewKansas-Medium.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-New-Kansas-Medium.otf rename to assets/fonts/native/ExpensifyNewKansas-Medium.otf diff --git a/android/app/src/main/assets/fonts/Expensify-New-Kansas-MediumItalic.otf b/assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/Expensify-New-Kansas-MediumItalic.otf rename to assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf diff --git a/assets/fonts/ExpensifyMono-Bold.woff b/assets/fonts/web/ExpensifyMono-Bold.woff similarity index 100% rename from assets/fonts/ExpensifyMono-Bold.woff rename to assets/fonts/web/ExpensifyMono-Bold.woff diff --git a/assets/fonts/ExpensifyMono-Bold.woff2 b/assets/fonts/web/ExpensifyMono-Bold.woff2 similarity index 100% rename from assets/fonts/ExpensifyMono-Bold.woff2 rename to assets/fonts/web/ExpensifyMono-Bold.woff2 diff --git a/assets/fonts/ExpensifyMono-Regular.woff b/assets/fonts/web/ExpensifyMono-Regular.woff similarity index 100% rename from assets/fonts/ExpensifyMono-Regular.woff rename to assets/fonts/web/ExpensifyMono-Regular.woff diff --git a/assets/fonts/ExpensifyMono-Regular.woff2 b/assets/fonts/web/ExpensifyMono-Regular.woff2 similarity index 100% rename from assets/fonts/ExpensifyMono-Regular.woff2 rename to assets/fonts/web/ExpensifyMono-Regular.woff2 diff --git a/assets/fonts/ExpensifyNeue-Bold.woff b/assets/fonts/web/ExpensifyNeue-Bold.woff similarity index 100% rename from assets/fonts/ExpensifyNeue-Bold.woff rename to assets/fonts/web/ExpensifyNeue-Bold.woff diff --git a/assets/fonts/ExpensifyNeue-Bold.woff2 b/assets/fonts/web/ExpensifyNeue-Bold.woff2 similarity index 100% rename from assets/fonts/ExpensifyNeue-Bold.woff2 rename to assets/fonts/web/ExpensifyNeue-Bold.woff2 diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff b/assets/fonts/web/ExpensifyNeue-BoldItalic.woff similarity index 100% rename from assets/fonts/ExpensifyNeue-BoldItalic.woff rename to assets/fonts/web/ExpensifyNeue-BoldItalic.woff diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff2 b/assets/fonts/web/ExpensifyNeue-BoldItalic.woff2 similarity index 100% rename from assets/fonts/ExpensifyNeue-BoldItalic.woff2 rename to assets/fonts/web/ExpensifyNeue-BoldItalic.woff2 diff --git a/assets/fonts/ExpensifyNeue-Italic.woff b/assets/fonts/web/ExpensifyNeue-Italic.woff similarity index 100% rename from assets/fonts/ExpensifyNeue-Italic.woff rename to assets/fonts/web/ExpensifyNeue-Italic.woff diff --git a/assets/fonts/ExpensifyNeue-Italic.woff2 b/assets/fonts/web/ExpensifyNeue-Italic.woff2 similarity index 100% rename from assets/fonts/ExpensifyNeue-Italic.woff2 rename to assets/fonts/web/ExpensifyNeue-Italic.woff2 diff --git a/assets/fonts/ExpensifyNeue-Regular.woff b/assets/fonts/web/ExpensifyNeue-Regular.woff similarity index 100% rename from assets/fonts/ExpensifyNeue-Regular.woff rename to assets/fonts/web/ExpensifyNeue-Regular.woff diff --git a/assets/fonts/ExpensifyNeue-Regular.woff2 b/assets/fonts/web/ExpensifyNeue-Regular.woff2 similarity index 100% rename from assets/fonts/ExpensifyNeue-Regular.woff2 rename to assets/fonts/web/ExpensifyNeue-Regular.woff2 diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.otf b/assets/fonts/web/ExpensifyNewKansas-Medium.otf new file mode 100755 index 000000000000..a7277555fad9 Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-Medium.otf differ diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf new file mode 100755 index 000000000000..984ef4bfa2d4 Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf differ diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js index ef1f46e8383f..ec4f4656fddc 100644 --- a/config/webpack/webpack.common.js +++ b/config/webpack/webpack.common.js @@ -90,7 +90,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ {from: 'web/favicon-unread.png'}, {from: 'web/og-preview-image.png'}, {from: 'assets/css', to: 'css'}, - {from: 'assets/fonts', to: 'fonts'}, + {from: 'assets/fonts/web', to: 'fonts'}, {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'}, {from: 'assets/images/shadow.png', to: 'images/shadow.png'}, {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'}, @@ -189,7 +189,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ use: ['style-loader', 'css-loader'], }, { - test: /\.(woff|woff2)$/i, + test: /\.(woff|woff2|otf)$/i, type: 'asset', }, { diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 708956b75d26..390ba358e87d 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -18,14 +18,6 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 18D050E0262400AF000D658B /* BridgingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D050DF262400AF000D658B /* BridgingFile.swift */; }; 374FB8D728A133FE000D84EF /* OriginImageRequestHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */; }; - 597489DE2936B81100AE6F8B /* ExpensifyNeue-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */; }; - 597489DF2936B81400AE6F8B /* ExpensifyMono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */; }; - 597489E02936B81600AE6F8B /* ExpensifyMono-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */; }; - 597489E12936B81900AE6F8B /* ExpensifyNewKansas-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */; }; - 597489E22936B81C00AE6F8B /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */; }; - 597489E32936B81E00AE6F8B /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */; }; - 597489E42936B82000AE6F8B /* ExpensifyNeue-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */; }; - 597489E52936B82200AE6F8B /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */; }; 5E2EE3856BE7BC98F354B110 /* libPods-NewExpensify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */; }; 7041848526A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; 7041848626A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; @@ -34,6 +26,14 @@ E3B48DC1ED4CC64F660388A8 /* libPods-NewExpensify-NewExpensifyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2695CF895D81C31AFB4A074 /* libPods-NewExpensify-NewExpensifyTests.a */; }; E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; }; F0C450EA2705020500FD2970 /* colors.json in Resources */ = {isa = PBXBuildFile; fileRef = F0C450E92705020500FD2970 /* colors.json */; }; + 9316CFCA15184920AE24E3CC /* ExpensifyMono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */; }; + 1D9EC75069BF4FDB88DF2BA7 /* ExpensifyMono-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */; }; + A5158169CD604A77A22AE02A /* ExpensifyNeue-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */; }; + 95C1920F4FFC403E9C16013C /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */; }; + 63D866D568A14A61AD27E20A /* ExpensifyNeue-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */; }; + 5E272EE622CC4C768F4EC64D /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */; }; + 4FB4804CA0154A0382C7EAE1 /* ExpensifyNewKansas-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */; }; + 07C7A32C41FC466C85598ADD /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -67,14 +67,6 @@ 374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OriginImageRequestHandler.h; path = NewExpensify/OriginImageRequestHandler.h; sourceTree = ""; }; 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OriginImageRequestHandler.mm; path = NewExpensify/OriginImageRequestHandler.mm; sourceTree = ""; }; 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/ExpensifyNeue-Regular.otf"; sourceTree = ""; }; - 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; }; - 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/ExpensifyNeue-Italic.otf"; sourceTree = ""; }; - 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/ExpensifyNeue-Bold.otf"; sourceTree = ""; }; - 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/ExpensifyMono-Bold.otf"; sourceTree = ""; }; - 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/ExpensifyMono-Regular.otf"; sourceTree = ""; }; - 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; }; - 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; }; 7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = ""; }; 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = ""; }; 70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = ""; }; @@ -86,6 +78,14 @@ ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; F0C450E92705020500FD2970 /* colors.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = colors.json; path = ../colors.json; sourceTree = ""; }; + 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/native/ExpensifyMono-Bold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/native/ExpensifyMono-Regular.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/native/ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/native/ExpensifyNeue-Italic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/native/ExpensifyNeue-Regular.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -197,14 +197,14 @@ A9EA265D209D4558995C9BD4 /* Resources */ = { isa = PBXGroup; children = ( - 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */, - 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */, - 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */, - 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */, - 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */, - 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */, - 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */, - 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */, + 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */, + 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */, + EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */, + 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */, + 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */, + 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */, + 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */, + 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */, ); name = Resources; sourceTree = ""; @@ -320,19 +320,19 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 597489E52936B82200AE6F8B /* ExpensifyNeue-Regular.otf in Resources */, - 597489E22936B81C00AE6F8B /* ExpensifyNewKansas-MediumItalic.otf in Resources */, 0F5BE0CE252686330097D869 /* GoogleService-Info.plist in Resources */, - 597489E02936B81600AE6F8B /* ExpensifyMono-Regular.otf in Resources */, E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */, F0C450EA2705020500FD2970 /* colors.json in Resources */, - 597489E32936B81E00AE6F8B /* ExpensifyNeue-BoldItalic.otf in Resources */, - 597489DF2936B81400AE6F8B /* ExpensifyMono-Bold.otf in Resources */, - 597489E12936B81900AE6F8B /* ExpensifyNewKansas-Medium.otf in Resources */, - 597489E42936B82000AE6F8B /* ExpensifyNeue-Italic.otf in Resources */, - 597489DE2936B81100AE6F8B /* ExpensifyNeue-Bold.otf in Resources */, 0CDA8E37287DD6A0004ECBEC /* Images.xcassets in Resources */, 70CF6E82262E297300711ADC /* BootSplash.storyboard in Resources */, + 9316CFCA15184920AE24E3CC /* ExpensifyMono-Bold.otf in Resources */, + 1D9EC75069BF4FDB88DF2BA7 /* ExpensifyMono-Regular.otf in Resources */, + A5158169CD604A77A22AE02A /* ExpensifyNeue-Bold.otf in Resources */, + 95C1920F4FFC403E9C16013C /* ExpensifyNeue-BoldItalic.otf in Resources */, + 63D866D568A14A61AD27E20A /* ExpensifyNeue-Italic.otf in Resources */, + 5E272EE622CC4C768F4EC64D /* ExpensifyNeue-Regular.otf in Resources */, + 4FB4804CA0154A0382C7EAE1 /* ExpensifyNewKansas-Medium.otf in Resources */, + 07C7A32C41FC466C85598ADD /* ExpensifyNewKansas-MediumItalic.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 0bda69a4cc53..21e9b5584e4f 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -75,14 +75,15 @@ Your photos are used to create chat attachments. UIAppFonts - ExpensifyNewKansas-MediumItalic.otf ExpensifyNewKansas-Meduim.otf - ExpensifyNeue-Regular.otf - ExpensifyNeue-Italic.otf - ExpensifyNeue-BoldItalic.otf - ExpensifyNeue-Bold.otf - ExpensifyMono-Regular.otf ExpensifyMono-Bold.otf + ExpensifyMono-Regular.otf + ExpensifyNeue-Bold.otf + ExpensifyNeue-BoldItalic.otf + ExpensifyNeue-Italic.otf + ExpensifyNeue-Regular.otf + ExpensifyNewKansas-Medium.otf + ExpensifyNewKansas-MediumItalic.otf UIBackgroundModes diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json new file mode 100644 index 000000000000..300d198bd626 --- /dev/null +++ b/ios/link-assets-manifest.json @@ -0,0 +1,37 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/native/ExpensifyMono-Bold.otf", + "sha1": "6b83b1c1c0c8650f6258fd05771b4e25696c4046" + }, + { + "path": "assets/fonts/native/ExpensifyMono-Regular.otf", + "sha1": "c0522536213e24609badc298ed82a6c47cdb5b20" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Bold.otf", + "sha1": "c61cccfb6091f06381fa5b514272eab7105246d8" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-BoldItalic.otf", + "sha1": "039065b262036e708ebb5f64b236ef08cc4e8f4e" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Italic.otf", + "sha1": "7ddd0652175a9f27380fc63eec4395d65ed189eb" + }, + { + "path": "assets/fonts/native/ExpensifyNeue-Regular.otf", + "sha1": "57b2cdd2f4adea3fad34464248502cd4edcaadd7" + }, + { + "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf", + "sha1": "b07181fac8d0602d4b18c339bdbef9589c67c9f9" + }, + { + "path": "assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf", + "sha1": "00636ab2038c9690a123985b70a944c42cf65b8a" + } + ] +} diff --git a/react-native.config.js b/react-native.config.js index 2b5d66c82ce4..a5a2148e06de 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -3,5 +3,5 @@ module.exports = { ios: {}, android: {}, }, - assets: ['./assets/fonts/'], + assets: ['./assets/fonts/native'], }; diff --git a/src/styles/fontFamily/index.js b/src/styles/fontFamily/index.js index 24bb3b3f73f9..a72945b7c838 100644 --- a/src/styles/fontFamily/index.js +++ b/src/styles/fontFamily/index.js @@ -7,9 +7,9 @@ const fontFamily = { EXP_NEUE: 'ExpensifyNeue-Regular', SYSTEM: 'System', MONOSPACE: 'ExpensifyMono-Regular', - MONOSPACE_ITALIC: 'ExpensifyMono-Italic', + MONOSPACE_ITALIC: 'ExpensifyMono-Regular', MONOSPACE_BOLD: 'ExpensifyMono-Bold', - MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-BoldItalic', + MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold', EMOJI_TEXT_FONT: emojiFont, };