More indentation fixes

ios/RCCManager.m

@@ -14,342 +14,295 @@
 
 @implementation RCCManager
 
-+ (instancetype)sharedInstance
-{
-  static RCCManager *sharedInstance = nil;
-  static dispatch_once_t onceToken = 0;
-  
-  dispatch_once(&onceToken,^{
-    if (sharedInstance == nil)
-    {
-      sharedInstance = [[RCCManager alloc] init];
-    }
-  });
-  
-  return sharedInstance;
++ (instancetype)sharedInstance {
+    static RCCManager *sharedInstance = nil;
+    static dispatch_once_t onceToken = 0;
+    
+    dispatch_once(&onceToken,^{
+        if (sharedInstance == nil) {
+            sharedInstance = [[RCCManager alloc] init];
+        }
+    });
+    
+    return sharedInstance;
 }
 
-+ (instancetype)sharedIntance
-{
-  return [RCCManager sharedInstance];
++ (instancetype)sharedIntance {
+    return [RCCManager sharedInstance];
 }
 
-- (instancetype)init
-{
-  self = [super init];
-  if (self)
-  {
-    self.modulesRegistry = [@{} mutableCopy];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTBridgeWillReloadNotification object:nil];
-  }
-  return self;
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.modulesRegistry = [@{} mutableCopy];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTBridgeWillReloadNotification object:nil];
+    }
+    return self;
 }
 
 - (NSDictionary *)getLaunchArgs {
-  NSMutableDictionary* mutableArguments = [[NSMutableDictionary alloc] init];
-  NSArray* arguments = [[NSProcessInfo processInfo] arguments];
-  for (int i = 0; i < [arguments count]; i+=2) {
-    NSString* key = [arguments objectAtIndex:i];
-    NSString* value = [arguments objectAtIndex:i+1];
-    [mutableArguments setObject:value forKey:key];
-  }
-  
-  return mutableArguments;
+    NSMutableDictionary* mutableArguments = [[NSMutableDictionary alloc] init];
+    NSArray* arguments = [[NSProcessInfo processInfo] arguments];
+    for (int i = 0; i < [arguments count]; i+=2) {
+        NSString* key = [arguments objectAtIndex:i];
+        NSString* value = [arguments objectAtIndex:i+1];
+        [mutableArguments setObject:value forKey:key];
+    }
+    
+    return mutableArguments;
 }
 
