From 80c3c8ee4fe73f649a13bbc19d089a9cecaf4bfc Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 26 Mar 2020 10:21:21 -0300 Subject: [PATCH] [CHORE] Use storyboard on splash screen (#1939) * Update react-native-bootsplash * iOS * Fix android --- .../chat/rocket/reactnative/MainActivity.java | 2 +- ios/LaunchScreen.storyboard | 49 ++ ios/LaunchScreen.xib | 33 -- ios/Podfile.lock | 4 +- .../Local Podspecs/RNBootSplash.podspec.json | 4 +- ios/Pods/Manifest.lock | 4 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 12 +- .../xcschemes/RocketChatRN.xcscheme | 22 +- ios/RocketChatRN/AppDelegate.m | 3 +- package.json | 2 +- yarn.lock | 487 +++++++++++++++++- 11 files changed, 555 insertions(+), 67 deletions(-) create mode 100644 ios/LaunchScreen.storyboard delete mode 100644 ios/LaunchScreen.xib diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java index f408e11c..de66369a 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java +++ b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java @@ -14,7 +14,7 @@ public class MainActivity extends ReactFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - RNBootSplash.show(R.drawable.launch_screen, MainActivity.this); + RNBootSplash.init(R.drawable.launch_screen, MainActivity.this); } /** diff --git a/ios/LaunchScreen.storyboard b/ios/LaunchScreen.storyboard new file mode 100644 index 00000000..57726b48 --- /dev/null +++ b/ios/LaunchScreen.storyboard @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/LaunchScreen.xib b/ios/LaunchScreen.xib deleted file mode 100644 index 035aa996..00000000 --- a/ios/LaunchScreen.xib +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f5c44813..f2b75a51 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -359,7 +359,7 @@ PODS: - React-Core - RNAudio (4.3.0): - React - - RNBootSplash (1.1.0): + - RNBootSplash (2.1.0): - React - RNDateTimePicker (2.1.0): - React @@ -775,7 +775,7 @@ SPEC CHECKSUMS: rn-extensions-share: 4bfee75806ad54aadeff1dfa535697a6345a50b8 rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc RNAudio: cae2991f2dccb75163f260b60da8051717b959fa - RNBootSplash: 73aabec1fc8f968798b655e7271760b17909648e + RNBootSplash: fbf76a4bf1c03e9acd1dd08ce064847f26d6d8bf RNDateTimePicker: 9db00606d689f5653f08aa601c81b9d3266a0a19 RNDeviceInfo: 17e34f6dd902f08d88cbe2c0b7a01be948d43641 RNFastImage: 9b0c22643872bb7494c8d87bbbb66cc4c0d9e7a2 diff --git a/ios/Pods/Local Podspecs/RNBootSplash.podspec.json b/ios/Pods/Local Podspecs/RNBootSplash.podspec.json index 1be3ac29..702fd7da 100644 --- a/ios/Pods/Local Podspecs/RNBootSplash.podspec.json +++ b/ios/Pods/Local Podspecs/RNBootSplash.podspec.json @@ -5,7 +5,7 @@ ] }, - "version": "1.1.0", + "version": "2.1.0", "license": "MIT", "summary": "Display a bootsplash on your app starts. Hide it when you want.", "authors": "Mathieu Acthernoene ", @@ -17,7 +17,7 @@ "requires_arc": true, "source": { "git": "https://github.com/zoontek/react-native-bootsplash.git", - "tag": "1.1.0" + "tag": "2.1.0" }, "source_files": "ios/*.{h,m}" } diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock index f5c44813..f2b75a51 100644 --- a/ios/Pods/Manifest.lock +++ b/ios/Pods/Manifest.lock @@ -359,7 +359,7 @@ PODS: - React-Core - RNAudio (4.3.0): - React - - RNBootSplash (1.1.0): + - RNBootSplash (2.1.0): - React - RNDateTimePicker (2.1.0): - React @@ -775,7 +775,7 @@ SPEC CHECKSUMS: rn-extensions-share: 4bfee75806ad54aadeff1dfa535697a6345a50b8 rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc RNAudio: cae2991f2dccb75163f260b60da8051717b959fa - RNBootSplash: 73aabec1fc8f968798b655e7271760b17909648e + RNBootSplash: fbf76a4bf1c03e9acd1dd08ce064847f26d6d8bf RNDateTimePicker: 9db00606d689f5653f08aa601c81b9d3266a0a19 RNDeviceInfo: 17e34f6dd902f08d88cbe2c0b7a01be948d43641 RNFastImage: 9b0c22643872bb7494c8d87bbbb66cc4c0d9e7a2 diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 1aeb889d..a011cdb3 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -32,8 +32,8 @@ 24A2AEF2383D44B586D31C01 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 06BB44DD4855498082A744AD /* libz.tbd */; }; 50046CB6BDA69B9232CF66D9 /* libPods-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C235DC7B31A4D1578EDEF219 /* libPods-RocketChatRN.a */; }; 7A006F14229C83B600803143 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A006F13229C83B600803143 /* GoogleService-Info.plist */; }; + 7A0D62D2242AB187006D5C06 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */; }; 7A55F1C52236D541005109A0 /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7A55F1C42236D541005109A0 /* custom.ttf */; }; - 7A7673F923A7FDC9005B1A09 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A7673F823A7FDC9005B1A09 /* LaunchScreen.xib */; }; 7AAA749E23043B1E00F1ADE9 /* Watermelon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */; }; 7AC99C1C2339361F0000A0CB /* Watermelon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */; }; 7ACD4897222860DE00442C55 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ACD4853222860DE00442C55 /* JavaScriptCore.framework */; }; @@ -102,8 +102,8 @@ 60B2A6A31FC4588700BD58E5 /* RocketChatRN.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RocketChatRN.entitlements; path = RocketChatRN/RocketChatRN.entitlements; sourceTree = ""; }; 66D6B1D0567051BE541450C9 /* Pods-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RocketChatRN.release.xcconfig"; path = "Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig"; sourceTree = ""; }; 7A006F13229C83B600803143 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 7A55F1C42236D541005109A0 /* custom.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = custom.ttf; sourceTree = ""; }; - 7A7673F823A7FDC9005B1A09 /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; 7AAA749C23043B1D00F1ADE9 /* RocketChatRN-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RocketChatRN-Bridging-Header.h"; sourceTree = ""; }; 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Watermelon.swift; sourceTree = ""; }; 7ACD4853222860DE00442C55 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; @@ -158,12 +158,12 @@ 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, 13B07FB01A68108700A75B9A /* AppDelegate.m */, - 7A7673F823A7FDC9005B1A09 /* LaunchScreen.xib */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB71A68108700A75B9A /* main.m */, 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */, 7AAA749C23043B1D00F1ADE9 /* RocketChatRN-Bridging-Header.h */, + 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */, ); name = RocketChatRN; sourceTree = ""; @@ -400,10 +400,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7A7673F923A7FDC9005B1A09 /* LaunchScreen.xib in Resources */, 7A55F1C52236D541005109A0 /* custom.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 7A006F14229C83B600803143 /* GoogleService-Info.plist in Resources */, + 7A0D62D2242AB187006D5C06 /* LaunchScreen.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -836,7 +836,7 @@ "$(inherited)", "$(SRCROOT)/../node_modules/rn-extensions-share/ios/**", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", - "$PODS_CONFIGURATION_BUILD_DIR/Firebase", + $PODS_CONFIGURATION_BUILD_DIR/Firebase, ); INFOPLIST_FILE = ShareRocketChatRN/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -949,7 +949,7 @@ "$(inherited)", "$(SRCROOT)/../node_modules/rn-extensions-share/ios/**", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", - "$PODS_CONFIGURATION_BUILD_DIR/Firebase", + $PODS_CONFIGURATION_BUILD_DIR/Firebase, ); INFOPLIST_FILE = ShareRocketChatRN/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme index 578a99fb..fb9ca715 100644 --- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme +++ b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme @@ -55,6 +55,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -67,17 +76,6 @@ - - - - - - - - =0.6.0" xmlbuilder "~9.0.1" +xml2js@^0.4.5: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + xmldoc@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.1.2.tgz#6666e029fe25470d599cd30e23ff0d1ed50466d7" @@ -12359,6 +12831,11 @@ xss-filters@^1.2.6: resolved "https://registry.yarnpkg.com/xss-filters/-/xss-filters-1.2.7.tgz#59fa1de201f36f2f3470dcac5f58ccc2830b0a9a" integrity sha1-Wfod4gHzby80cNysX1jMwoMLCpo= +xtend@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + xtend@^4.0.1, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"