@react-native-hero/splash-screen 0.0.2 → 0.1.1

package/README.md

@@ -38,7 +38,7 @@ $ react-native link @react-native-hero/splash-screen
 
 ## Setup
 
-Make sure you understand the native layout, this module does not support image as a flash screen.
+Make sure you understand the native layout, this module does not support image as a splash screen.
 
 * iOS: LaunchScreen.xib
 * Android: android/app/src/main/res/layout/splash_screen_default.xml
@@ -53,7 +53,8 @@ Make sure you understand the native layout, this module does not support image a
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   ...
-  [RNTSplashScreen show];
+  [super application:application didFinishLaunchingWithOptions:launchOptions];
+  [RNTSplashScreen show:self.window.rootViewController.view storyboardName:@"LaunchScreen"];
   return YES;
 }
 ```

package/android/build.gradle

@@ -3,8 +3,8 @@ buildscript {
     def kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.3.40'
 
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
 
     dependencies {
@@ -38,4 +38,4 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.3.40')}"
 }
 
-apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android'

package/android/src/main/java/com/github/reactnativehero/splashscreen/RNTSplashScreenModule.kt

@@ -19,7 +19,7 @@ class RNTSplashScreenModule(private val reactContext: ReactApplicationContext) :
 
         private var sharedDialog: Dialog? = null
 
-        fun show(context: Context) {
+        @JvmStatic fun show(context: Context) {
 
             val dialog = Dialog(context, R.style.splash_screen_default)
             dialog.setContentView(R.layout.splash_screen_default)

package/index.js

@@ -3,10 +3,6 @@ import { NativeModules } from 'react-native'
 
 const { RNTSplashScreen } = NativeModules
 
-export function show() {
-  RNTSplashScreen.show()
-}
-
 export function hide() {
   RNTSplashScreen.hide()
 }

package/ios/RNTSplashScreen/RNTSplashScreen.h

@@ -2,7 +2,7 @@
 
 @interface RNTSplashScreen : NSObject <RCTBridgeModule>
 
-+ (void)show;
++ (void)show:(UIView *)rootView storyboardName:(NSString *)storyboardName;
 + (void)hide;
 
 @end

package/ios/RNTSplashScreen/RNTSplashScreen.m

@@ -1,37 +1,56 @@
 #import "RNTSplashScreen.h"
 #import <React/RCTBridge.h>
+#import <React/RCTRootView.h>
 
 @implementation RNTSplashScreen
 
-static BOOL hasJavaScriptErrorObserver = NO;
-
+static BOOL hasJavaScriptDidFailToLoadObserver = NO;
+static BOOL hasContentDidAppearObserver = YES;
 static BOOL isShowing = NO;
 
-RCT_EXPORT_MODULE(RNTSplashScreen);
+static RCTRootView *rootView = nil;
 
-// 显示默认开屏
-+ (void)show {
-    
-    if (isShowing) {
-        return;
-    }
-    
-    isShowing = YES;
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+- (dispatch_queue_t)methodQueue {
+    return dispatch_queue_create("com.github.reactnativehero.splash_screen", DISPATCH_QUEUE_SERIAL);
+}
+
++ (void)show:(UIView *)view storyboardName:(NSString *)storyboardName {
     
-    if (!hasJavaScriptErrorObserver) {
+    if (!hasJavaScriptDidFailToLoadObserver) {
         
-        [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(onJavaScriptError:) name:RCTJavaScriptDidFailToLoadNotification
-            object:nil
+        [NSNotificationCenter.defaultCenter addObserver:self
+                                               selector:@selector(onJavaScriptDidFailToLoad:)
+                                                   name:RCTJavaScriptDidFailToLoadNotification
+                                                 object:nil
         ];
 
-        hasJavaScriptErrorObserver = YES;
+        hasJavaScriptDidFailToLoadObserver = YES;
         
     }
-
-    while (isShowing) {
-        [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
+    
+    if (hasContentDidAppearObserver) {
+        
+        [[NSNotificationCenter defaultCenter] removeObserver:view
+                                                      name:RCTContentDidAppearNotification
+                                                    object:view];
+        
+        hasContentDidAppearObserver = NO;
+        
+    }
+    
+    if (isShowing) {
+        return;
     }
     
+    rootView = (RCTRootView *)view;
+    
+    [self showLoadingView:storyboardName];
+    isShowing = YES;
+    
 }
 
 + (void)hide {
@@ -40,24 +59,44 @@ RCT_EXPORT_MODULE(RNTSplashScreen);
         return;
     }
     
+    [self hideLoadingView];
     isShowing = NO;
     
-    if (hasJavaScriptErrorObserver) {
+    if (hasJavaScriptDidFailToLoadObserver) {
         
-        [NSNotificationCenter.defaultCenter removeObserver:self name:RCTJavaScriptDidFailToLoadNotification
-            object:nil
+        [NSNotificationCenter.defaultCenter removeObserver:self
+                                                   name:RCTJavaScriptDidFailToLoadNotification
+                                                 object:nil
         ];
-        
-        hasJavaScriptErrorObserver = NO;
+
+        hasJavaScriptDidFailToLoadObserver = NO;
         
     }
     
 }
 
-+ (void)onJavaScriptError:(NSNotification *)notification {
++ (void)showLoadingView:(NSString *)storyboardName {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
+        UIView *loadingView = [[storyboard instantiateInitialViewController] view];
+        [rootView setLoadingView:loadingView];
+    });
+}
+
++ (void)hideLoadingView {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        rootView.loadingView.hidden = YES;
+        [rootView.loadingView removeFromSuperview];
+        rootView.loadingView = nil;
+    });
+}
+
++ (void)onJavaScriptDidFailToLoad:(NSNotification *)notification {
     [RNTSplashScreen hide];
 }
 
+RCT_EXPORT_MODULE(RNTSplashScreen);
+
 RCT_EXPORT_METHOD(hide) {
     [RNTSplashScreen hide];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-hero/splash-screen",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "description": "react native splash screen",
   "main": "index.js",
   "scripts": {