--(void)clearModuleRegistry
-{
-  [self.modulesRegistry removeAllObjects];
+-(void)clearModuleRegistry {
+    [self.modulesRegistry removeAllObjects];
 }
 
--(void)onRNReload
-{
-  id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
-  appDelegate.window.rootViewController = nil;
-  [self setAppStyle:nil];
-  [self clearModuleRegistry];
+-(void)onRNReload {
+    id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
+    appDelegate.window.rootViewController = nil;
+    [self setAppStyle:nil];
+    [self clearModuleRegistry];
 }
 
--(void)registerController:(UIViewController*)controller componentId:(NSString*)componentId componentType:(NSString*)componentType
-{
-  if (controller == nil || componentId == nil)
-  {
-    return;
-  }
-  
-  NSMutableDictionary *componentsDic = self.modulesRegistry[componentType];
-  if (componentsDic == nil)
-  {
-    componentsDic = [@{} mutableCopy];
-    self.modulesRegistry[componentType] = componentsDic;
-  }
-  
-  /*
-   TODO: we really want this error, but we need to unregister controllers when they dealloc
-   if (componentsDic[componentId])
-   {
-   [self.sharedBridge.redBox showErrorMessage:[NSString stringWithFormat:@"Controllers: controller with id %@ is already registered. Make sure all of the controller id's you use are unique.", componentId]];
-   }
-   */
-  
-  componentsDic[componentId] = controller;
+-(void)registerController:(UIViewController*)controller componentId:(NSString*)componentId componentType:(NSString*)componentType {
+    if (controller == nil || componentId == nil) {
+        return;
+    }
+    
+    NSMutableDictionary *componentsDic = self.modulesRegistry[componentType];
+    if (componentsDic == nil) {
+        componentsDic = [@{} mutableCopy];
+        self.modulesRegistry[componentType] = componentsDic;
+    }
+    
+    /*
+     TODO: we really want this error, but we need to unregister controllers when they dealloc
+     if (componentsDic[componentId])
+     {
+     [self.sharedBridge.redBox showErrorMessage:[NSString stringWithFormat:@"Controllers: controller with id %@ is already registered. Make sure all of the controller id's you use are unique.", componentId]];
+     }
+     */
+    
+    componentsDic[componentId] = controller;
 }
 
--(void)unregisterController:(UIViewController*)vc
-{
-  if (vc == nil) return;
-  
-  for (NSString *key in [self.modulesRegistry allKeys])
-  {
-    NSMutableDictionary *componentsDic = self.modulesRegistry[key];
-    for (NSString *componentID in [componentsDic allKeys])
-    {
-      UIViewController *tmpVc = componentsDic[componentID];
-      if (tmpVc == vc)
-      {
-        [componentsDic removeObjectForKey:componentID];
-      }
+-(void)unregisterController:(UIViewController*)vc {
+    if (vc == nil) return;
+    
+    for (NSString *key in [self.modulesRegistry allKeys]) {
+        NSMutableDictionary *componentsDic = self.modulesRegistry[key];
+        for (NSString *componentID in [componentsDic allKeys]) {
+            UIViewController *tmpVc = componentsDic[componentID];
+            if (tmpVc == vc) {
+                [componentsDic removeObjectForKey:componentID];
+            }
+        }
     }
-  }
 }
 
--(id)getControllerWithId:(NSString*)componentId componentType:(NSString*)componentType
-{
-  if (componentId == nil)
-  {
-    return nil;
-  }
-  
-  id component = nil;
-  
-  NSMutableDictionary *componentsDic = self.modulesRegistry[componentType];
-  if (componentsDic != nil)
-  {
-    component = componentsDic[componentId];
-  }
-  
-  return component;
+-(id)getControllerWithId:(NSString*)componentId componentType:(NSString*)componentType {
+    if (componentId == nil) {
+        return nil;
+    }
+    
+    id component = nil;
+    
+    NSMutableDictionary *componentsDic = self.modulesRegistry[componentType];
+    if (componentsDic != nil) {
+        component = componentsDic[componentId];
+    }
+    
+    return component;
 }
 
--(NSString*) getIdForController:(UIViewController*)vc
-{
-  if([vc isKindOfClass:[RCCViewController class]])
-  {
-    NSString *controllerId = ((RCCViewController*)vc).controllerId;
-    if(controllerId != nil)
-    {
-      return controllerId;
+-(NSString*) getIdForController:(UIViewController*)vc {
+    if([vc isKindOfClass:[RCCViewController class]]) {
+        NSString *controllerId = ((RCCViewController*)vc).controllerId;
+        if(controllerId != nil) {
+            return controllerId;
+        }
     }
-  }
-  
-  for (NSString *key in [self.modulesRegistry allKeys])
-  {
-    NSMutableDictionary *componentsDic = self.modulesRegistry[key];
-    for (NSString *componentID in [componentsDic allKeys])
-    {
-      UIViewController *tmpVc = componentsDic[componentID];
-      if (tmpVc == vc)
-      {
-        return componentID;
-      }
+    
+    for (NSString *key in [self.modulesRegistry allKeys]) {
+        NSMutableDictionary *componentsDic = self.modulesRegistry[key];
+        for (NSString *componentID in [componentsDic allKeys]) {
+            UIViewController *tmpVc = componentsDic[componentID];
+            if (tmpVc == vc) {
+                return componentID;
+            }
+        }
     }
-  }
-  return nil;
+    return nil;
 }
 
--(void)initBridgeWithBundleURL:(NSURL *)bundleURL
-{
-  [self initBridgeWithBundleURL :bundleURL launchOptions:nil];
+-(void)initBridgeWithBundleURL:(NSURL *)bundleURL {
+    [self initBridgeWithBundleURL :bundleURL launchOptions:nil];
 }
 
--(void)initBridgeWithBundleURL:(NSURL *)bundleURL launchOptions:(NSDictionary *)launchOptions
-{
-  if (self.sharedBridge) return;
-  
-  self.bundleURL = bundleURL;
-  self.sharedBridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-  
-  [[self class] showSplashScreen];
+-(void)initBridgeWithBundleURL:(NSURL *)bundleURL launchOptions:(NSDictionary *)launchOptions {
+    if (self.sharedBridge) return;
+    
+    self.bundleURL = bundleURL;
+    self.sharedBridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+    
+    [[self class] showSplashScreen];
 }
 
--(RCTBridge*)getBridge
-{
-  return self.sharedBridge;
+-(RCTBridge*)getBridge {
+    return self.sharedBridge;
 }
 
--(UIWindow*)getAppWindow
-{
-  UIApplication *app = [UIApplication sharedApplication];
-  UIWindow *window = (app.keyWindow != nil) ? app.keyWindow : app.windows[0];
-  return window;
+-(UIWindow*)getAppWindow {
+    UIApplication *app = [UIApplication sharedApplication];
+    UIWindow *window = (app.keyWindow != nil) ? app.keyWindow : app.windows[0];
+    return window;
 }
 
 #pragma mark - Splash Screen
 
-+ (void)showSplashScreen
-{
-  
-  UIViewController* viewControllerFromLaunchStoryboard;
-  viewControllerFromLaunchStoryboard = [self viewControllerFromLaunchStoryboard];
-  if (viewControllerFromLaunchStoryboard)
-  {
-    [self showSplashScreenViewController:viewControllerFromLaunchStoryboard];
-    return;
-  }
-  
-  CGRect screenBounds = [UIScreen mainScreen].bounds;
-  UIViewController* viewControllerFromLaunchNib = [self viewControllerFromLaunchNibForScreenBounds:screenBounds];
-  if (viewControllerFromLaunchNib)
-  {
-    [self showSplashScreenViewController:viewControllerFromLaunchNib];
-    return;
-  }
-  
-  UIViewController* viewControllerFromLaunchImage = [self viewControllerFromLaunchImageForScreenBounds:screenBounds];
-  if (viewControllerFromLaunchImage)
-  {
-    [self showSplashScreenViewController:viewControllerFromLaunchImage];
-    return;
-  }
-  
-  UIViewController* viewController = [[UIViewController alloc] init];
-  viewController.view.frame = screenBounds;
-  viewController.view.backgroundColor = [UIColor whiteColor];
-  
-  [self showSplashScreenViewController:viewController];
++ (void)showSplashScreen {
+    UIViewController* viewControllerFromLaunchStoryboard;
+    viewControllerFromLaunchStoryboard = [self viewControllerFromLaunchStoryboard];
+    if (viewControllerFromLaunchStoryboard) {
+        [self showSplashScreenViewController:viewControllerFromLaunchStoryboard];
+        return;
+    }
+    
+    CGRect screenBounds = [UIScreen mainScreen].bounds;
+    UIViewController* viewControllerFromLaunchNib = [self viewControllerFromLaunchNibForScreenBounds:screenBounds];
+    if (viewControllerFromLaunchNib) {
+        [self showSplashScreenViewController:viewControllerFromLaunchNib];
+        return;
+    }
+    
+    UIViewController* viewControllerFromLaunchImage = [self viewControllerFromLaunchImageForScreenBounds:screenBounds];
+    if (viewControllerFromLaunchImage) {
+        [self showSplashScreenViewController:viewControllerFromLaunchImage];
+        return;
+    }
+    
+    UIViewController* viewController = [[UIViewController alloc] init];
+    viewController.view.frame = screenBounds;
+    viewController.view.backgroundColor = [UIColor whiteColor];
+    
+    [self showSplashScreenViewController:viewController];
 }
 
-+ (UIViewController *)viewControllerFromLaunchStoryboard
-{
-  NSString* launchStoryboardName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
-  if (launchStoryboardName == nil)
-  {
-    return nil;
-  }
-  
-  @try {
-    UIStoryboard* storyboard = [UIStoryboard storyboardWithName:launchStoryboardName bundle:nil];
-    return storyboard.instantiateInitialViewController;
-  }
-  @catch(NSException *exception) {
-    return nil;
-  }
++ (UIViewController *)viewControllerFromLaunchStoryboard {
+    NSString* launchStoryboardName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
+    if (launchStoryboardName == nil) {
+        return nil;
+    }
+    
+    @try {
+        UIStoryboard* storyboard = [UIStoryboard storyboardWithName:launchStoryboardName bundle:nil];
+        return storyboard.instantiateInitialViewController;
+    } @catch(NSException *exception) {
+        return nil;
+    }
 }
 
-+ (UIViewController *)viewControllerFromLaunchNibForScreenBounds:(CGRect)screenBounds
-{
-  NSString* launchStoryboardName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
-  if (launchStoryboardName == nil)
-  {
-    return nil;
-  }
-  
-  @try {
-    id nibContents = [[NSBundle mainBundle] loadNibNamed:launchStoryboardName owner:self options:nil];
-    if (!nibContents || [nibContents count] == 0)
-    {
-      return nil;
++ (UIViewController *)viewControllerFromLaunchNibForScreenBounds:(CGRect)screenBounds {
+    NSString* launchStoryboardName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UILaunchStoryboardName"];
+    if (launchStoryboardName == nil) {
+        return nil;
     }
     
-    id firstObject = [nibContents firstObject];
-    if (![firstObject isKindOfClass:[UIView class]])
-    {
-      return nil;
+    @try {
+        id nibContents = [[NSBundle mainBundle] loadNibNamed:launchStoryboardName owner:self options:nil];
+        if (!nibContents || [nibContents count] == 0) {
+            return nil;
+        }
+        
+        id firstObject = [nibContents firstObject];
+        if (![firstObject isKindOfClass:[UIView class]]) {
+            return nil;
+        }
+        
+        UIViewController* viewController = [[UIViewController alloc] init];
+        viewController.view = (UIView *)firstObject;
+        viewController.view.frame = screenBounds;
+        return viewController;
+    } @catch(NSException *exception) {
+        return nil;
     }
-    
-    UIViewController* viewController = [[UIViewController alloc] init];
-    viewController.view = (UIView *)firstObject;
-    viewController.view.frame = screenBounds;
-    return viewController;
-  }
-  @catch(NSException *exception) {
-    return nil;
-  }
 }
 
-+ (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)screenBounds
-{
-  //load the splash from the default image or from LaunchImage in the xcassets
-  
-  CGFloat screenHeight = screenBounds.size.height;
-  
-  NSString* imageName = @"Default";
-  if (screenHeight == 568)
-    imageName = [imageName stringByAppendingString:@"-568h"];
-  else if (screenHeight == 667)
-    imageName = [imageName stringByAppendingString:@"-667h"];
-  else if (screenHeight == 736)
-    imageName = [imageName stringByAppendingString:@"-736h"];
-  
-  //xcassets LaunchImage files
-  UIImage *image = [UIImage imageNamed:imageName];
-  if (image == nil)
-  {
-    imageName = @"LaunchImage";
++ (UIViewController *)viewControllerFromLaunchImageForScreenBounds:(CGRect)screenBounds {
+    //load the splash from the default image or from LaunchImage in the xcassets
+    
+    CGFloat screenHeight = screenBounds.size.height;
     
-    if (screenHeight == 480)
-      imageName = [imageName stringByAppendingString:@"-700"];
+    NSString* imageName = @"Default";
     if (screenHeight == 568)
-      imageName = [imageName stringByAppendingString:@"-700-568h"];
+        imageName = [imageName stringByAppendingString:@"-568h"];
     else if (screenHeight == 667)
-      imageName = [imageName stringByAppendingString:@"-800-667h"];
+        imageName = [imageName stringByAppendingString:@"-667h"];
     else if (screenHeight == 736)
-      imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
-    else if (screenHeight == 812)
-      imageName = [imageName stringByAppendingString:@"-1100-Portrait-2436h"];
-    else if (screenHeight == 1024)
-      imageName = [imageName stringByAppendingString:@"-Portrait"];
+        imageName = [imageName stringByAppendingString:@"-736h"];
     
-    image = [UIImage imageNamed:imageName];
-  }
-  
-  if (image == nil)
-  {
-    return nil;
-  }
-  
-  UIViewController* viewController = [[UIViewController alloc] init];
-  
-  UIImageView* imageView = [[UIImageView alloc] initWithImage:image];
-  viewController.view = imageView;
-  viewController.view.frame = screenBounds;
-  
-  return viewController;
+    //xcassets LaunchImage files
+    UIImage *image = [UIImage imageNamed:imageName];
+    if (image == nil) {
+        imageName = @"LaunchImage";
+        
+        if (screenHeight == 480)
+            imageName = [imageName stringByAppendingString:@"-700"];
+        if (screenHeight == 568)
+            imageName = [imageName stringByAppendingString:@"-700-568h"];
+        else if (screenHeight == 667)
+            imageName = [imageName stringByAppendingString:@"-800-667h"];
+        else if (screenHeight == 736)
+            imageName = [imageName stringByAppendingString:@"-800-Portrait-736h"];
+        else if (screenHeight == 812)
+            imageName = [imageName stringByAppendingString:@"-1100-Portrait-2436h"];
+        else if (screenHeight == 1024)
+            imageName = [imageName stringByAppendingString:@"-Portrait"];
+        
+        image = [UIImage imageNamed:imageName];
+    }
+    
+    if (image == nil) {
+        return nil;
+    }
+    
+    UIViewController* viewController = [[UIViewController alloc] init];
+    
+    UIImageView* imageView = [[UIImageView alloc] initWithImage:image];
+    viewController.view = imageView;
+    viewController.view.frame = screenBounds;
+    
+    return viewController;
 }
 
-+ (void)showSplashScreenViewController:(UIViewController *)viewController
-{
-  id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
-  appDelegate.window.rootViewController = viewController;
-  [appDelegate.window makeKeyAndVisible];
++ (void)showSplashScreenViewController:(UIViewController *)viewController {
+    id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
+    appDelegate.window.rootViewController = viewController;
+    [appDelegate.window makeKeyAndVisible];
 }
 
--(NSDictionary*)getAppStyle
-{
-  return [NSDictionary dictionaryWithDictionary:self.globalAppStyle];
+-(NSDictionary*)getAppStyle {
+    return [NSDictionary dictionaryWithDictionary:self.globalAppStyle];
 }
 
--(void)setAppStyle:(NSDictionary*)appStyle
-{
-  self.globalAppStyle = [NSDictionary dictionaryWithDictionary:appStyle];
-  [self applyAppStyle];
-  
+-(void)setAppStyle:(NSDictionary*)appStyle {
+    self.globalAppStyle = [NSDictionary dictionaryWithDictionary:appStyle];
+    [self applyAppStyle];
+    
 }
 
 -(void)applyAppStyle {
-  id backButtonImage = self.globalAppStyle[@"backButtonImage"];
-  UIImage *image = backButtonImage ? [RCTConvert UIImage:backButtonImage] : nil;
-  [[UINavigationBar appearance] setBackIndicatorImage:image];
-  [[UINavigationBar appearance] setBackIndicatorTransitionMaskImage:image];
+    id backButtonImage = self.globalAppStyle[@"backButtonImage"];
+    UIImage *image = backButtonImage ? [RCTConvert UIImage:backButtonImage] : nil;
+    [[UINavigationBar appearance] setBackIndicatorImage:image];
+    [[UINavigationBar appearance] setBackIndicatorTransitionMaskImage:image];
 }
 
 
 #pragma mark - RCTBridgeDelegate methods
 
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-  return self.bundleURL;
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+    return self.bundleURL;
 }
 
 @end

ios/RCCManagerModule.m

@@ -51,8 +51,7 @@ RCT_EXPORT_MODULE(RCCManager);
 
 #pragma mark - constatnts export
 
-- (NSDictionary *)constantsToExport
-{
+- (NSDictionary *)constantsToExport {
     return @{
              //Error codes
              @"RCCManagerModuleCantCreateControllerErrorCode" : @(RCCManagerModuleCantCreateControllerErrorCode),
@@ -69,61 +68,50 @@ RCT_EXPORT_MODULE(RCCManager);
              };
 }
 
-- (dispatch_queue_t)methodQueue
-{
+- (dispatch_queue_t)methodQueue {
     return dispatch_get_main_queue();
 }
 
-+ (BOOL)requiresMainQueueSetup
-{
++ (BOOL)requiresMainQueueSetup {
     return YES;
 }
 
 #pragma mark - helper methods
 
-+(UIViewController*)modalPresenterViewControllers:(NSMutableArray*)returnAllPresenters
-{
++(UIViewController*)modalPresenterViewControllers:(NSMutableArray*)returnAllPresenters {
     UIViewController *modalPresenterViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-    if ((returnAllPresenters != nil) && (modalPresenterViewController != nil))
-    {
+    if ((returnAllPresenters != nil) && (modalPresenterViewController != nil)) {
         [returnAllPresenters addObject:modalPresenterViewController];
     }
     
-    while (modalPresenterViewController.presentedViewController != nil)
-    {
+    while (modalPresenterViewController.presentedViewController != nil) {
         modalPresenterViewController = modalPresenterViewController.presentedViewController;
         
-        if (returnAllPresenters != nil)
-        {
+        if (returnAllPresenters != nil) {
             [returnAllPresenters addObject:modalPresenterViewController];
         }
     }
     return modalPresenterViewController;
 }
 
-+(UIViewController*)lastModalPresenterViewController
-{
++(UIViewController*)lastModalPresenterViewController {
     return [self modalPresenterViewControllers:nil];
 }
 
-+(NSError*)rccErrorWithCode:(NSInteger)code description:(NSString*)description
-{
++(NSError*)rccErrorWithCode:(NSInteger)code description:(NSString*)description {
     NSString *safeDescription = (description == nil) ? @"" : description;
     return [NSError errorWithDomain:@"RCCControllers" code:code userInfo:@{NSLocalizedDescriptionKey: safeDescription}];
 }
 
-+(void)handleRCTPromiseRejectBlock:(RCTPromiseRejectBlock)reject error:(NSError*)error
-{
++(void)handleRCTPromiseRejectBlock:(RCTPromiseRejectBlock)reject error:(NSError*)error {
     reject([NSString stringWithFormat: @"%lu", (long)error.code], error.localizedDescription, error);
 }
 
-+(void)cancelAllRCCViewControllerReactTouches
-{
++(void)cancelAllRCCViewControllerReactTouches {
     [[NSNotificationCenter defaultCenter] postNotificationName:RCCViewControllerCancelReactTouchesNotification object:nil];
 }
 
--(void)animateSnapshot:(UIView*)snapshot animationType:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve
-{
+-(void)animateSnapshot:(UIView*)snapshot animationType:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve {
     [UIView animateWithDuration:kSlideDownAnimationDuration delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^()
      {
          if (animationType == nil || [animationType isEqualToString:@"slide-down"])
@@ -146,8 +134,7 @@ RCT_EXPORT_MODULE(RCCManager);
      }];
 }
 
--(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers resolver:(RCTPromiseResolveBlock)resolve
-{
+-(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers resolver:(RCTPromiseResolveBlock)resolve {
     UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
     
     if (allPresentedViewControllers.count > 0)
@@ -160,8 +147,7 @@ RCT_EXPORT_MODULE(RCCManager);
                                counter++;
                                
                                
-                               if (viewController.presentedViewController != nil)
-                               {
+                               if (viewController.presentedViewController != nil) {
                                    dispatch_semaphore_t dismiss_sema = dispatch_semaphore_create(0);
                                    
                                    dispatch_async(dispatch_get_main_queue(), ^
@@ -172,12 +158,10 @@ RCT_EXPORT_MODULE(RCCManager);
                                                                [[RCCManager sharedIntance] unregisterController:viewController];
                                                            }
                                                            
-                                                           if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
-                                                           {
+                                                           if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0) {
                                                                [allPresentedViewControllers removeAllObjects];
                                                                
-                                                               if (resolve != nil)
-                                                               {
+                                                               if (resolve != nil) {
                                                                    resolve(nil);
                                                                }
                                                            }
@@ -191,8 +175,7 @@ RCT_EXPORT_MODULE(RCCManager);
                                {
                                    [allPresentedViewControllers removeAllObjects];
                                    
-                                   if (resolve != nil)
-                                   {
+                                   if (resolve != nil) {
                                        dispatch_async(dispatch_get_main_queue(), ^
                                                       {
                                                           resolve(nil);
@@ -201,9 +184,7 @@ RCT_EXPORT_MODULE(RCCManager);
                                }
                            }
                        });
-    }
-    else if (resolve != nil)
-    {
+    } else if (resolve != nil) {
         resolve(nil);
     }
 }
@@ -211,8 +192,7 @@ RCT_EXPORT_MODULE(RCCManager);
 #pragma mark - RCT exported methods
 
 RCT_EXPORT_METHOD(
-                  setRootController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+                  setRootController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     if ([[RCCManager sharedInstance] getBridge].loading) {
         [self deferSetRootControllerWhileBridgeLoading:layout animationType:animationType globalProps:globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject];
         return;
@@ -227,15 +207,13 @@ RCT_EXPORT_METHOD(
 /**
  * on RN31 there's a timing issue, we must wait for the bridge to finish loading
  */
--(void)deferSetRootControllerWhileBridgeLoading:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject
-{
+-(void)deferSetRootControllerWhileBridgeLoading:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0001 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self setRootController:layout animationType:animationType globalProps:globalProps resolver:resolve rejecter:reject];
     });
 }
 
--(void)performSetRootController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps
-{
+-(void)performSetRootController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps {
     
     NSMutableDictionary *modifiedGloablProps = [globalProps mutableCopy];
     modifiedGloablProps[GLOBAL_SCREEN_ACTION_COMMAND_TYPE] = COMMAND_TYPE_INITIAL_SCREEN;
@@ -247,11 +225,10 @@ RCT_EXPORT_METHOD(
     NSDictionary *appStyle = layout[@"props"][@"appStyle"];
     if (appStyle) {
         [[RCCManager sharedIntance] setAppStyle:appStyle];
-		
-		if([appStyle[@"autoAdjustScrollViewInsets"] boolValue] == YES)
-		{
-			[RNNSwizzles applySwizzles];
-		}
+        
+        if([appStyle[@"autoAdjustScrollViewInsets"] boolValue] == YES) {
+            [RNNSwizzles applySwizzles];
+        }
     }
     
     // create the new controller
@@ -264,8 +241,7 @@ RCT_EXPORT_METHOD(
     // if we're animating - add a snapshot now
     UIViewController *presentedViewController = nil;
     UIView *snapshot = nil;
-    if (animated)
-    {
+    if (animated) {
         if(appDelegate.window.rootViewController.presentedViewController != nil)
             presentedViewController = appDelegate.window.rootViewController.presentedViewController;
         else
@@ -283,8 +259,7 @@ RCT_EXPORT_METHOD(
          [appDelegate.window makeKeyAndVisible];
          [presentedViewController dismissViewControllerAnimated:NO completion:nil];
          
-         if (animated)
-         {
+         if (animated) {
              // move the snaphot to the new root and animate it
              [appDelegate.window.rootViewController.view addSubview:snapshot];
              [self animateSnapshot:snapshot animationType:animationType resolver:nil];
@@ -293,8 +268,7 @@ RCT_EXPORT_METHOD(
 }
 
 RCT_EXPORT_METHOD(
-                  NavigationControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams)
-{
+                  NavigationControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams) {
     if (!controllerId || !performAction) return;
     RCCNavigationController* controller = [[RCCManager sharedInstance] getControllerWithId:controllerId componentType:@"NavigationControllerIOS"];
     if (!controller || ![controller isKindOfClass:[RCCNavigationController class]]) return;
@@ -302,8 +276,7 @@ RCT_EXPORT_METHOD(
 }
 
 RCT_EXPORT_METHOD(
-                  DrawerControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams)
-{
+                  DrawerControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams) {
     if (!controllerId || !performAction) return;
     
     id<RCCDrawerDelegate> controller = [[RCCManager sharedIntance] getControllerWithId:controllerId componentType:@"DrawerControllerIOS"];
@@ -313,18 +286,15 @@ RCT_EXPORT_METHOD(
 }
 
 RCT_EXPORT_METHOD(
-                  TabBarControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-    if (!controllerId || !performAction)
-    {
+                  TabBarControllerIOS:(NSString*)controllerId performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    if (!controllerId || !performAction) {
         [RCCManagerModule handleRCTPromiseRejectBlock:reject
                                                 error:[RCCManagerModule rccErrorWithCode:RCCManagerModuleMissingParamsErrorCode description:@"missing params"]];
         return;
     }
     
     RCCTabBarController* controller = [[RCCManager sharedInstance] getControllerWithId:controllerId componentType:@"TabBarControllerIOS"];
-    if (!controller || ![controller isKindOfClass:[RCCTabBarController class]])
-    {
+    if (!controller || ![controller isKindOfClass:[RCCTabBarController class]]) {
         [RCCManagerModule handleRCTPromiseRejectBlock:reject
                                                 error:[RCCManagerModule rccErrorWithCode:RCCManagerModuleCantFindTabControllerErrorCode description:@"could not find UITabBarController"]];
         return;
@@ -333,27 +303,23 @@ RCT_EXPORT_METHOD(
 }
 
 RCT_EXPORT_METHOD(
-                  modalShowLightBox:(NSDictionary*)params)
-{
+                  modalShowLightBox:(NSDictionary*)params) {
     [RCCLightBox showWithParams:params];
 }
 
 RCT_EXPORT_METHOD(
-                  modalDismissLightBox)
-{
+                  modalDismissLightBox) {
     [RCCLightBox dismiss];
 }
 
 RCT_EXPORT_METHOD(
-                  showController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-
+                  showController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    
     NSMutableDictionary *modifiedGlobalProps = [globalProps mutableCopy];
     modifiedGlobalProps[GLOBAL_SCREEN_ACTION_COMMAND_TYPE] = COMMAND_TYPE_SHOW_MODAL;
     
     UIViewController *controller = [RCCViewController controllerWithLayout:layout globalProps:modifiedGlobalProps bridge:[[RCCManager sharedInstance] getBridge]];
-    if (controller == nil)
-    {
+    if (controller == nil) {
         [RCCManagerModule handleRCTPromiseRejectBlock:reject
                                                 error:[RCCManagerModule rccErrorWithCode:RCCManagerModuleCantCreateControllerErrorCode description:@"could not create controller"]];
         return;
@@ -375,36 +341,25 @@ RCT_EXPORT_METHOD(
                                                                     completion:^(){ resolve(nil); }];
 }
 
-- (UIViewController *) getVisibleViewControllerFor:(UIViewController *)vc
-{
-    if ([vc isKindOfClass:[UINavigationController class]])
-    {
+- (UIViewController *) getVisibleViewControllerFor:(UIViewController *)vc {
+    if ([vc isKindOfClass:[UINavigationController class]]) {
         return [self getVisibleViewControllerFor:[((UINavigationController*)vc) visibleViewController]];
-    }
-    else if ([vc isKindOfClass:[UITabBarController class]])
-    {
+    } else if ([vc isKindOfClass:[UITabBarController class]]) {
         return [self getVisibleViewControllerFor:[((UITabBarController*)vc) selectedViewController]];
-    }
-    else if (vc.presentedViewController)
-    {
+    } else if (vc.presentedViewController) {
         return [self getVisibleViewControllerFor:vc.presentedViewController];
-    }
-    else if ([vc isKindOfClass:[TheSidebarController class]]) {
+    } else if ([vc isKindOfClass:[TheSidebarController class]]) {
         TheSidebarController *drawerController = (TheSidebarController*) vc;
         return [self getVisibleViewControllerFor:drawerController.contentViewController];
-    }
-    else if ([vc isKindOfClass:[MMDrawerController class]]) {
+    } else if ([vc isKindOfClass:[MMDrawerController class]]) {
         MMDrawerController *drawerController = (MMDrawerController*) vc;
         return [self getVisibleViewControllerFor:drawerController.centerViewController];
-    }
-    else
-    {
+    } else {
         return vc;
     }
 }
 
-RCT_EXPORT_METHOD(getCurrentlyVisibleScreenId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(getCurrentlyVisibleScreenId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     UIViewController *rootVC = [UIApplication sharedApplication].delegate.window.rootViewController;
     UIViewController *visibleVC = [self getVisibleViewControllerFor:rootVC];
     NSString *controllerId = [[RCCManager sharedIntance] getIdForController:visibleVC];
@@ -412,36 +367,27 @@ RCT_EXPORT_METHOD(getCurrentlyVisibleScreenId:(RCTPromiseResolveBlock)resolve re
     resolve(result);
 }
 
--(BOOL)viewControllerIsModal:(UIViewController*)viewController
-{
+-(BOOL)viewControllerIsModal:(UIViewController*)viewController {
     BOOL viewControllerIsModal = (viewController.presentingViewController.presentedViewController == viewController)
     || ((viewController.navigationController != nil) && (viewController.navigationController.presentingViewController.presentedViewController == viewController.navigationController) && (viewController == viewController.navigationController.viewControllers[0]))
     || ([viewController.tabBarController.presentingViewController isKindOfClass:[UITabBarController class]]);
     return viewControllerIsModal;
 }
 
-RCT_EXPORT_METHOD(
-                  dismissController:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(dismissController:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     UIViewController* vc = [RCCManagerModule lastModalPresenterViewController];
-    if ([self viewControllerIsModal:vc])
-    {
+    if ([self viewControllerIsModal:vc]) {
         [[RCCManager sharedIntance] unregisterController:vc];
         
         [vc dismissViewControllerAnimated:![animationType isEqualToString:@"none"]
                                completion:^(){ resolve(nil); }];
-    }
-    else
-    {
+    } else {
         resolve(nil);
     }
 }
 
-RCT_EXPORT_METHOD(
-                  dismissAllControllers:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-    if([UIApplication sharedApplication].delegate.window.rootViewController.presentedViewController == nil)
-    {//if there are no modal - do nothing
+RCT_EXPORT_METHOD(dismissAllControllers:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    if([UIApplication sharedApplication].delegate.window.rootViewController.presentedViewController == nil) {//if there are no modal - do nothing
         resolve(nil);
         return;
     }
@@ -450,8 +396,7 @@ RCT_EXPORT_METHOD(
     [RCCManagerModule modalPresenterViewControllers:allPresentedViewControllers];
     
     BOOL animated = ![animationType isEqualToString:@"none"];
-    if (animated)
-    {
+    if (animated) {
         id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
         UIView *snapshot = [appDelegate.window snapshotViewAfterScreenUpdates:NO];
         [appDelegate.window addSubview:snapshot];
@@ -460,33 +405,24 @@ RCT_EXPORT_METHOD(
          {
              [self animateSnapshot:snapshot animationType:animationType resolver:resolve];
          }];
-    }
-    else
-    {
+    } else {
         [self dismissAllModalPresenters:allPresentedViewControllers resolver:resolve];
     }
 }
 
-RCT_EXPORT_METHOD(
-                  showNotification:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(showNotification:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [RCCNotification showWithParams:params resolver:resolve rejecter:reject];
 }
 
-RCT_EXPORT_METHOD(
-                  dismissNotification:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(dismissNotification:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [RCCNotification dismissWithParams:params resolver:resolve rejecter:reject];
 }
 
-RCT_EXPORT_METHOD(
-                  cancelAllReactTouches)
-{
+RCT_EXPORT_METHOD(cancelAllReactTouches) {
     [RCCManagerModule cancelAllRCCViewControllerReactTouches];
 }
 
-RCT_EXPORT_METHOD(getLaunchArgs:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(getLaunchArgs:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     resolve([[RCCManager sharedInstance] getLaunchArgs]);
 }
 

ios/RCCTabBarController.m

@@ -18,405 +18,365 @@
 
 
 -(UIInterfaceOrientationMask)supportedInterfaceOrientations {
-  return [self supportedControllerOrientations];
+    return [self supportedControllerOrientations];
 }
 
 - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController {
-  id queue = [[RCCManager sharedInstance].getBridge uiManager].methodQueue;
-  dispatch_async(queue, ^{
-    [[[RCCManager sharedInstance].getBridge uiManager] configureNextLayoutAnimation:nil withCallback:^(NSArray* arr){} errorCallback:^(NSArray* arr){}];
-  });
-  
-  if (tabBarController.selectedIndex != [tabBarController.viewControllers indexOfObject:viewController]) {
-    NSDictionary *body = @{
-                           @"selectedTabIndex": @([tabBarController.viewControllers indexOfObject:viewController]),
-                           @"unselectedTabIndex": @(tabBarController.selectedIndex)
-                           };
-    [RCCTabBarController sendScreenTabChangedEvent:viewController body:body];
+    id queue = [[RCCManager sharedInstance].getBridge uiManager].methodQueue;
+    dispatch_async(queue, ^{
+        [[[RCCManager sharedInstance].getBridge uiManager] configureNextLayoutAnimation:nil withCallback:^(NSArray* arr){} errorCallback:^(NSArray* arr){}];
+    });
     
-    [[[RCCManager sharedInstance] getBridge].eventDispatcher sendAppEventWithName:@"bottomTabSelected" body:body];
-    if ([viewController isKindOfClass:[UINavigationController class]]) {
-      UINavigationController *navigationController = (UINavigationController*)viewController;
-      UIViewController *topViewController = navigationController.topViewController;
-      
-      if ([topViewController isKindOfClass:[RCCViewController class]]) {
-        RCCViewController *topRCCViewController = (RCCViewController*)topViewController;
-        topRCCViewController.commandType = COMMAND_TYPE_BOTTOME_TAB_SELECTED;
-        topRCCViewController.timestamp = [RCTHelpers getTimestampString];
-      }
+    if (tabBarController.selectedIndex != [tabBarController.viewControllers indexOfObject:viewController]) {
+        NSDictionary *body = @{
+                               @"selectedTabIndex": @([tabBarController.viewControllers indexOfObject:viewController]),
+                               @"unselectedTabIndex": @(tabBarController.selectedIndex)
+                               };
+        [RCCTabBarController sendScreenTabChangedEvent:viewController body:body];
+        
+        [[[RCCManager sharedInstance] getBridge].eventDispatcher sendAppEventWithName:@"bottomTabSelected" body:body];
+        if ([viewController isKindOfClass:[UINavigationController class]]) {
+            UINavigationController *navigationController = (UINavigationController*)viewController;
+            UIViewController *topViewController = navigationController.topViewController;
+            
+            if ([topViewController isKindOfClass:[RCCViewController class]]) {
+                RCCViewController *topRCCViewController = (RCCViewController*)topViewController;
+                topRCCViewController.commandType = COMMAND_TYPE_BOTTOME_TAB_SELECTED;
+                topRCCViewController.timestamp = [RCTHelpers getTimestampString];
+            }
+        }
+        
+    } else {
+        [RCCTabBarController sendScreenTabPressedEvent:viewController body:nil];
     }
     
-  } else {
-    [RCCTabBarController sendScreenTabPressedEvent:viewController body:nil];
-  }
-  
-  
-  
-  return YES;
+    
+    
+    return YES;
 }
 
-- (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1
-{
-  UIGraphicsBeginImageContextWithOptions(image.size, NO, image.scale);
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  CGContextTranslateCTM(context, 0, image.size.height);
-  CGContextScaleCTM(context, 1.0, -1.0);
-  CGContextSetBlendMode(context, kCGBlendModeNormal);
-  CGRect rect = CGRectMake(0, 0, image.size.width, image.size.height);
-  CGContextClipToMask(context, rect, image.CGImage);
-  [color1 setFill];
-  CGContextFillRect(context, rect);
-  UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return newImage;
+- (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1 {
+    UIGraphicsBeginImageContextWithOptions(image.size, NO, image.scale);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextTranslateCTM(context, 0, image.size.height);
+    CGContextScaleCTM(context, 1.0, -1.0);
+    CGContextSetBlendMode(context, kCGBlendModeNormal);
+    CGRect rect = CGRectMake(0, 0, image.size.width, image.size.height);
+    CGContextClipToMask(context, rect, image.CGImage);
+    [color1 setFill];
+    CGContextFillRect(context, rect);
+    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return newImage;
 }
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge
-{
-  self = [super init];
-  if (!self) return nil;
-  
-  self.delegate = self;
-  
-  self.tabBar.translucent = YES; // default
-  
-  UIColor *buttonColor = nil;
-  UIColor *selectedButtonColor = nil;
-  UIColor *labelColor = nil;
-  UIColor *selectedLabelColor = nil;
-  NSDictionary *tabsStyle = props[@"style"];
-  if (tabsStyle)
-  {
-    NSString *tabBarButtonColor = tabsStyle[@"tabBarButtonColor"];
-    if (tabBarButtonColor)
-    {
-      UIColor *color = tabBarButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarButtonColor] : nil;
-      self.tabBar.tintColor = color;
-      buttonColor = color;
-      selectedButtonColor = color;
-    }
-    NSString *tabBarSelectedButtonColor = tabsStyle[@"tabBarSelectedButtonColor"];
-    if (tabBarSelectedButtonColor)
-    {
-      UIColor *color = tabBarSelectedButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarSelectedButtonColor] : nil;
-      self.tabBar.tintColor = color;
-      selectedButtonColor = color;
-    }
-    NSString *tabBarLabelColor = tabsStyle[@"tabBarLabelColor"];
-    if(tabBarLabelColor) {
-      UIColor *color = tabBarLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarLabelColor] : nil;
-      labelColor = color;
-    }
-    NSString *tabBarSelectedLabelColor = tabsStyle[@"tabBarSelectedLabelColor"];
-    if(tabBarLabelColor) {
-      UIColor *color = tabBarSelectedLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:
-                                                                        tabBarSelectedLabelColor] : nil;
-      selectedLabelColor = color;
-    }
-    NSString *tabBarBackgroundColor = tabsStyle[@"tabBarBackgroundColor"];
-    if (tabBarBackgroundColor)
-    {
-      UIColor *color = tabBarBackgroundColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarBackgroundColor] : nil;
-      self.tabBar.barTintColor = color;
-    }
-
-    NSString *tabBarTranslucent = tabsStyle[@"tabBarTranslucent"];
-    if (tabBarTranslucent)
-    {
-      self.tabBar.translucent = [tabBarTranslucent boolValue] ? YES : NO;
-    }
-
-    NSString *tabBarHideShadow = tabsStyle[@"tabBarHideShadow"];
-    if (tabBarHideShadow)
-    {
-      self.tabBar.clipsToBounds = [tabBarHideShadow boolValue] ? YES : NO;
-    }
-  }
-  
-  NSMutableArray *viewControllers = [NSMutableArray array];
-  
-  // go over all the tab bar items
-  for (NSDictionary *tabItemLayout in children)
-  {
-    // make sure the layout is valid
-    if (![tabItemLayout[@"type"] isEqualToString:@"TabBarControllerIOS.Item"]) continue;
-    if (!tabItemLayout[@"props"]) continue;
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge {
+    self = [super init];
+    if (!self) return nil;
     
-    // get the view controller inside
-    if (!tabItemLayout[@"children"]) continue;
-    if (![tabItemLayout[@"children"] isKindOfClass:[NSArray class]]) continue;
-    if ([tabItemLayout[@"children"] count] < 1) continue;
-    NSDictionary *childLayout = tabItemLayout[@"children"][0];
-    UIViewController *viewController = [RCCViewController controllerWithLayout:childLayout globalProps:globalProps bridge:bridge];
-    if (!viewController) continue;
+    self.delegate = self;
     
-    // create the tab icon and title
-    NSString *title = tabItemLayout[@"props"][@"title"];
-    UIImage *iconImage = nil;
-    id icon = tabItemLayout[@"props"][@"icon"];
-    if (icon)
-    {
-      iconImage = [RCTConvert UIImage:icon];
-      if (buttonColor)
-      {
-        iconImage = [[self image:iconImage withColor:buttonColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-      }
-    }
-    UIImage *iconImageSelected = nil;
-    id selectedIcon = tabItemLayout[@"props"][@"selectedIcon"];
-    if (selectedIcon) {
-      iconImageSelected = [RCTConvert UIImage:selectedIcon];
-    } else {
-      iconImageSelected = [RCTConvert UIImage:icon];
+    self.tabBar.translucent = YES; // default
+    
+    UIColor *buttonColor = nil;
+    UIColor *selectedButtonColor = nil;
+    UIColor *labelColor = nil;
+    UIColor *selectedLabelColor = nil;
+    NSDictionary *tabsStyle = props[@"style"];
+    if (tabsStyle) {
+        NSString *tabBarButtonColor = tabsStyle[@"tabBarButtonColor"];
+        if (tabBarButtonColor) {
+            UIColor *color = tabBarButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarButtonColor] : nil;
+            self.tabBar.tintColor = color;
+            buttonColor = color;
+            selectedButtonColor = color;
+        }
+        NSString *tabBarSelectedButtonColor = tabsStyle[@"tabBarSelectedButtonColor"];
+        if (tabBarSelectedButtonColor) {
+            UIColor *color = tabBarSelectedButtonColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarSelectedButtonColor] : nil;
+            self.tabBar.tintColor = color;
+            selectedButtonColor = color;
+        }
+        NSString *tabBarLabelColor = tabsStyle[@"tabBarLabelColor"];
+        if (tabBarLabelColor) {
+            UIColor *color = tabBarLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarLabelColor] : nil;
+            labelColor = color;
+        }
+        NSString *tabBarSelectedLabelColor = tabsStyle[@"tabBarSelectedLabelColor"];
+        if (tabBarLabelColor) {
+            UIColor *color = tabBarSelectedLabelColor != (id)[NSNull null] ? [RCTConvert UIColor:
+                                                                              tabBarSelectedLabelColor] : nil;
+            selectedLabelColor = color;
+        }
+        NSString *tabBarBackgroundColor = tabsStyle[@"tabBarBackgroundColor"];
+        if (tabBarBackgroundColor) {
+            UIColor *color = tabBarBackgroundColor != (id)[NSNull null] ? [RCTConvert UIColor:tabBarBackgroundColor] : nil;
+            self.tabBar.barTintColor = color;
+        }
+        
+        NSString *tabBarTranslucent = tabsStyle[@"tabBarTranslucent"];
+        if (tabBarTranslucent) {
+            self.tabBar.translucent = [tabBarTranslucent boolValue] ? YES : NO;
+        }
+        
+        NSString *tabBarHideShadow = tabsStyle[@"tabBarHideShadow"];
+        if (tabBarHideShadow) {
+            self.tabBar.clipsToBounds = [tabBarHideShadow boolValue] ? YES : NO;
+        }
     }
     
-    viewController.tabBarItem = [[UITabBarItem alloc] initWithTitle:title image:iconImage tag:0];
-    viewController.tabBarItem.accessibilityIdentifier = tabItemLayout[@"props"][@"testID"];
-    viewController.tabBarItem.selectedImage = iconImageSelected;
+    NSMutableArray *viewControllers = [NSMutableArray array];
     
-    id imageInsets = tabItemLayout[@"props"][@"iconInsets"];
-    if (imageInsets && imageInsets != (id)[NSNull null])
-    {
-      id topInset = imageInsets[@"top"];
-      id leftInset = imageInsets[@"left"];
-      id bottomInset = imageInsets[@"bottom"];
-      id rightInset = imageInsets[@"right"];
-      
-      CGFloat top = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:topInset] : 0;
-      CGFloat left = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:leftInset] : 0;
-      CGFloat bottom = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:bottomInset] : 0;
-      CGFloat right = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:rightInset] : 0;
-      
-      viewController.tabBarItem.imageInsets = UIEdgeInsetsMake(top, left, bottom, right);
-    }
-    NSMutableDictionary *unselectedAttributes = [RCTHelpers textAttributesFromDictionary:tabsStyle withPrefix:@"tabBarText" baseFont:[UIFont systemFontOfSize:10]];
-    if (!unselectedAttributes[NSForegroundColorAttributeName] && labelColor) {
-      unselectedAttributes[NSForegroundColorAttributeName] = labelColor;
+    // go over all the tab bar items
+    for (NSDictionary *tabItemLayout in children) {
+        // make sure the layout is valid
+        if (![tabItemLayout[@"type"] isEqualToString:@"TabBarControllerIOS.Item"]) continue;
+        if (!tabItemLayout[@"props"]) continue;
+        
+        // get the view controller inside
+        if (!tabItemLayout[@"children"]) continue;
+        if (![tabItemLayout[@"children"] isKindOfClass:[NSArray class]]) continue;
+        if ([tabItemLayout[@"children"] count] < 1) continue;
+        NSDictionary *childLayout = tabItemLayout[@"children"][0];
+        UIViewController *viewController = [RCCViewController controllerWithLayout:childLayout globalProps:globalProps bridge:bridge];
+        if (!viewController) continue;
+        
+        // create the tab icon and title
+        NSString *title = tabItemLayout[@"props"][@"title"];
+        UIImage *iconImage = nil;
+        id icon = tabItemLayout[@"props"][@"icon"];
+        if (icon) {
+            iconImage = [RCTConvert UIImage:icon];
+            if (buttonColor) {
+                iconImage = [[self image:iconImage withColor:buttonColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+            }
+        }
+        UIImage *iconImageSelected = nil;
+        id selectedIcon = tabItemLayout[@"props"][@"selectedIcon"];
+        if (selectedIcon) {
+            iconImageSelected = [RCTConvert UIImage:selectedIcon];
+        } else {
+            iconImageSelected = [RCTConvert UIImage:icon];
+        }
+        
+        viewController.tabBarItem = [[UITabBarItem alloc] initWithTitle:title image:iconImage tag:0];
+        viewController.tabBarItem.accessibilityIdentifier = tabItemLayout[@"props"][@"testID"];
+        viewController.tabBarItem.selectedImage = iconImageSelected;
+        
+        id imageInsets = tabItemLayout[@"props"][@"iconInsets"];
+        if (imageInsets && imageInsets != (id)[NSNull null]) {
+            id topInset = imageInsets[@"top"];
+            id leftInset = imageInsets[@"left"];
+            id bottomInset = imageInsets[@"bottom"];
+            id rightInset = imageInsets[@"right"];
+            
+            CGFloat top = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:topInset] : 0;
+            CGFloat left = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:leftInset] : 0;
+            CGFloat bottom = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:bottomInset] : 0;
+            CGFloat right = topInset != (id)[NSNull null] ? [RCTConvert CGFloat:rightInset] : 0;
+            
+            viewController.tabBarItem.imageInsets = UIEdgeInsetsMake(top, left, bottom, right);
+        }
+        NSMutableDictionary *unselectedAttributes = [RCTHelpers textAttributesFromDictionary:tabsStyle withPrefix:@"tabBarText" baseFont:[UIFont systemFontOfSize:10]];
+        if (!unselectedAttributes[NSForegroundColorAttributeName] && labelColor) {
+            unselectedAttributes[NSForegroundColorAttributeName] = labelColor;
+        }
+        
+        [viewController.tabBarItem setTitleTextAttributes:unselectedAttributes forState:UIControlStateNormal];
+        
+        NSMutableDictionary *selectedAttributes = [RCTHelpers textAttributesFromDictionary:tabsStyle withPrefix:@"tabBarSelectedText" baseFont:[UIFont systemFontOfSize:10]];
+        if (!selectedAttributes[NSForegroundColorAttributeName] && selectedLabelColor) {
+            selectedAttributes[NSForegroundColorAttributeName] = selectedLabelColor;
+        }
+        
+        [viewController.tabBarItem setTitleTextAttributes:selectedAttributes forState:UIControlStateSelected];
+        // create badge
+        NSObject *badge = tabItemLayout[@"props"][@"badge"];
+        if (badge == nil || [badge isEqual:[NSNull null]]) {
+            viewController.tabBarItem.badgeValue = nil;
+        } else {
+            viewController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%@", badge];
+        }
+        
+        [viewControllers addObject:viewController];
     }
     
-    [viewController.tabBarItem setTitleTextAttributes:unselectedAttributes forState:UIControlStateNormal];
+    // replace the tabs
+    self.viewControllers = viewControllers;
     
-    NSMutableDictionary *selectedAttributes = [RCTHelpers textAttributesFromDictionary:tabsStyle withPrefix:@"tabBarSelectedText" baseFont:[UIFont systemFontOfSize:10]];
-    if (!selectedAttributes[NSForegroundColorAttributeName] && selectedLabelColor) {
-      selectedAttributes[NSForegroundColorAttributeName] = selectedLabelColor;
+    NSNumber *initialTab = tabsStyle[@"initialTabIndex"];
+    if (initialTab) {
+        NSInteger initialTabIndex = initialTab.integerValue;
+        [self setSelectedIndex:initialTabIndex];
     }
     
-    [viewController.tabBarItem setTitleTextAttributes:selectedAttributes forState:UIControlStateSelected];
-    // create badge
-    NSObject *badge = tabItemLayout[@"props"][@"badge"];
-    if (badge == nil || [badge isEqual:[NSNull null]])
-    {
-      viewController.tabBarItem.badgeValue = nil;
-    }
-    else
-    {
-      viewController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%@", badge];
-    }
+    [self setRotation:props];
     
-    [viewControllers addObject:viewController];
-  }
-  
-  // replace the tabs
-  self.viewControllers = viewControllers;
-
-  NSNumber *initialTab = tabsStyle[@"initialTabIndex"];
-  if (initialTab)
-  {
-    NSInteger initialTabIndex = initialTab.integerValue;
-    [self setSelectedIndex:initialTabIndex];
-  }
-  
-  [self setRotation:props];
-  
-  return self;
+    return self;
 }
 
-- (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge completion:(void (^)(void))completion
-{
-  if ([performAction isEqualToString:@"setBadge"])
-  {
-    UIViewController *viewController = nil;
-    NSNumber *tabIndex = actionParams[@"tabIndex"];
-    if (tabIndex)
-    {
-      int i = (int)[tabIndex integerValue];
-      
-      if ([self.viewControllers count] > i)
-      {
-        viewController = [self.viewControllers objectAtIndex:i];
-      }
-    }
-    NSString *contentId = actionParams[@"contentId"];
-    NSString *contentType = actionParams[@"contentType"];
-    if (contentId && contentType)
-    {
-      viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
+- (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge completion:(void (^)(void))completion {
+    if ([performAction isEqualToString:@"setBadge"]) {
+        UIViewController *viewController = nil;
+        NSNumber *tabIndex = actionParams[@"tabIndex"];
+        if (tabIndex) {
+            int i = (int)[tabIndex integerValue];
+            
+            if ([self.viewControllers count] > i) {
+                viewController = [self.viewControllers objectAtIndex:i];
+            }
+        }
+        NSString *contentId = actionParams[@"contentId"];
+        NSString *contentType = actionParams[@"contentType"];
+        if (contentId && contentType) {
+            viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
+        }
+        
+        if (viewController) {
+            NSObject *badge = actionParams[@"badge"];
+            
+            if (badge == nil || [badge isEqual:[NSNull null]]) {
+                viewController.tabBarItem.badgeValue = nil;
+            }
+            else
+            {
+                NSString *badgeColor = actionParams[@"badgeColor"];
+                UIColor *color = badgeColor != (id)[NSNull null] ? [RCTConvert UIColor:badgeColor] : nil;
+                
+                if ([viewController.tabBarItem respondsToSelector:@selector(badgeColor)]) {
+                    viewController.tabBarItem.badgeColor = color;
+                }
+                viewController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%@", badge];
+            }
+        }
     }
     
-    if (viewController)
-    {
-      NSObject *badge = actionParams[@"badge"];
-      
-      if (badge == nil || [badge isEqual:[NSNull null]])
-      {
-        viewController.tabBarItem.badgeValue = nil;
-      }
-      else
-      {
-        NSString *badgeColor = actionParams[@"badgeColor"];
-        UIColor *color = badgeColor != (id)[NSNull null] ? [RCTConvert UIColor:badgeColor] : nil;
+    if ([performAction isEqualToString:@"switchTo"]) {
+        UIViewController *viewController = nil;
+        NSNumber *tabIndex = actionParams[@"tabIndex"];
+        if (tabIndex) {
+            int i = (int)[tabIndex integerValue];
+            
+            if ([self.viewControllers count] > i) {
+                viewController = [self.viewControllers objectAtIndex:i];
+            }
+        }
+        NSString *contentId = actionParams[@"contentId"];
+        NSString *contentType = actionParams[@"contentType"];
+        if (contentId && contentType) {
+            viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
+        }
         
-        if ([viewController.tabBarItem respondsToSelector:@selector(badgeColor)]) {
-          viewController.tabBarItem.badgeColor = color;
+        if (viewController) {
+            [self setSelectedViewController:viewController];
         }
-        viewController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%@", badge];
-      }
-    }
-  }
-  
-  if ([performAction isEqualToString:@"switchTo"])
-  {
-    UIViewController *viewController = nil;
-    NSNumber *tabIndex = actionParams[@"tabIndex"];
-    if (tabIndex)
-    {
-      int i = (int)[tabIndex integerValue];
-      
-      if ([self.viewControllers count] > i)
-      {
-        viewController = [self.viewControllers objectAtIndex:i];
-      }
-    }
-    NSString *contentId = actionParams[@"contentId"];
-    NSString *contentType = actionParams[@"contentType"];
-    if (contentId && contentType)
-    {
-      viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
     }
     
-    if (viewController)
-    {
-      [self setSelectedViewController:viewController];
-    }
-  }
-  
-  if ([performAction isEqualToString:@"setTabButton"])
-  {
-    UIViewController *viewController = nil;
-    NSNumber *tabIndex = actionParams[@"tabIndex"];
-    if (tabIndex)
-    {
-      int i = (int)[tabIndex integerValue];
-      
-      if ([self.viewControllers count] > i)
-      {
-        viewController = [self.viewControllers objectAtIndex:i];
-      }
-    }
-    NSString *contentId = actionParams[@"contentId"];
-    NSString *contentType = actionParams[@"contentType"];
-    if (contentId && contentType)
-    {
-      viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
+    if ([performAction isEqualToString:@"setTabButton"]) {
+        UIViewController *viewController = nil;
+        NSNumber *tabIndex = actionParams[@"tabIndex"];
+        if (tabIndex) {
+            int i = (int)[tabIndex integerValue];
+            
+            if ([self.viewControllers count] > i) {
+                viewController = [self.viewControllers objectAtIndex:i];
+            }
+        }
+        NSString *contentId = actionParams[@"contentId"];
+        NSString *contentType = actionParams[@"contentType"];
+        if (contentId && contentType) {
+            viewController = [[RCCManager sharedInstance] getControllerWithId:contentId componentType:contentType];
+        }
+        
+        if (viewController) {
+            UIImage *iconImage = nil;
+            id icon = actionParams[@"icon"];
+            if (icon && icon != (id)[NSNull null]) {
+                iconImage = [RCTConvert UIImage:icon];
+                iconImage = [[self image:iconImage withColor:self.tabBar.tintColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+                viewController.tabBarItem.image = iconImage;
+            }
+            
+            UIImage *iconImageSelected = nil;
+            id selectedIcon = actionParams[@"selectedIcon"];
+            if (selectedIcon && selectedIcon != (id)[NSNull null]) {
+                iconImageSelected = [RCTConvert UIImage:selectedIcon];
+                viewController.tabBarItem.selectedImage = iconImageSelected;
+            }
+            
+            id label = actionParams[@"label"];
+            if (label && label != (id)[NSNull null]) {
+                viewController.tabBarItem.title = label;
+            }
+        }
     }
     
-    if (viewController)
-    {
-      UIImage *iconImage = nil;
-      id icon = actionParams[@"icon"];
-      if (icon && icon != (id)[NSNull null])
-      {
-        iconImage = [RCTConvert UIImage:icon];
-        iconImage = [[self image:iconImage withColor:self.tabBar.tintColor] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-        viewController.tabBarItem.image = iconImage;
-      }
-      
-      UIImage *iconImageSelected = nil;
-      id selectedIcon = actionParams[@"selectedIcon"];
-      if (selectedIcon && selectedIcon != (id)[NSNull null])
-      {
-        iconImageSelected = [RCTConvert UIImage:selectedIcon];
-        viewController.tabBarItem.selectedImage = iconImageSelected;
-      }
-      
-      id label = actionParams[@"label"];
-      if (label && label != (id)[NSNull null])
-      {
-        viewController.tabBarItem.title = label;
-      }
+    if ([performAction isEqualToString:@"setTabBarHidden"]) {
+        BOOL hidden = [actionParams[@"hidden"] boolValue];
+        self.tabBarHidden = hidden;
+        
+        CGRect nextFrame = self.tabBar.frame;
+        nextFrame.origin.y = UIScreen.mainScreen.bounds.size.height - (hidden ? 0 : self.tabBar.frame.size.height);
+        
+        [UIView animateWithDuration: ([actionParams[@"animated"] boolValue] ? 0.45 : 0)
+                              delay: 0
+             usingSpringWithDamping: 0.75
+              initialSpringVelocity: 0
+                            options: (hidden ? UIViewAnimationOptionCurveEaseIn : UIViewAnimationOptionCurveEaseOut)
+                         animations:^()
+         {
+             [self.tabBar setFrame:nextFrame];
+         }
+                         completion:^(BOOL finished)
+         {
+             if (completion != nil) {
+                 completion();
+             }
+         }];
+        return;
+    } else if (completion != nil) {
+        completion();
     }
-  }
-  
-  if ([performAction isEqualToString:@"setTabBarHidden"])
-  {
-    BOOL hidden = [actionParams[@"hidden"] boolValue];
-    self.tabBarHidden = hidden;
-    
-    CGRect nextFrame = self.tabBar.frame;
-    nextFrame.origin.y = UIScreen.mainScreen.bounds.size.height - (hidden ? 0 : self.tabBar.frame.size.height);
-    
-    [UIView animateWithDuration: ([actionParams[@"animated"] boolValue] ? 0.45 : 0)
-                          delay: 0
-         usingSpringWithDamping: 0.75
-          initialSpringVelocity: 0
-                        options: (hidden ? UIViewAnimationOptionCurveEaseIn : UIViewAnimationOptionCurveEaseOut)
-                     animations:^()
-     {
-         [self.tabBar setFrame:nextFrame];
-     }
-                     completion:^(BOOL finished)
-     {
-       if (completion != nil)
-       {
-         completion();
-       }
-     }];
-    return;
-  }
-  else if (completion != nil)
-  {
-    completion();
-  }
 }
 
 +(void)sendScreenTabChangedEvent:(UIViewController*)viewController body:(NSDictionary*)body{
-  [RCCTabBarController sendTabEvent:@"bottomTabSelected" controller:viewController body:body];
+    [RCCTabBarController sendTabEvent:@"bottomTabSelected" controller:viewController body:body];
 }
 
 +(void)sendScreenTabPressedEvent:(UIViewController*)viewController body:(NSDictionary*)body{
-  [RCCTabBarController sendTabEvent:@"bottomTabReselected" controller:viewController body:body];
+    [RCCTabBarController sendTabEvent:@"bottomTabReselected" controller:viewController body:body];
 }
 
 +(void)sendTabEvent:(NSString *)event controller:(UIViewController*)viewController body:(NSDictionary*)body{
-  if ([viewController.view isKindOfClass:[RCTRootView class]]){
-    RCTRootView *rootView = (RCTRootView *)viewController.view;
+    if ([viewController.view isKindOfClass:[RCTRootView class]]){
+        RCTRootView *rootView = (RCTRootView *)viewController.view;
+        
+        if (rootView.appProperties && rootView.appProperties[@"navigatorEventID"]) {
+            NSString *navigatorID = rootView.appProperties[@"navigatorID"];
+            NSString *screenInstanceID = rootView.appProperties[@"screenInstanceID"];
+            
+            
+            NSMutableDictionary *screenDict = [NSMutableDictionary dictionaryWithDictionary:@
+                                               {
+                                                   @"id": event,
+                                                   @"navigatorID": navigatorID,
+                                                   @"screenInstanceID": screenInstanceID
+                                               }];
+            
+            
+            if (body) {
+                [screenDict addEntriesFromDictionary:body];
+            }
+            
+            [[[RCCManager sharedInstance] getBridge].eventDispatcher sendAppEventWithName:rootView.appProperties[@"navigatorEventID"] body:screenDict];
+        }
+    }
     
-    if (rootView.appProperties && rootView.appProperties[@"navigatorEventID"]) {
-      NSString *navigatorID = rootView.appProperties[@"navigatorID"];
-      NSString *screenInstanceID = rootView.appProperties[@"screenInstanceID"];
-      
-      
-      NSMutableDictionary *screenDict = [NSMutableDictionary dictionaryWithDictionary:@
-                                         {
-                                           @"id": event,
-                                           @"navigatorID": navigatorID,
-                                           @"screenInstanceID": screenInstanceID
-                                         }];
-      
-      
-      if (body) {
-        [screenDict addEntriesFromDictionary:body];
-      }
-      
-      [[[RCCManager sharedInstance] getBridge].eventDispatcher sendAppEventWithName:rootView.appProperties[@"navigatorEventID"] body:screenDict];
+    if ([viewController isKindOfClass:[UINavigationController class]]) {
+        UINavigationController *navigationController = (UINavigationController*)viewController;
+        UIViewController *topViewController = [navigationController topViewController];
+        [RCCTabBarController sendTabEvent:event controller:topViewController body:body];
     }
-  }
-  
-  if ([viewController isKindOfClass:[UINavigationController class]]) {
-    UINavigationController *navigationController = (UINavigationController*)viewController;
-    UIViewController *topViewController = [navigationController topViewController];
-    [RCCTabBarController sendTabEvent:event controller:topViewController body:body];
-  }
 }
 
 

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -68,13 +68,13 @@
 		390AD485200F566100A8250D /* RNNSwizzles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSwizzles.h; sourceTree = "<group>"; };
 		390AD486200F566100A8250D /* RNNSwizzles.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSwizzles.m; sourceTree = "<group>"; };
 		CC84A1931C1A0C4E00B3A6A2 /* RCCManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManager.h; sourceTree = "<group>"; };
-		CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCCManager.m; sourceTree = "<group>"; tabWidth = 2; };
+		CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = RCCManager.m; sourceTree = "<group>"; tabWidth = 4; };
 		CC84A1951C1A0C4E00B3A6A2 /* RCCManagerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManagerModule.h; sourceTree = "<group>"; };
 		CC84A1961C1A0C4E00B3A6A2 /* RCCManagerModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCCManagerModule.m; sourceTree = "<group>"; };
 		CC84A1971C1A0C4E00B3A6A2 /* RCCNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCNavigationController.h; sourceTree = "<group>"; };
-		CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCCNavigationController.m; sourceTree = "<group>"; tabWidth = 2; };
+		CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = RCCNavigationController.m; sourceTree = "<group>"; tabWidth = 4; };
 		CC84A1991C1A0C4E00B3A6A2 /* RCCTabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCTabBarController.h; sourceTree = "<group>"; };
-		CC84A19A1C1A0C4E00B3A6A2 /* RCCTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCCTabBarController.m; sourceTree = "<group>"; tabWidth = 2; };
+		CC84A19A1C1A0C4E00B3A6A2 /* RCCTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = RCCTabBarController.m; sourceTree = "<group>"; tabWidth = 4; };
 		CC84A19B1C1A0C4E00B3A6A2 /* RCCViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCViewController.h; sourceTree = "<group>"; };
 		CC84A19C1C1A0C4E00B3A6A2 /* RCCViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = RCCViewController.m; sourceTree = "<group>"; tabWidth = 4; };
 		D800E8171CFED1DB004A187F /* RCCExternalViewControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCExternalViewControllerProtocol.h; sourceTree = "<group>"; };