diff --git a/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf b/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf deleted file mode 100644 index c8f20100b9..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraBoldItalic.ttf b/android/app/src/main/assets/fonts/Inter-ExtraBoldItalic.ttf deleted file mode 100644 index 11148851ea..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraBoldItalic.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf deleted file mode 100644 index 42855a51ed..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf deleted file mode 100644 index 6aebfa6f9d..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf b/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf deleted file mode 100644 index f318224c68..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf deleted file mode 100644 index bceb0f76b0..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf b/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf deleted file mode 100644 index 90e4603383..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf deleted file mode 100644 index e710885029..0000000000 Binary files a/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf and /dev/null differ diff --git a/components/src/status_im/react_native/resources.cljs b/components/src/status_im/react_native/resources.cljs index cfc1d0a119..7b3c68056a 100644 --- a/components/src/status_im/react_native/resources.cljs +++ b/components/src/status_im/react_native/resources.cljs @@ -1,11 +1,7 @@ (ns status-im.react-native.resources) (def ui - {:empty-hashtags (js/require "./resources/images/ui/empty-hashtags.png") - :empty-recent (js/require "./resources/images/ui/empty-recent.png") - :empty-chats-header (js/require "./resources/images/ui/empty-chats-header.png") - :analytics-image (js/require "./resources/images/ui/analytics-image.png") - :welcome-image (js/require "./resources/images/ui/welcome-image.png") + {:empty-chats-header (js/require "./resources/images/ui/empty-chats-header.png") :welcome (js/require "./resources/images/ui/welcome.jpg") :intro1 (js/require "./resources/images/ui/intro1.jpg") :intro2 (js/require "./resources/images/ui/intro2.jpg") @@ -13,9 +9,7 @@ :sample-key (js/require "./resources/images/ui/sample-key.jpg") :lock (js/require "./resources/images/ui/lock.png") :tribute-to-talk (js/require "./resources/images/ui/tribute-to-talk.png") - :wallet-welcome (js/require "./resources/images/ui/wallet-welcome.png") :hardwallet-card (js/require "./resources/images/ui/hardwallet-card.png") - :secret-keys (js/require "./resources/images/ui/secret-keys.png") :keycard-lock (js/require "./resources/images/ui/keycard-lock.png") :keycard (js/require "./resources/images/ui/keycard.png") :keycard-logo (js/require "./resources/images/ui/keycard-logo.png") diff --git a/fiddle/src/status_im/react_native/resources.cljs b/fiddle/src/status_im/react_native/resources.cljs index 0bccf47275..ea775ca964 100644 --- a/fiddle/src/status_im/react_native/resources.cljs +++ b/fiddle/src/status_im/react_native/resources.cljs @@ -1,39 +1,29 @@ (ns status-im.react-native.resources) (def ui - {:empty-hashtags "images/ui/empty-hashtags.png" - :empty-recent "images/ui/empty-recent.png" - :analytics-image "images/ui/analytics-image.png" - :welcome-image "images/ui/welcome-image.png" - :welcome "images/ui/welcome.jpg" - :intro1 "images/ui/intro1.png" - :intro2 "images/ui/intro2.png" - :intro3 "images/ui/intro3.png" - :sample-key "images/ui/sample-key.png" - :lock "images/ui/lock.png" - :tribute-to-talk "images/ui/tribute-to-talk.png" - :wallet-welcome "images/ui/wallet-welcome.png" - :hardwallet-card "images/ui/hardwallet-card.png" - :secret-keys "images/ui/secret-keys.png" - :keycard-lock "images/ui/keycard-lock.png" - :keycard "images/ui/keycard.png" - :keycard-logo "images/ui/keycard-logo.png" - :keycard-logo-blue "images/ui/keycard-logo-blue.png" - :keycard-logo-gray "images/ui/keycard-logo-gray.png" - :keycard-key "images/ui/keycard-key.png" - :keycard-empty "images/ui/keycard-empty.png" - :keycard-phone "images/ui/keycard-phone.png" - :keycard-connection "images/ui/keycard-connection.png" + {:lock "images/ui/lock.png" + :tribute-to-talk "images/ui/tribute-to-talk.png" + :hardwallet-card "images/ui/hardwallet-card.png" + :secret-keys "images/ui/secret-keys.png" + :keycard-lock "images/ui/keycard-lock.png" + :keycard "images/ui/keycard.png" + :keycard-logo "images/ui/keycard-logo.png" + :keycard-logo-blue "images/ui/keycard-logo-blue.png" + :keycard-logo-gray "images/ui/keycard-logo-gray.png" + :keycard-key "images/ui/keycard-key.png" + :keycard-empty "images/ui/keycard-empty.png" + :keycard-phone "images/ui/keycard-phone.png" + :keycard-connection "images/ui/keycard-connection.png" :keycard-nfc-on "images/ui/keycard-nfc-on.png" - :keycard-wrong "images/ui/keycard-wrong.png" - :not-keycard "images/ui/not-keycard.png" - :status-logo "images/ui/status-logo.png" - :hold-card-animation "images/ui/hold-card-animation.gif" - :warning-sign "images/ui/warning-sign.png" - :phone-nfc-on "images/ui/phone-nfc-on.png" - :phone-nfc-off "images/ui/phone-nfc-off.png" - :dapp-store "images/ui/dapp-store.png" - :ens-header "images/ui/ens-header.png"}) + :keycard-wrong "images/ui/keycard-wrong.png" + :not-keycard "images/ui/not-keycard.png" + :status-logo "images/ui/status-logo.png" + :hold-card-animation "images/ui/hold-card-animation.gif" + :warning-sign "images/ui/warning-sign.png" + :phone-nfc-on "images/ui/phone-nfc-on.png" + :phone-nfc-off "images/ui/phone-nfc-off.png" + :dapp-store "images/ui/dapp-store.png" + :ens-header "images/ui/ens-header.png"}) (def loaded-images (atom {})) diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 14ff7da0f4..6137e922de 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -8,17 +8,13 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; }; - 0C13D5C5E4EB4D518C95FCD0 /* Inter-ThinItalic-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8077F6B47C6C491A9351E836 /* Inter-ThinItalic-BETA.otf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 20AB9EC61D47CC0300E7FD9C /* libRCTStatus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 201067C41D4789F700FA83B6 /* libRCTStatus.a */; }; 25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; }; 3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; }; 393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; }; - 42B30EAD0EED4C72BB96D1AB /* Inter-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6B145D55D500476BB45C2232 /* Inter-ExtraBold.otf */; }; - 54BD2CE922134B6291FE1BFD /* Inter-Light-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6864A92FD6844B928C52F5C1 /* Inter-Light-BETA.otf */; }; 57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; }; - 5977C1355932428EBABA85A7 /* Inter-Thin-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0A89F8F23C9847FFABBB253A /* Inter-Thin-BETA.otf */; }; 70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; }; 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; }; 81C6E6AE0AA739BE9D87C1D0 /* libPods-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC1CBCFE6C906043D6CCEEE1 /* libPods-StatusImTests.a */; }; @@ -26,20 +22,14 @@ 8E55E6877F950B81C8D711C5 /* libPods-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 101A4045637A2ADF57D28EF5 /* libPods-StatusIm.a */; }; 925C1F4C1F7B73B20063DFA0 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; }; - B190FBFB6A9B43EAAF396CD7 /* Inter-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2006E199700F423E84885CD9 /* Inter-BlackItalic.otf */; }; B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; }; B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; }; B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; }; BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; }; CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.framework */; }; D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; }; - D2356A41DAE14CB683EAEE59 /* Inter-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0BD3B115C8A64478B8577A90 /* Inter-Black.otf */; }; - D29CD440D58B486FA2DE76C1 /* Inter-LightItalic-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = 03A16CE52D934E92A3DDCBA4 /* Inter-LightItalic-BETA.otf */; }; D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; }; D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; }; - DC3316E4BB514C6F80B60D84 /* Inter-ExtraLightItalic-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = EBCA9155761E4EBCB2EAFE9A /* Inter-ExtraLightItalic-BETA.otf */; }; - E5A39B2530D54142B8C03B94 /* Inter-ExtraBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1BF670316EE6470584BB715B /* Inter-ExtraBoldItalic.otf */; }; - F0C362ACB0B24A2DB9AD29AC /* Inter-ExtraLight-BETA.otf in Resources */ = {isa = PBXBuildFile; fileRef = 17787D310A644038B9357960 /* Inter-ExtraLight-BETA.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -91,10 +81,7 @@ 00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = ""; }; - 03A16CE52D934E92A3DDCBA4 /* Inter-LightItalic-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-LightItalic-BETA.otf"; path = "../resources/fonts/Inter-LightItalic-BETA.otf"; sourceTree = ""; }; 064351D2FD901F8B6C9AE2A5 /* Pods-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusImTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusImTests/Pods-StatusImTests.debug.xcconfig"; sourceTree = ""; }; - 0A89F8F23C9847FFABBB253A /* Inter-Thin-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Thin-BETA.otf"; path = "../resources/fonts/Inter-Thin-BETA.otf"; sourceTree = ""; }; - 0BD3B115C8A64478B8577A90 /* Inter-Black.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Black.otf"; path = "../resources/fonts/Inter-Black.otf"; sourceTree = ""; }; 101A4045637A2ADF57D28EF5 /* libPods-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = ""; }; @@ -102,34 +89,19 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = ""; }; 1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = ""; }; - 17787D310A644038B9357960 /* Inter-ExtraLight-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraLight-BETA.otf"; path = "../resources/fonts/Inter-ExtraLight-BETA.otf"; sourceTree = ""; }; - 1BF670316EE6470584BB715B /* Inter-ExtraBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraBoldItalic.otf"; path = "../resources/fonts/Inter-ExtraBoldItalic.otf"; sourceTree = ""; }; - 2006E199700F423E84885CD9 /* Inter-BlackItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BlackItalic.otf"; path = "../resources/fonts/Inter-BlackItalic.otf"; sourceTree = ""; }; - 2028DFF51D4275B600227DCD /* SF-UI-Display-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Medium.otf"; sourceTree = ""; }; - 2028DFF61D4275B600227DCD /* SF-UI-Display-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Regular.otf"; sourceTree = ""; }; - 2028DFF71D4275B600227DCD /* SF-UI-Display-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Semibold.otf"; sourceTree = ""; }; - 2028DFF81D4275B600227DCD /* SF-UI-Display-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Thin.otf"; sourceTree = ""; }; 38A44830EC5708E89387F641 /* Pods-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.release.xcconfig"; sourceTree = ""; }; 439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTStatus.xcodeproj; path = "../modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj"; sourceTree = ""; }; 4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 6864A92FD6844B928C52F5C1 /* Inter-Light-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Light-BETA.otf"; path = "../resources/fonts/Inter-Light-BETA.otf"; sourceTree = ""; }; 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = ""; }; - 6B145D55D500476BB45C2232 /* Inter-ExtraBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraBold.otf"; path = "../resources/fonts/Inter-ExtraBold.otf"; sourceTree = ""; }; 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = ""; }; - 8077F6B47C6C491A9351E836 /* Inter-ThinItalic-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ThinItalic-BETA.otf"; path = "../resources/fonts/Inter-ThinItalic-BETA.otf"; sourceTree = ""; }; 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = ""; }; - 9E0B01A01DDC5DA7002B0359 /* SF-UI-Text-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Light.otf"; sourceTree = ""; }; 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = ""; }; - 9ED2F45C1D9D52C100B36508 /* SF-UI-Text-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Medium.otf"; sourceTree = ""; }; - 9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Regular.otf"; sourceTree = ""; }; - 9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Bold.otf"; sourceTree = ""; }; 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = ""; }; A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = ""; }; ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.debug.xcconfig"; sourceTree = ""; }; B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = ""; }; - B23B48FE1E76917B006D4535 /* RobotoMono-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "RobotoMono-Medium.ttf"; sourceTree = ""; }; B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = ""; }; @@ -139,8 +111,6 @@ CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = ""; }; CE4E31B21D8695250033ED64 /* Statusgo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Statusgo.framework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.framework"; sourceTree = ""; }; D489EE8D5F52DA10AC715727 /* Pods-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusImTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusImTests/Pods-StatusImTests.release.xcconfig"; sourceTree = ""; }; - EBCA9155761E4EBCB2EAFE9A /* Inter-ExtraLightItalic-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraLightItalic-BETA.otf"; path = "../resources/fonts/Inter-ExtraLightItalic-BETA.otf"; sourceTree = ""; }; - F9238D6B1E5F055900C047B9 /* SF-UI-Text-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Semibold.otf"; sourceTree = ""; }; FC1CBCFE6C906043D6CCEEE1 /* libPods-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -206,27 +176,15 @@ 1E7837547A9A40E18AD63CF3 /* Resources */ = { isa = PBXGroup; children = ( - 2028E0111D4275BD00227DCD /* SF */, - B23B48FE1E76917B006D4535 /* RobotoMono-Medium.ttf */, 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */, - 0BD3B115C8A64478B8577A90 /* Inter-Black.otf */, - 2006E199700F423E84885CD9 /* Inter-BlackItalic.otf */, CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */, B321D25F4493470980039457 /* Inter-BoldItalic.otf */, - 6B145D55D500476BB45C2232 /* Inter-ExtraBold.otf */, - 1BF670316EE6470584BB715B /* Inter-ExtraBoldItalic.otf */, - 17787D310A644038B9357960 /* Inter-ExtraLight-BETA.otf */, - EBCA9155761E4EBCB2EAFE9A /* Inter-ExtraLightItalic-BETA.otf */, B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */, - 6864A92FD6844B928C52F5C1 /* Inter-Light-BETA.otf */, - 03A16CE52D934E92A3DDCBA4 /* Inter-LightItalic-BETA.otf */, B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */, C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */, 1426DF592BA248FC81D955CB /* Inter-Regular.otf */, 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */, A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */, - 0A89F8F23C9847FFABBB253A /* Inter-Thin-BETA.otf */, - 8077F6B47C6C491A9351E836 /* Inter-ThinItalic-BETA.otf */, ); name = Resources; sourceTree = ""; @@ -239,22 +197,6 @@ name = Products; sourceTree = ""; }; - 2028E0111D4275BD00227DCD /* SF */ = { - isa = PBXGroup; - children = ( - F9238D6B1E5F055900C047B9 /* SF-UI-Text-Semibold.otf */, - 9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */, - 9E0B01A01DDC5DA7002B0359 /* SF-UI-Text-Light.otf */, - 9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */, - 9ED2F45C1D9D52C100B36508 /* SF-UI-Text-Medium.otf */, - 2028DFF51D4275B600227DCD /* SF-UI-Display-Medium.otf */, - 2028DFF61D4275B600227DCD /* SF-UI-Display-Regular.otf */, - 2028DFF71D4275B600227DCD /* SF-UI-Display-Semibold.otf */, - 2028DFF81D4275B600227DCD /* SF-UI-Display-Thin.otf */, - ); - name = SF; - sourceTree = ""; - }; 5C1C8762251D6EF495FB2384 /* Pods */ = { isa = PBXGroup; children = ( @@ -483,24 +425,14 @@ files = ( 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */, B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */, - D2356A41DAE14CB683EAEE59 /* Inter-Black.otf in Resources */, - B190FBFB6A9B43EAAF396CD7 /* Inter-BlackItalic.otf in Resources */, D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */, D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */, - 42B30EAD0EED4C72BB96D1AB /* Inter-ExtraBold.otf in Resources */, - E5A39B2530D54142B8C03B94 /* Inter-ExtraBoldItalic.otf in Resources */, - F0C362ACB0B24A2DB9AD29AC /* Inter-ExtraLight-BETA.otf in Resources */, - DC3316E4BB514C6F80B60D84 /* Inter-ExtraLightItalic-BETA.otf in Resources */, 393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */, - 54BD2CE922134B6291FE1BFD /* Inter-Light-BETA.otf in Resources */, - D29CD440D58B486FA2DE76C1 /* Inter-LightItalic-BETA.otf in Resources */, D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */, 57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */, 70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */, 3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */, 8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */, - 5977C1355932428EBABA85A7 /* Inter-Thin-BETA.otf in Resources */, - 0C13D5C5E4EB4D518C95FCD0 /* Inter-ThinItalic-BETA.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/resources/fonts/Inter-Black.otf b/resources/fonts/Inter-Black.otf deleted file mode 100644 index 66cfaf6ced..0000000000 Binary files a/resources/fonts/Inter-Black.otf and /dev/null differ diff --git a/resources/fonts/Inter-BlackItalic.otf b/resources/fonts/Inter-BlackItalic.otf deleted file mode 100644 index 336c804492..0000000000 Binary files a/resources/fonts/Inter-BlackItalic.otf and /dev/null differ diff --git a/resources/fonts/Inter-ExtraBold.otf b/resources/fonts/Inter-ExtraBold.otf deleted file mode 100644 index b3ef7a3628..0000000000 Binary files a/resources/fonts/Inter-ExtraBold.otf and /dev/null differ diff --git a/resources/fonts/Inter-ExtraBoldItalic.otf b/resources/fonts/Inter-ExtraBoldItalic.otf deleted file mode 100644 index 5f3410bdda..0000000000 Binary files a/resources/fonts/Inter-ExtraBoldItalic.otf and /dev/null differ diff --git a/resources/fonts/Inter-ExtraLight-BETA.otf b/resources/fonts/Inter-ExtraLight-BETA.otf deleted file mode 100644 index 4152657ac3..0000000000 Binary files a/resources/fonts/Inter-ExtraLight-BETA.otf and /dev/null differ diff --git a/resources/fonts/Inter-ExtraLightItalic-BETA.otf b/resources/fonts/Inter-ExtraLightItalic-BETA.otf deleted file mode 100644 index 48bd97cd61..0000000000 Binary files a/resources/fonts/Inter-ExtraLightItalic-BETA.otf and /dev/null differ diff --git a/resources/fonts/Inter-Light-BETA.otf b/resources/fonts/Inter-Light-BETA.otf deleted file mode 100644 index 9b986a567c..0000000000 Binary files a/resources/fonts/Inter-Light-BETA.otf and /dev/null differ diff --git a/resources/fonts/Inter-LightItalic-BETA.otf b/resources/fonts/Inter-LightItalic-BETA.otf deleted file mode 100644 index bfb5ba3b0e..0000000000 Binary files a/resources/fonts/Inter-LightItalic-BETA.otf and /dev/null differ diff --git a/resources/fonts/Inter-Thin-BETA.otf b/resources/fonts/Inter-Thin-BETA.otf deleted file mode 100644 index 442f4724f7..0000000000 Binary files a/resources/fonts/Inter-Thin-BETA.otf and /dev/null differ diff --git a/resources/fonts/Inter-ThinItalic-BETA.otf b/resources/fonts/Inter-ThinItalic-BETA.otf deleted file mode 100644 index 6a9e702082..0000000000 Binary files a/resources/fonts/Inter-ThinItalic-BETA.otf and /dev/null differ diff --git a/resources/images/ui/analytics-image.png b/resources/images/ui/analytics-image.png deleted file mode 100644 index 2f8c59fa48..0000000000 Binary files a/resources/images/ui/analytics-image.png and /dev/null differ diff --git a/resources/images/ui/empty-hashtags.png b/resources/images/ui/empty-hashtags.png deleted file mode 100644 index 39e8e1e00e..0000000000 Binary files a/resources/images/ui/empty-hashtags.png and /dev/null differ diff --git a/resources/images/ui/empty-recent.png b/resources/images/ui/empty-recent.png deleted file mode 100644 index 46d3e82e8b..0000000000 Binary files a/resources/images/ui/empty-recent.png and /dev/null differ diff --git a/resources/images/ui/secret-keys.png b/resources/images/ui/secret-keys.png deleted file mode 100644 index bd9f4ef881..0000000000 Binary files a/resources/images/ui/secret-keys.png and /dev/null differ diff --git a/resources/images/ui/wallet-welcome.png b/resources/images/ui/wallet-welcome.png deleted file mode 100644 index d113d22647..0000000000 Binary files a/resources/images/ui/wallet-welcome.png and /dev/null differ diff --git a/resources/images/ui/welcome-image.png b/resources/images/ui/welcome-image.png deleted file mode 100644 index 7df81b3972..0000000000 Binary files a/resources/images/ui/welcome-image.png and /dev/null differ diff --git a/src/status_im/ui/screens/ens/views.cljs b/src/status_im/ui/screens/ens/views.cljs index fed87c37db..2f264f5626 100644 --- a/src/status_im/ui/screens/ens/views.cljs +++ b/src/status_im/ui/screens/ens/views.cljs @@ -549,7 +549,7 @@ (defn- welcome [] [react/view {:style {:flex 1}} [react/scroll-view {:content-container-style {:align-items :center}} - [react/image {:source (:ens-header resources/ui) + [react/image {:source (resources/get-image :ens-header) :style {:margin-top 32}}] [react/text {:style {:margin-top 32 :margin-bottom 8 :typography :header}} (i18n/label :t/ens-get-name)]