Using splash screen as rootViewController as clean up (#8134)

* fix for temporary black screen after launchscreen

* comments added

* Even better solution, set the splash screen as the rootviewcontroller

Author: markdevocht

lib/ios/RNNSplashScreenViewController.h

@@ -4,5 +4,5 @@
 @interface RNNSplashScreenViewController : UIViewController
 
 + (void)showOnWindow:(UIWindow *)window;
-
++ (UIViewController*)getSplashScreenVC;
 @end

lib/ios/RNNSplashScreenViewController.mm

@@ -5,6 +5,15 @@
 @implementation RNNSplashScreenViewController
 
 + (void)showOnWindow:(UIWindow *)window {
+    UIViewController *viewController = [self getSplashScreenVC];
+    if (viewController != nil) {
+        id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
+        appDelegate.window.rootViewController = viewController;
+        [appDelegate.window makeKeyAndVisible];
+    }
+}
+
++ (UIViewController*)getSplashScreenVC {
     CGRect screenBounds = [UIScreen mainScreen].bounds;
     CGFloat screenScale = [UIScreen mainScreen].scale;
     UIViewController *viewController = nil;
@@ -82,11 +91,7 @@ + (void)showOnWindow:(UIWindow *)window {
         }
     }
 
-    if (viewController != nil) {
-        id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
-        appDelegate.window.rootViewController = viewController;
-        [appDelegate.window makeKeyAndVisible];
-    }
+    return viewController;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

lib/ios/TurboModules/RNNTurboManager.mm

@@ -10,7 +10,7 @@
 #import "RNNReactRootViewCreator.h"
 #import "RNNTurboCommandsHandler.h"
 #import <React-RuntimeApple/ReactCommon/RCTHost.h>
-
+#import "RNNSplashScreenViewController.h"
 
 @interface RNNTurboManager ()
 @property(nonatomic, strong, readwrite) RNNExternalComponentStore *store;
@@ -25,13 +25,11 @@ @interface RNNTurboManager ()
 
 @implementation RNNTurboManager {
 	UIWindow *_mainWindow;
-    BOOL _isInitialRun;
 }
 
 - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow {
 	if (self = [super init]) {
-        _isInitialRun = YES;
-		_host = host;
+        _host = host;
 		_mainWindow = mainWindow;
 		_overlayManager = [RNNOverlayManager new];
 		_store = [RNNExternalComponentStore new];
@@ -41,11 +39,6 @@ - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow {
 													 name:@"RCTInstanceDidLoadBundle"
 												   object:nil];
 
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onReload)
-                                                     name:@"RCTTriggerReloadCommandNotification"
-                                                   object:nil];
-        
         // TODO: investigate which new event is fired
 		[[NSNotificationCenter defaultCenter] addObserver:self
 												 selector:@selector(onJavaScriptWillLoad)
@@ -106,12 +99,7 @@ - (void)onJavaScriptWillLoad {
 
 - (void)onJavaScriptLoaded {
     RCTExecuteOnMainQueue(^{
-        // TODO: the isInitialRun is the right and final answer for this, this will stop a blackscreen appearing after the splashscreen on startup. OnReload this will still happen because of the rootViewController = nil; which is needed to clean up what is already appearing.
-        if (!self->_isInitialRun) {
-            UIApplication.sharedApplication.delegate.window.rootViewController = nil;
-        }
-        
-        self-> _isInitialRun = NO;
+        UIApplication.sharedApplication.delegate.window.rootViewController = [RNNSplashScreenViewController getSplashScreenVC];
 
         [self->_commandsHandler setReadyToReceiveCommands:true];
         // TODO: Refactor
@@ -122,8 +110,5 @@ - (void)onJavaScriptLoaded {
     });
 }
 
-- (void)onReload {
-}
-
 @end
 #endif