Adresses #1078 - static events

lib/ios/RNNCommandsHandler.m

@@ -56,6 +56,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
+	[_eventEmitter sendOnNavigationCommandCompletion:setRoot params:@{@"layout": layout}];
 	completion();
 }
 
@@ -128,6 +129,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	} else {
 		[_eventEmitter sendOnNavigationCommand:push params:@{@"componentId": componentId}];
 		[_navigationStackManager push:newVc onTop:componentId completion:^{
+			[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 			completion();
 		} rejection:rejection];
 	}
@@ -138,7 +140,9 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:setStackRoot params:@{@"componentId": componentId}];
 	
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
 	[_navigationStackManager setStackRoot:newVc fromComponent:componentId completion:^{
+		[weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
 }
@@ -148,6 +152,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:pop params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
 	}];
 	
@@ -167,6 +172,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:popTo params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
 		completion();
 	}];
 	
@@ -180,6 +186,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:popToRoot params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:popToRoot params:@{@"componentId": componentId}];
 		completion();
 	}];
 	
@@ -193,6 +200,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:showModal params:@{@"layout": layout}];
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_modalManager showModal:newVc completion:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 		completion();
 	}];
 }
@@ -202,6 +210,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:dismissModal params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
 		completion();
 	}];
 	
@@ -215,6 +224,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:dismissAllModals params:@{}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissAllModals params:@{}];
 		completion();
 	}];
 	
@@ -228,6 +238,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_eventEmitter sendOnNavigationCommand:showOverlay params:@{@"layout": layout}];
 	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
 	[_overlayManager showOverlay:overlayVC completion:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
 		completion();
 	}];
 }
@@ -236,6 +247,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	[_eventEmitter sendOnNavigationCommand:dismissModal params:@{@"componentId": componentId}];
 	[_overlayManager dismissOverlay:componentId completion:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
 		completion();
 	}];
 }

lib/ios/RNNEventEmitter.h

@@ -18,6 +18,8 @@
 
 -(void)sendOnNavigationCommand:(NSString *)commandName params:(NSDictionary*)params;
 
+-(void)sendOnNavigationCommandCompletion:(NSString *)commandName params:(NSDictionary*)params;
+
 -(void)sendOnSearchBarUpdated:(NSString *)componentId text:(NSString*)text isFocused:(BOOL)isFocused;
 
 @end

lib/ios/RNNEventEmitter.m

@@ -1,4 +1,5 @@
 #import "RNNEventEmitter.h"
+#import "RNNUtils.h"
 
 @implementation RNNEventEmitter {
   NSInteger _appLaunchedListenerCount;
@@ -43,6 +44,12 @@ static NSString* const navigationEvent	= @"RNN.nativeEvent";
 	[self send:navigationEvent body:@{@"name":commandName , @"params": params}];
 }
 
+-(void)sendOnNavigationCommandCompletion:(NSString *)commandName params:(NSDictionary*)params {
+	NSMutableDictionary* mutableParams = [NSMutableDictionary dictionaryWithDictionary:params];
+	[mutableParams setObject:[RNNUtils getCurrentTimestamp] forKey:@"timestamp"];
+	[self send:commandComplete body:@{@"name":commandName , @"params": mutableParams}];
+}
+
 -(void)sendOnNavigationEvent:(NSString *)commandName params:(NSDictionary*)params {
 	[self send:navigationEvent body:@{@"name":commandName , @"params": params}];
 }

lib/ios/RNNTabBarController.m

@@ -64,11 +64,7 @@
 #pragma mark UITabBarControllerDelegate
 
 - (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {
-	if (tabBarController.selectedIndex == _currentTabIndex) {
-		[_eventEmitter sendOnNavigationEvent:@"bottomTabReselected" params:@{@"index": @(tabBarController.selectedIndex)}];
-	} else {
-		[_eventEmitter sendOnNavigationEvent:@"bottomTabSelected" params:@{@"index": @(tabBarController.selectedIndex)}];
-	}
+	[_eventEmitter sendOnNavigationEvent:@"bottomTabSelected" params:@{@"selectedTabIndex": @(tabBarController.selectedIndex), @"unselectedTabIndex": @(_currentTabIndex)}];
 	
 	_currentTabIndex = tabBarController.selectedIndex;
 }

lib/ios/RNNUtils.h

@@ -5,4 +5,6 @@
 +(double)getDoubleOrKey:(NSDictionary*)dict withKey:(NSString*)key withDefault:(double)defaultResult;
 +(BOOL)getBoolOrKey:(NSDictionary*)dict withKey:(NSString*)key withDefault:(BOOL)defaultResult;
 +(id)getObjectOrKey:(NSDictionary*)dict withKey:(NSString*)key withDefault:(id)defaultResult;
++(NSNumber*)getCurrentTimestamp;
+
 @end

lib/ios/RNNUtils.m

@@ -25,4 +25,8 @@
 	}
 }
 
++ (NSNumber *)getCurrentTimestamp {
+	return [NSNumber numberWithLong:[[NSDate date] timeIntervalSince1970] * 1000];
+}
+
 @end