diff --git a/ios/File.swift b/ios/File.swift new file mode 100644 index 000000000..5ee224ad5 --- /dev/null +++ b/ios/File.swift @@ -0,0 +1,9 @@ +// +// File.swift +// eSteem +// +// Created by Ugur Erdal on 14.10.2019. +// Copyright © 2019 Facebook. All rights reserved. +// + +import Foundation diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b771cb9b2..d99a26faf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -14,15 +14,15 @@ PODS: - AppCenter/Push - AppCenterReactNativeShared - React - - AppCenter/Analytics (2.4.0): + - AppCenter/Analytics (2.5.0): - AppCenter/Core - - AppCenter/Core (2.4.0) - - AppCenter/Crashes (2.4.0): + - AppCenter/Core (2.5.0) + - AppCenter/Crashes (2.5.0): - AppCenter/Core - - AppCenter/Push (2.4.0): + - AppCenter/Push (2.5.0): - AppCenter/Core - - AppCenterReactNativeShared (2.4.0): - - AppCenter/Core (= 2.4.0) + - AppCenterReactNativeShared (2.5.0): + - AppCenter/Core (= 2.5.0) - boost-for-react-native (1.63.0) - BugsnagReactNative (2.23.2): - BugsnagReactNative/Core (= 2.23.2) @@ -65,6 +65,10 @@ PODS: - DoubleConversion - glog - glog (0.3.5) + - lottie-ios (3.1.3) + - lottie-react-native (3.2.1): + - lottie-ios (~> 3.1.3) + - React - QBImagePickerController (3.4.0) - RCTRequired (0.61.2) - RCTTypeSafety (0.61.2): @@ -316,6 +320,8 @@ DEPENDENCIES: - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - lottie-ios (from `../node_modules/lottie-ios`) + - lottie-react-native (from `../node_modules/lottie-react-native`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) @@ -354,7 +360,7 @@ DEPENDENCIES: - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - AppCenter - AppCenterReactNativeShared - boost-for-react-native @@ -388,6 +394,10 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + lottie-ios: + :path: "../node_modules/lottie-ios" + lottie-react-native: + :path: "../node_modules/lottie-react-native" RCTRequired: :path: "../node_modules/react-native/Libraries/RCTRequired" RCTTypeSafety: @@ -456,12 +466,12 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - AppCenter: 49a9ffe114c00e2bf5374aeda816d47eabf1978a + AppCenter: 637f180deefc61e8ab3f94223869ee50f61dabea appcenter: 4072e79b8d037d99056e6fc6556224b4525b5829 appcenter-analytics: 94be52eca805d586207d710aac95e0ddca8b3ddb appcenter-crashes: 30caece47856aee7c4c7449d4f4dae2d69795bd6 appcenter-push: f6c62e8e55cf09f53076674c185df72f68ea9dd7 - AppCenterReactNativeShared: 57a66e6539e9abe6079ba8f93a002bc3f95788cc + AppCenterReactNativeShared: 99e7f662ec66b1cb41306ecf357aabac35931c08 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c BugsnagReactNative: 0a24a1dd2cac88862d67b938f809bec8274130a9 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 @@ -472,6 +482,8 @@ SPEC CHECKSUMS: FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 + lottie-ios: 496ac5cea1bbf1a7bd1f1f472f3232eb1b8d744b + lottie-react-native: b123a79529cc732201091f585c62c89bb4747252 QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022 RCTRequired: c639d59ed389cfb1f1203f65c2ea946d8ec586e2 RCTTypeSafety: dc23fb655d6c77667c78e327bf661bc11e3b8aec @@ -511,4 +523,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4faf3202c73803d0ba69b4aaf79ce8642ecf11b2 -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.3 diff --git a/ios/eSteem-Bridging-Header.h b/ios/eSteem-Bridging-Header.h new file mode 100644 index 000000000..1b2cb5d6d --- /dev/null +++ b/ios/eSteem-Bridging-Header.h @@ -0,0 +1,4 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + diff --git a/ios/eSteem.xcodeproj/project.pbxproj b/ios/eSteem.xcodeproj/project.pbxproj index e04cf743d..630d4c96c 100644 --- a/ios/eSteem.xcodeproj/project.pbxproj +++ b/ios/eSteem.xcodeproj/project.pbxproj @@ -39,6 +39,7 @@ 8A865CFDCD1C4F4885488F9D /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 22F5F05A06E142C2B41A4D38 /* MaterialCommunityIcons.ttf */; }; 8FA95502318C441BB5187988 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 98D3D7C3AF354BF0987A2BFA /* Fontisto.ttf */; }; 94139B1E6AEB4494837396E2 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 34E88D888DD444F8B285363C /* SimpleLineIcons.ttf */; }; + 9487A245235508C60080E6CD /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9487A244235508C60080E6CD /* File.swift */; }; B5B60E44B0FA4A72BB3B3BF2 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 112758B0BBF9458381CE41FD /* FontAwesome.ttf */; }; BD7763EC3A6A4DDCB59E8CEE /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A239FC84622A4A9CA7950ED9 /* EvilIcons.ttf */; }; D71EB20EDB9B987C0574BAFE /* libPods-eSteemTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C97456BE898C00B5EDA21C2E /* libPods-eSteemTests.a */; }; @@ -130,6 +131,8 @@ 926635867AC7C716988E74B7 /* libPods-eSteem-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-eSteem-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 93B182C6FFA44610AB188D7C /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; 9464AFB033664B4F8E9F0BED /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; + 9487A243235508C50080E6CD /* eSteem-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "eSteem-Bridging-Header.h"; sourceTree = ""; }; + 9487A244235508C60080E6CD /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = ""; }; 95E8535BAE22D33276B4ED85 /* Pods-eSteem-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-eSteem-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-eSteem-tvOSTests/Pods-eSteem-tvOSTests.release.xcconfig"; sourceTree = ""; }; 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; 98D3D7C3AF354BF0987A2BFA /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; }; @@ -215,6 +218,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, + 9487A244235508C60080E6CD /* File.swift */, + 9487A243235508C50080E6CD /* eSteem-Bridging-Header.h */, ); name = eSteem; sourceTree = ""; @@ -439,6 +444,7 @@ }; 13B07F861A680F5B00A75B9A = { DevelopmentTeam = 75B6RXTKGT; + LastSwiftMigration = 1110; ProvisioningStyle = Manual; SystemCapabilities = { com.apple.InAppPurchase = { @@ -796,6 +802,7 @@ buildActionMask = 2147483647; files = ( 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */, + 9487A245235508C60080E6CD /* File.swift in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -849,6 +856,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DEAC5F1FB6C25D794F6F4108 /* Pods-eSteemTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -872,6 +880,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 122D7FCBA41B06097098B6E8 /* Pods-eSteemTests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = eSteemTests/Info.plist; @@ -893,6 +902,7 @@ baseConfigurationReference = F78BB3E26D5377FC091969E5 /* Pods-eSteem.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 7; @@ -962,6 +972,7 @@ baseConfigurationReference = FFDF532341ADF17A45F71E22 /* Pods-eSteem.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; @@ -1187,6 +1198,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -1232,6 +1244,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/ios/eSteem.xcworkspace/xcuserdata/ue.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/ue.xcuserdatad/UserInterfaceState.xcuserstate index 0779ce063..9458252d8 100644 Binary files a/ios/eSteem.xcworkspace/xcuserdata/ue.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/eSteem.xcworkspace/xcuserdata/ue.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/package.json b/package.json index a0cbabcdc..b22b96466 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,8 @@ "intl": "^1.2.5", "jsc-android": "^236355.1.1", "lodash": "^4.17.13", + "lottie-ios": "3.1.3", + "lottie-react-native": "^3.2.1", "moment": "^2.22.2", "react": "16.9.0", "react-intl": "^3.3.1", diff --git a/src/screens/application/index.js b/src/screens/application/index.js index ce940a442..dbc9a9c75 100644 --- a/src/screens/application/index.js +++ b/src/screens/application/index.js @@ -1,4 +1,4 @@ -import React, { Fragment } from 'react'; +import React, { Fragment, useEffect, useState } from 'react'; import ApplicationScreen from './screen/applicationScreen'; import ApplicationContainer from './container/applicationContainer'; @@ -7,43 +7,54 @@ import Launch from '../launch'; import { Modal } from '../../components'; import { PinCode } from '../pinCode'; -const Application = () => ( - - {({ - isConnected, - locale, - toastNotification, - isReady, - isDarkTheme, - isRenderRequire, - isThemeReady, - isPinCodeRequire, - }) => { - if (!isReady || !isRenderRequire || !isThemeReady) { - return ; - } - return ( - - - - - - - ); - }} - -); +const Application = () => { + const [showAnimation, setShowAnimation] = useState(true); + + useEffect(() => { + setTimeout(() => { + setShowAnimation(false); + }, 500); + }, []); + + return ( + + {({ + isConnected, + locale, + toastNotification, + isReady, + isDarkTheme, + isRenderRequire, + isThemeReady, + isPinCodeRequire, + }) => { + if (showAnimation || !isReady || !isRenderRequire || !isThemeReady) { + return ; + } + + return ( + + + + + + + ); + }} + + ); +}; export default Application; diff --git a/src/screens/launch/screen/animation.json b/src/screens/launch/screen/animation.json new file mode 100644 index 000000000..d55a960cf --- /dev/null +++ b/src/screens/launch/screen/animation.json @@ -0,0 +1 @@ +{"v":"5.5.9","fr":48,"ip":0,"op":170,"w":800,"h":800,"nm":"eSteem","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","parent":2,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[400.098,355.612,0],"ix":2},"a":{"a":0,"k":[0.576,-45.047,0],"ix":1},"s":{"a":0,"k":[41.152,41.152,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[81.5,312]],"o":[[0,0],[-11.368,-43.52]],"v":[[-136,16.5],[114.5,-157]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.285],"y":[1]},"o":{"x":[0.278],"y":[0]},"t":80,"s":[50]},{"t":115.80078125,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.285],"y":[1]},"o":{"x":[0.278],"y":[0]},"t":80,"s":[50]},{"t":115.80078125,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.627450920554,0.627450920554,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 2 - Group 1","parent":4,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[404.313,360.345,0],"ix":2},"a":{"a":0,"k":[404.313,360.345,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[45.066,73.536],[10.802,-12.769],[31.603,18.628]],"o":[[9.341,14.688],[-22.846,28.522],[55.94,62.733]],"v":[[45.406,-47.069],[39.248,-2.077],[-57.443,19.987]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.301960796118,0.631372570992,0.945098042488,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.313,360.345],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","parent":4,"td":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":28,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[392.019,344.214,0],"ix":2},"a":{"a":0,"k":[-19.057,-72.743,0],"ix":1},"s":{"a":0,"k":[41.152,41.152,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[30,97],[59.075,-58.216],[-78.099,-82.352],[106,254.5]],"o":[[83.25,35.5],[-14.272,-46.145],[-74.832,73.744],[101,106.5],[-61.167,-146.859]],"v":[[-107.5,-14.5],[85,-129],[-111.575,-130.284],[-119,121.5],[167,-108.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.031],"y":[1]},"o":{"x":[0.391],"y":[0]},"t":0,"s":[0]},{"t":145,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.627450920554,0.627450920554,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 2 - Group 2","tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.081],"y":[1]},"o":{"x":[0.449],"y":[0]},"t":4.801,"s":[0]},{"t":82,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.069,"y":1},"o":{"x":0.422,"y":0},"t":0,"s":[372,761,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.752,"y":0},"t":36,"s":[400,207,0],"to":[0,0,0],"ti":[0,0,0]},{"t":59,"s":[400,400,0]}],"ix":2},"a":{"a":0,"k":[399.861,374.15,0],"ix":1},"s":{"a":0,"k":[243,243,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[25.558,76.352],[1.849,1.603],[0,0],[-15.413,89.136],[-19.23,8.663],[-9.774,-12.813],[0.089,-2.341],[23.459,7.895],[-18.534,6.519],[-8.457,17.011],[30.771,-4.375],[-55.649,-43.161]],"o":[[-1.028,-3.074],[0,0],[10.483,125.658],[4.928,-20.22],[13.235,-5.967],[1.15,1.508],[-0.83,21.983],[10.634,21.97],[17.506,-6.157],[17.388,-34.973],[-69.704,9.91],[60.807,47.168]],"v":[[76.071,-25.556],[67.688,-43.192],[69.443,-32.244],[-59.082,-11.491],[-24.451,-54.715],[21.868,-50.477],[24.391,-42.916],[-56.052,-8.741],[0.222,6.005],[45.028,-29.955],[-12.731,-79.638],[-49.215,63.537]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.101960785687,0.313725501299,0.603921592236,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[399.861,374.15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/src/screens/launch/screen/launchScreen.js b/src/screens/launch/screen/launchScreen.js index 8d330a5b1..c428b038f 100644 --- a/src/screens/launch/screen/launchScreen.js +++ b/src/screens/launch/screen/launchScreen.js @@ -1,21 +1,12 @@ import React from 'react'; -import { View, Image } from 'react-native'; +import { View } from 'react-native'; +import LottieView from 'lottie-react-native'; -import LOGO from '../../../assets/launch_screen.png'; +import styles from './launchStyles'; const LaunchScreen = () => ( - - + + ); diff --git a/src/screens/launch/screen/launchStyles.js b/src/screens/launch/screen/launchStyles.js new file mode 100644 index 000000000..474f80476 --- /dev/null +++ b/src/screens/launch/screen/launchStyles.js @@ -0,0 +1,9 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + justifyContent: 'center', + alignItems: 'center', + }, +}); diff --git a/yarn.lock b/yarn.lock index f9148e61a..c87d1c779 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3106,6 +3106,11 @@ decompress@^4.2.0: pify "^2.3.0" strip-dirs "^2.0.0" +dedent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb" + integrity sha1-Dm2o8M5Sg471zsXI+TlrDBtko8s= + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -6126,6 +6131,21 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4 dependencies: js-tokens "^3.0.0 || ^4.0.0" +lottie-ios@3.1.3, lottie-ios@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-3.1.3.tgz#dfa18a3a7e66e5d4a6665bf0a2392d143d15661a" + integrity sha512-FKSx9l5Ekwm1Wt/ncoCwvsq8NAb1nylzMFlxrHixLYNBtO2eCQet+vwQag+74Nc/E9Lp3DKkBUCyBfz+zjtmAw== + +lottie-react-native@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-3.2.1.tgz#0b2b13b03a2cda9ece8474b9cf633d0fbe78d82b" + integrity sha512-dmOySV+qgFrQszCY+7uOZR0XkgbP2FXgCWJZ2h39GqlxJZRHD2uCmXoT+WxaBGw83Gk/2KfIQ1MQMFL8UqC2bw== + dependencies: + invariant "^2.2.2" + lottie-ios "^3.1.3" + prop-types "^15.5.10" + react-native-safe-modules "^1.0.0" + lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -7804,6 +7824,13 @@ react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.6: dependencies: hoist-non-react-statics "^2.3.1" +react-native-safe-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/react-native-safe-modules/-/react-native-safe-modules-1.0.0.tgz#10a918adf97da920adb1e33e0c852b1e80123b65" + integrity sha512-ShT8duWBT30W4OFcltZl+UvpPDikZFURvLDQqAsrvbyy6HzWPGJDCpdqM+6GqzPPs4DPEW31YfMNmdJcZ6zI2w== + dependencies: + dedent "^0.6.0" + "react-native-screens@^1.0.0 || ^1.0.0-alpha", react-native-screens@^1.0.0-alpha.23: version "1.0.0-alpha.23" resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0"