Skip to content

Fix italic font #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndrewGable merged 13 commits into from
Oct 2, 2020
Merged

Fix italic font #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
67798e2
adding font files
sketchydroide Sep 25, 2020
7ad4c58
changing the styles
sketchydroide Sep 25, 2020
66deb0c
using the right files
sketchydroide Sep 28, 2020
331ff10
Merge branch 'master' into afonseca_fix_italic_font
sketchydroide Sep 28, 2020
22c3590
run the link to link the fonts properly in iOS
sketchydroide Sep 28, 2020
550549c
Merge branch 'master' into afonseca_fix_italic_font
sketchydroide Sep 30, 2020
788b0c6
making italic work on both Android and iOS
sketchydroide Sep 30, 2020
cefd665
Merge branch 'master' into afonseca_fix_italic_font
sketchydroide Oct 1, 2020
510306d
switching imports
sketchydroide Oct 1, 2020
38f1dca
adding comment explaining why I'm using a platform checker
sketchydroide Oct 1, 2020
8988b23
Merge branch 'master' into afonseca_fix_italic_font
sketchydroide Oct 1, 2020
cef985f
better solution for the difference
sketchydroide Oct 1, 2020
abb23fd
fixing lint;
sketchydroide Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/GTAmericaExp-BdIt.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/GTAmericaExp-MdIt.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/GTAmericaExp-RgIt.otf
View file
Open in desktop
Binary file not shown.
32 changes: 22 additions & 10 deletions ios/ReactNativeChat.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 = "<group>"; };
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 = "<group>"; 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 = "<group>"; 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 = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -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 = "<group>";
Expand Down Expand Up @@ -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;
};
Expand Down
21 changes: 12 additions & 9 deletions ios/ReactNativeChat/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@
<key>CFBundleVersion</key>
<string>90</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false />
<false/>
<key>LSRequiresIPhoneOS</key>
<true />
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true />
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<true/>
<key>NSIncludesSubdomains</key>
<true />
<true/>
</dict>
<key>www.expensify.com.dev</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<true/>
<key>NSIncludesSubdomains</key>
<true />
<true/>
</dict>
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Your camera is used to create chat attachments.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string />
<string/>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Your camera roll is used to store chat attachments.</string>
<key>NSPhotoLibraryUsageDescription</key>
Expand All @@ -63,6 +63,9 @@
<string>GTAmericaExp-Medium.otf</string>
<string>GTAmericaExp-Regular.otf</string>
<string>GTAmericaExp-Thin.otf</string>
<string>GTAmericaExp-BdIt.otf</string>
<string>GTAmericaExp-MdIt.otf</string>
<string>GTAmericaExp-RgIt.otf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
Expand All @@ -78,6 +81,6 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false />
<false/>
</dict>
</plist>
5 changes: 3 additions & 2 deletions src/style/StyleSheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -661,8 +662,8 @@ const styles = {
const webViewStyles = {
tagStyles: {
em: {
fontStyle: 'italic',
fontFamily: fontFamily.SYSTEM,
fontFamily: fontFamily.GTA_ITALIC,
fontStyle: italic,
},

del: {
Expand Down
2 changes: 2 additions & 0 deletions src/style/fontFamily/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const fontFamily = {
GTA_ITALIC: 'GTAmericaExp-RgIt',
GTA_BOLD: 'GTAmericaExp-Bold',
GTA: 'GTAmericaExp-Regular',
SYSTEM: 'System',
};
Expand Down
3 changes: 3 additions & 0 deletions src/style/italic/index.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const italic = 'normal';

export default italic;
3 changes: 3 additions & 0 deletions src/style/italic/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const italic = 'italic';

export default italic;
18 changes: 18 additions & 0 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down