diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf new file mode 100755 index 0000000000000..b0b9e28e6786a Binary files /dev/null and b/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf new file mode 100755 index 0000000000000..05aee02bbf80a Binary files /dev/null and b/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf new file mode 100755 index 0000000000000..9cb4f78ff57ec Binary files /dev/null and b/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf differ diff --git a/assets/fonts/GTAmericaExp-BdIt.otf b/assets/fonts/GTAmericaExp-BdIt.otf new file mode 100755 index 0000000000000..b0b9e28e6786a Binary files /dev/null and b/assets/fonts/GTAmericaExp-BdIt.otf differ diff --git a/assets/fonts/GTAmericaExp-MdIt.otf b/assets/fonts/GTAmericaExp-MdIt.otf new file mode 100755 index 0000000000000..05aee02bbf80a Binary files /dev/null and b/assets/fonts/GTAmericaExp-MdIt.otf differ diff --git a/assets/fonts/GTAmericaExp-RgIt.otf b/assets/fonts/GTAmericaExp-RgIt.otf new file mode 100755 index 0000000000000..9cb4f78ff57ec Binary files /dev/null and b/assets/fonts/GTAmericaExp-RgIt.otf differ diff --git a/ios/ReactNativeChat.xcodeproj/project.pbxproj b/ios/ReactNativeChat.xcodeproj/project.pbxproj index 911b93d1d30b7..f1aa854ba0db6 100644 --- a/ios/ReactNativeChat.xcodeproj/project.pbxproj +++ b/ios/ReactNativeChat.xcodeproj/project.pbxproj @@ -9,16 +9,19 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* ReactNativeChatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ReactNativeChatTests.m */; }; 097C76E5807C5DFC565DC655 /* libPods-ReactNativeChat-ReactNativeChatTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F81DB9C6DA6418525441E5 /* libPods-ReactNativeChat-ReactNativeChatTests.a */; }; - 11FA3546D54246CD8F819152 /* GTAmericaExp-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 1E76D5212522316A005A268F /* GTAmericaExp-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */; }; + 1E76D5222522316A005A268F /* GTAmericaExp-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */; }; + 1E76D5232522316A005A268F /* GTAmericaExp-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */; }; + 1E76D5242522316A005A268F /* GTAmericaExp-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */; }; + 1E76D5252522316A005A268F /* GTAmericaExp-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */; }; 347C4A976B972BC7A903F97D /* libPods-ReactNativeChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ABF95746519766B23B4E2D0 /* libPods-ReactNativeChat.a */; }; - 4912B60FA66C4604A56AD575 /* GTAmericaExp-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */; }; - 49F157C845CE4D56AA72B80E /* GTAmericaExp-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */; }; - 7F7721B764D444D6861A9B39 /* GTAmericaExp-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - CC07911F22C2437DA6708BD2 /* GTAmericaExp-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */; }; + 425866037F4C482AAB46CB8B /* GTAmericaExp-BdIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */; }; + 6856B78873B64C44A92E51DB /* GTAmericaExp-MdIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */; }; + 8821A238A081483FA947BC4E /* GTAmericaExp-RgIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -56,6 +59,9 @@ C6C1D4F5C262ACDAF1800CAD /* Pods-ReactNativeChat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeChat.release.xcconfig"; path = "Target Support Files/Pods-ReactNativeChat/Pods-ReactNativeChat.release.xcconfig"; sourceTree = ""; }; 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; }; + A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */ = {isa = PBXFileReference; name = "GTAmericaExp-BdIt.otf"; path = "../assets/fonts/GTAmericaExp-BdIt.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */ = {isa = PBXFileReference; name = "GTAmericaExp-MdIt.otf"; path = "../assets/fonts/GTAmericaExp-MdIt.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */ = {isa = PBXFileReference; name = "GTAmericaExp-RgIt.otf"; path = "../assets/fonts/GTAmericaExp-RgIt.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -160,6 +166,9 @@ AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */, 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */, A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */, + A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */, + DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */, + 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */, ); name = Resources; sourceTree = ""; @@ -272,11 +281,14 @@ files = ( 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - 11FA3546D54246CD8F819152 /* GTAmericaExp-Bold.otf in Resources */, - 49F157C845CE4D56AA72B80E /* GTAmericaExp-Light.otf in Resources */, - CC07911F22C2437DA6708BD2 /* GTAmericaExp-Medium.otf in Resources */, - 4912B60FA66C4604A56AD575 /* GTAmericaExp-Regular.otf in Resources */, - 7F7721B764D444D6861A9B39 /* GTAmericaExp-Thin.otf in Resources */, + 1E76D5212522316A005A268F /* GTAmericaExp-Bold.otf in Resources */, + 1E76D5222522316A005A268F /* GTAmericaExp-Light.otf in Resources */, + 1E76D5232522316A005A268F /* GTAmericaExp-Medium.otf in Resources */, + 1E76D5242522316A005A268F /* GTAmericaExp-Regular.otf in Resources */, + 1E76D5252522316A005A268F /* GTAmericaExp-Thin.otf in Resources */, + 425866037F4C482AAB46CB8B /* GTAmericaExp-BdIt.otf in Resources */, + 6856B78873B64C44A92E51DB /* GTAmericaExp-MdIt.otf in Resources */, + 8821A238A081483FA947BC4E /* GTAmericaExp-RgIt.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/ReactNativeChat/Info.plist b/ios/ReactNativeChat/Info.plist index 813fe078b0950..400805791006c 100644 --- a/ios/ReactNativeChat/Info.plist +++ b/ios/ReactNativeChat/Info.plist @@ -23,35 +23,35 @@ CFBundleVersion 90 ITSAppUsesNonExemptEncryption - + LSRequiresIPhoneOS - + NSAppTransportSecurity NSAllowsArbitraryLoads - + NSExceptionDomains localhost NSExceptionAllowsInsecureHTTPLoads - + NSIncludesSubdomains - + www.expensify.com.dev NSExceptionAllowsInsecureHTTPLoads - + NSIncludesSubdomains - + NSCameraUsageDescription Your camera is used to create chat attachments. NSLocationWhenInUseUsageDescription - + NSPhotoLibraryAddUsageDescription Your camera roll is used to store chat attachments. NSPhotoLibraryUsageDescription @@ -63,6 +63,9 @@ GTAmericaExp-Medium.otf GTAmericaExp-Regular.otf GTAmericaExp-Thin.otf + GTAmericaExp-BdIt.otf + GTAmericaExp-MdIt.otf + GTAmericaExp-RgIt.otf UILaunchStoryboardName LaunchScreen @@ -78,6 +81,6 @@ UIInterfaceOrientationPortraitUpsideDown UIViewControllerBasedStatusBarAppearance - + diff --git a/src/style/StyleSheet.js b/src/style/StyleSheet.js index 58539aa634b4f..8c49795d201fd 100644 --- a/src/style/StyleSheet.js +++ b/src/style/StyleSheet.js @@ -1,5 +1,6 @@ // We place items a percentage to the safe area on the top or bottom of the screen import fontFamily from './fontFamily'; +import italic from './italic'; const safeInsertPercentage = 0.7; @@ -661,8 +662,8 @@ const styles = { const webViewStyles = { tagStyles: { em: { - fontStyle: 'italic', - fontFamily: fontFamily.SYSTEM, + fontFamily: fontFamily.GTA_ITALIC, + fontStyle: italic, }, del: { diff --git a/src/style/fontFamily/index.js b/src/style/fontFamily/index.js index 47b13f74fb3aa..a5ddae80ddeb6 100644 --- a/src/style/fontFamily/index.js +++ b/src/style/fontFamily/index.js @@ -1,4 +1,6 @@ const fontFamily = { + GTA_ITALIC: 'GTAmericaExp-RgIt', + GTA_BOLD: 'GTAmericaExp-Bold', GTA: 'GTAmericaExp-Regular', SYSTEM: 'System', }; diff --git a/src/style/italic/index.android.js b/src/style/italic/index.android.js new file mode 100644 index 0000000000000..92f6d65241bbf --- /dev/null +++ b/src/style/italic/index.android.js @@ -0,0 +1,3 @@ +const italic = 'normal'; + +export default italic; diff --git a/src/style/italic/index.js b/src/style/italic/index.js new file mode 100644 index 0000000000000..8e8433c7cc056 --- /dev/null +++ b/src/style/italic/index.js @@ -0,0 +1,3 @@ +const italic = 'italic'; + +export default italic; diff --git a/web/index.html b/web/index.html index 5faebb5aa4be7..44cfbf2690eae 100644 --- a/web/index.html +++ b/web/index.html @@ -39,6 +39,24 @@ font-style: normal; src: url("https://www.expensify.com/font/GT-America-Standard-Bold.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff2") format("woff2"); } + @font-face { + font-family: GTAmericaExp-RgIt; + font-weight: 400; + font-style: italic; + src: url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff2") format("woff2"); } + + @font-face { + font-family: GTAmericaExp-MdIt; + font-weight: 500; + font-style: italic; + src: url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff2") format("woff2"); } + + @font-face { + font-family: GTAmericaExp-BdIt; + font-weight: 700; + font-style: italic; + src: url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff2") format("woff2"); } + * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;