diff --git a/android/app/src/main/assets/fonts/Avenir-Roman.ttf b/android/app/src/main/assets/fonts/Avenir-Roman.ttf deleted file mode 100644 index f58eeaab87..0000000000 Binary files a/android/app/src/main/assets/fonts/Avenir-Roman.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf deleted file mode 100644 index 1c8f5e910b..0000000000 Binary files a/android/app/src/main/assets/fonts/Entypo.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf deleted file mode 100644 index b270f98519..0000000000 Binary files a/android/app/src/main/assets/fonts/EvilIcons.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf deleted file mode 100644 index f221e50a2e..0000000000 Binary files a/android/app/src/main/assets/fonts/FontAwesome.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf deleted file mode 100644 index 6cce217ddc..0000000000 Binary files a/android/app/src/main/assets/fonts/Foundation.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf deleted file mode 100644 index 307ad889aa..0000000000 Binary files a/android/app/src/main/assets/fonts/Ionicons.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf deleted file mode 100644 index 7015564ad1..0000000000 Binary files a/android/app/src/main/assets/fonts/MaterialIcons.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf deleted file mode 100644 index 0a62bb9ea6..0000000000 Binary files a/android/app/src/main/assets/fonts/Octicons.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Roboto-Bold.ttf b/android/app/src/main/assets/fonts/Roboto-Bold.ttf deleted file mode 100644 index aaf374d2cc..0000000000 Binary files a/android/app/src/main/assets/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Roboto-Light.ttf b/android/app/src/main/assets/fonts/Roboto-Light.ttf deleted file mode 100644 index 664e1b2f9d..0000000000 Binary files a/android/app/src/main/assets/fonts/Roboto-Light.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Roboto-Medium.ttf b/android/app/src/main/assets/fonts/Roboto-Medium.ttf deleted file mode 100644 index aa00de0ef9..0000000000 Binary files a/android/app/src/main/assets/fonts/Roboto-Medium.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Roboto-Regular.ttf b/android/app/src/main/assets/fonts/Roboto-Regular.ttf deleted file mode 100644 index 3e6e2e7613..0000000000 Binary files a/android/app/src/main/assets/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/RobotoMono-Medium.ttf b/android/app/src/main/assets/fonts/RobotoMono-Medium.ttf deleted file mode 100644 index 0bcdc740c6..0000000000 Binary files a/android/app/src/main/assets/fonts/RobotoMono-Medium.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf deleted file mode 100644 index e4ae46c628..0000000000 Binary files a/android/app/src/main/assets/fonts/Zocial.ttf and /dev/null differ diff --git a/ios/RobotoMono-Medium.ttf b/ios/RobotoMono-Medium.ttf deleted file mode 100644 index 0bcdc740c6..0000000000 Binary files a/ios/RobotoMono-Medium.ttf and /dev/null differ diff --git a/ios/SF-UI-Display-Medium.otf b/ios/SF-UI-Display-Medium.otf deleted file mode 100644 index dc2df0571e..0000000000 Binary files a/ios/SF-UI-Display-Medium.otf and /dev/null differ diff --git a/ios/SF-UI-Display-Regular.otf b/ios/SF-UI-Display-Regular.otf deleted file mode 100644 index 14c96528c4..0000000000 Binary files a/ios/SF-UI-Display-Regular.otf and /dev/null differ diff --git a/ios/SF-UI-Display-Semibold.otf b/ios/SF-UI-Display-Semibold.otf deleted file mode 100644 index 4ea7ea73ec..0000000000 Binary files a/ios/SF-UI-Display-Semibold.otf and /dev/null differ diff --git a/ios/SF-UI-Display-Thin.otf b/ios/SF-UI-Display-Thin.otf deleted file mode 100644 index f02dcda5e4..0000000000 Binary files a/ios/SF-UI-Display-Thin.otf and /dev/null differ diff --git a/ios/SF-UI-Text-Bold.otf b/ios/SF-UI-Text-Bold.otf deleted file mode 100644 index 4e9fc0492a..0000000000 Binary files a/ios/SF-UI-Text-Bold.otf and /dev/null differ diff --git a/ios/SF-UI-Text-Light.otf b/ios/SF-UI-Text-Light.otf deleted file mode 100644 index 313f439f2c..0000000000 Binary files a/ios/SF-UI-Text-Light.otf and /dev/null differ diff --git a/ios/SF-UI-Text-Medium.otf b/ios/SF-UI-Text-Medium.otf deleted file mode 100644 index a638385309..0000000000 Binary files a/ios/SF-UI-Text-Medium.otf and /dev/null differ diff --git a/ios/SF-UI-Text-Regular.otf b/ios/SF-UI-Text-Regular.otf deleted file mode 100644 index a36c8f62b0..0000000000 Binary files a/ios/SF-UI-Text-Regular.otf and /dev/null differ diff --git a/ios/SF-UI-Text-Semibold.otf b/ios/SF-UI-Text-Semibold.otf deleted file mode 100644 index c11fa416de..0000000000 Binary files a/ios/SF-UI-Text-Semibold.otf and /dev/null differ diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 2c28e11e08..ef505e73bf 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -19,10 +19,6 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 2028DFF91D4275B600227DCD /* SF-UI-Display-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2028DFF51D4275B600227DCD /* SF-UI-Display-Medium.otf */; }; - 2028DFFA1D4275B600227DCD /* SF-UI-Display-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2028DFF61D4275B600227DCD /* SF-UI-Display-Regular.otf */; }; - 2028DFFB1D4275B600227DCD /* SF-UI-Display-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2028DFF71D4275B600227DCD /* SF-UI-Display-Semibold.otf */; }; - 2028DFFC1D4275B600227DCD /* SF-UI-Display-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2028DFF81D4275B600227DCD /* SF-UI-Display-Thin.otf */; }; 20AB9EC61D47CC0300E7FD9C /* libRCTStatus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 201067C41D4789F700FA83B6 /* libRCTStatus.a */; }; 20B6B6841D92C42600CC5C6A /* RSKImageCropper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20B6B6831D92C42600CC5C6A /* RSKImageCropper.framework */; }; 20B6B6851D92C42600CC5C6A /* RSKImageCropper.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 20B6B6831D92C42600CC5C6A /* RSKImageCropper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -46,17 +42,12 @@ 92A0DF7D1F4DE3A4002051BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92A0DF491F4DE3A0002051BC /* GoogleService-Info.plist */; }; 983F077E2119C9D2004133ED /* message.wav in Resources */ = {isa = PBXBuildFile; fileRef = 983F07442119C9D2004133ED /* message.wav */; }; 98482A6F2065257B00263651 /* libReactNativeTestFairy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9880471C20650CBC00CEBFE0 /* libReactNativeTestFairy.a */; }; - 9E0B01A11DDC5DA7002B0359 /* SF-UI-Text-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9E0B01A01DDC5DA7002B0359 /* SF-UI-Text-Light.otf */; }; 9E3AB6D01D87DB2B008846B4 /* libReact-Native-Webview-Bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E3AB6C61D87DA2B008846B4 /* libReact-Native-Webview-Bridge.a */; }; - 9ED2F45E1D9D535A00B36508 /* SF-UI-Text-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */; }; - 9ED2F45F1D9D535A00B36508 /* SF-UI-Text-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45C1D9D52C100B36508 /* SF-UI-Text-Medium.otf */; }; - 9ED2F4611D9D579900B36508 /* SF-UI-Text-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */; }; 9EE89E271E03FCB7007D3C25 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7F21DE718EF00D694FF /* libSplashScreen.a */; }; 9EE89E2D1E03FD9F007D3C25 /* libimageCropPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20A5C9531D927137002C4965 /* libimageCropPicker.a */; }; 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; }; AB96C730942E49178F59AE6F /* libRNSecureRandom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1464A9A9E12F45068947C28F /* libRNSecureRandom.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - B23B48FF1E76917B006D4535 /* RobotoMono-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B23B48FE1E76917B006D4535 /* RobotoMono-Medium.ttf */; }; B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; }; B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; }; B2DEA0D01E49E33300FA28D6 /* libRCTHttpServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DEA0B11E49E32000FA28D6 /* libRCTHttpServer.a */; }; @@ -67,7 +58,6 @@ CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.framework */; }; DA0D1ABA19458751CC2840C3 /* Instabug.framework in Embed Instabug Framework */ = {isa = PBXBuildFile; fileRef = 22D72275B7ADF9FC3304DCE5 /* Instabug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E0AD9E8F495A4907B65104BF /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEE3436791D42248F853999 /* libRCTImageResizer.a */; }; - F9238D6C1E5F055900C047B9 /* SF-UI-Text-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F9238D6B1E5F055900C047B9 /* SF-UI-Text-Semibold.otf */; }; FD4F213C3873473CB703B1D2 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674B3D9595A047AB8D518F4E /* libRNFS.a */; }; /* End PBXBuildFile section */ @@ -1748,18 +1738,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9ED2F4611D9D579900B36508 /* SF-UI-Text-Bold.otf in Resources */, - 9E0B01A11DDC5DA7002B0359 /* SF-UI-Text-Light.otf in Resources */, 983F077E2119C9D2004133ED /* message.wav in Resources */, - 9ED2F45E1D9D535A00B36508 /* SF-UI-Text-Regular.otf in Resources */, 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */, - 9ED2F45F1D9D535A00B36508 /* SF-UI-Text-Medium.otf in Resources */, - 2028DFFA1D4275B600227DCD /* SF-UI-Display-Regular.otf in Resources */, - 2028DFF91D4275B600227DCD /* SF-UI-Display-Medium.otf in Resources */, - F9238D6C1E5F055900C047B9 /* SF-UI-Text-Semibold.otf in Resources */, - 2028DFFC1D4275B600227DCD /* SF-UI-Display-Thin.otf in Resources */, - 2028DFFB1D4275B600227DCD /* SF-UI-Display-Semibold.otf in Resources */, - B23B48FF1E76917B006D4535 /* RobotoMono-Medium.ttf in Resources */, B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */, 92A0DF7D1F4DE3A4002051BC /* GoogleService-Info.plist in Resources */, ); diff --git a/ios/StatusIm/Info.plist b/ios/StatusIm/Info.plist index f49abfcdcf..61dba06d48 100644 --- a/ios/StatusIm/Info.plist +++ b/ios/StatusIm/Info.plist @@ -71,27 +71,6 @@ Microphone access is required for Instabug and Audio Messages NSPhotoLibraryUsageDescription Photos access it required to give you ability to choose custom profile pictures. - UIAppFonts - - RobotoMono-Medium.ttf - SF-UI-Text-Semibold.otf - SF-UI-Text-Bold.otf - SF-UI-Text-Regular.otf - SF-UI-Text-Medium.otf - SF-UI-Text-Light.otf - SF-UI-Display-Medium.otf - SF-UI-Display-Regular.otf - SF-UI-Display-Semibold.otf - SF-UI-Display-Thin.otf - Entypo.ttf - EvilIcons.ttf - FontAwesome.ttf - Foundation.ttf - Ionicons.ttf - MaterialIcons.ttf - Octicons.ttf - Zocial.ttf - UIBackgroundModes remote-notification diff --git a/src/status_im/android/platform.cljs b/src/status_im/android/platform.cljs index 8f9e048982..cfcb27d2a3 100644 --- a/src/status_im/android/platform.cljs +++ b/src/status_im/android/platform.cljs @@ -1,13 +1,13 @@ (ns status-im.android.platform) (def fonts - {:light {:font-family "Roboto-Light"} - :default {:font-family "Roboto-Regular"} - :medium {:font-family "Roboto-Medium"} - - :toolbar-title {:font-family "Roboto-Medium"} - :toolbar-subtitle {:font-family "Roboto-Regular"} - :roboto-mono {:font-family "RobotoMono-Medium"}}) + {:default {:font-family "Roboto"} + :medium {:font-family "Roboto" :font-weight "500"} + :bold {:font-family "Roboto" + :font-weight "bold"} + :toolbar-title {:font-family "Roboto" :font-weight "500"} + :toolbar-subtitle {:font-family "Roboto"} + :monospace {:font-family "monospace" :font-weight "bold"}}) ;; Structure to be exported diff --git a/src/status_im/desktop/platform.cljs b/src/status_im/desktop/platform.cljs index 14caf5105f..5ddedf82bb 100644 --- a/src/status_im/desktop/platform.cljs +++ b/src/status_im/desktop/platform.cljs @@ -1,20 +1,18 @@ (ns status-im.desktop.platform) (def fonts-macos - {:light {:font-family "SFProText-Light"} - :default {:font-family "SFProText-Regular"} + {:default {:font-family "SFProText-Regular"} :medium {:font-family "SFProText-Medium"} :toolbar-title {:font-family "SFProText-Regular"} - :roboto-mono {:font-family "RobotoMono-Medium"}}) + :monospace {:font-family "RobotoMono-Medium"}}) (def fonts-linux - {:light {:font-family "Arial" :font-weight 100} - :default {:font-family "Arial" :font-weight 400} + {:default {:font-family "Arial" :font-weight 400} :medium {:font-family "Arial" :font-weight 800} :toolbar-title {:font-family "Arial" :font-weight 400} - :roboto-mono {:font-family "RobotoMono-Medium"}}) + :monospace {:font-family "RobotoMono-Medium"}}) ;; Structure to be exported diff --git a/src/status_im/ios/platform.cljs b/src/status_im/ios/platform.cljs index 1109d5e886..4075f67b46 100644 --- a/src/status_im/ios/platform.cljs +++ b/src/status_im/ios/platform.cljs @@ -2,14 +2,14 @@ (:require [status-im.react-native.js-dependencies :as rn-dependencies])) (def fonts - {:light {:font-family "SFUIText-Light"} - :default {:font-family "SFUIText-Regular"} - :medium {:font-family "SFUIText-Medium"} - :bold {:font-family "SFUIText-Bold"} - - :toolbar-title {:font-family "SFUIText-Semibold"} - :toolbar-subtitle {:font-family "SFUIText-Regular"} - :roboto-mono {:font-family "RobotoMono-Medium"}}) + {:default {:font-weight "normal"} + :medium {:font-weight "500" + :letter-spacing 1} + :bold {:font-weight "bold"} + :toolbar-title {:font-weight "bold"} + :toolbar-subtitle {:font-weight "normal"} + :monospace {:font-family "Menlo" + :font-weight "bold"}}) ;; iPhone X dimensions (def x-width 375) diff --git a/src/status_im/ui/screens/wallet/onboarding/setup/views.cljs b/src/status_im/ui/screens/wallet/onboarding/setup/views.cljs index 1fa31e4476..08c28dfe8f 100644 --- a/src/status_im/ui/screens/wallet/onboarding/setup/views.cljs +++ b/src/status_im/ui/screens/wallet/onboarding/setup/views.cljs @@ -17,7 +17,7 @@ (defn signing-word [word] [react/view styles/signing-word [react/text {:style styles/signing-word-text - :font :roboto-mono + :font :monospace :number-of-lines 1} word]])