[IOS] Refactors to allow pass a JSON from JS methods

Author: mfdeveloper

src/ios/CDVNativeView.m

@@ -52,23 +52,30 @@ - (void)show:(CDVInvokedUrlCommand*)command {
 
         NSString *viewControllerName;
         NSString *storyboardName;
+        NSString *uri;
         NSString *message;
+        NSString *firstParam;
 
         NSMutableDictionary* config = [command.arguments objectAtIndex:0];
+        
         if ([config isKindOfClass:[NSMutableDictionary class]]) {
+            
             viewControllerName = [config objectForKey:@"viewControllerName"];
             storyboardName = [config objectForKey:@"storyboardName"];
+            uri = [config objectForKey:@"uri"];
+            
         } else if ([config isKindOfClass:[NSString class]]) {
+            
             if ([command.arguments count] == 1) {
 
-                NSString *firstParam = [command argumentAtIndex: 0];
+                firstParam = [command argumentAtIndex: 0];
 
                 if ([self isValidURI: firstParam]) {
                     // Open app with valid uri name
                     [self openAPP:firstParam withCommand: command];
 
                 } else if ([firstParam containsString:@"Storyboard"]) {
-                    // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
+                    // Init viewController from Storyboard with initial view Controller or user defined viewControllerName
                     [self instantiateViewController:nil fromStoryboard:firstParam];
 
                 } else if ([firstParam containsString:@"Controller"]) {
@@ -81,65 +88,42 @@ - (void)show:(CDVInvokedUrlCommand*)command {
                 }
 
                 pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+                return;
 
-            } else if ([command.arguments count] == 2) {
+            }else if ([command.arguments count] == 2) {
 
                 // first param is Storyboard
                 storyboardName = [command argumentAtIndex: 0];
 
                 // second param is ViewController and/or storyboardId
                 viewControllerName = [command argumentAtIndex: 1];
 
-                // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
-                [self instantiateViewController:viewControllerName fromStoryboard:storyboardName];
-                
-            } else {
+            }else{
                 message = [[NSString alloc] initWithFormat:@"An UIViewController name or Storyboard name or URI valid name is required at least. Please, pass in the first param in JS, like this: 'NativeView.show('MyViewController') or NativeView.show('MyStoryboard') or NativeView.show('MyStoryboard', 'MyViewController') or NativeView.show('instagram://')"];
                 @throw [[NSException alloc] initWithName:@"CLASS_NOT_FOUND_EXCEPTION" reason:message userInfo:nil];
             }
+            
+            // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
+            [self instantiateViewController:viewControllerName fromStoryboard:storyboardName];
+            
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+
         }else{
             @throw [[NSException alloc] initWithName:@"PARAMS_TYPE_EXCEPTION" reason:@"The params of show() method needs be a string or a json" userInfo:nil];
         }
 
-        // Handling arguments
-//        if ([command.arguments count] == 1) {
-//
-//            NSString *firstParam = [command argumentAtIndex: 0];
-//
-//            if ([self isValidURI: firstParam]) {
-//                // Open app with valid uri name
-//                [self openAPP:firstParam];
-//
-//            } else if ([firstParam containsString:@"Storyboard"]) {
-//                // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
-//                [self instantiateViewController:nil fromStoryboard:firstParam];
-//
-//            } else if ([firstParam containsString:@"Controller"]) {
-//                // Init viewController with or without xib
-//                [self instantiateViewController:firstParam];
-//
-//            } else {
-//                message = [[NSString alloc] initWithFormat:@"%@ invalid. Must contain a Storyboard / Controller / URI valid in name", firstParam];
-//                @throw [[NSException alloc] initWithName:@"IO_EXCEPTION" reason:message userInfo:nil];
-//            }
-//
-//            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-//
-//        } else if ([command.arguments count] == 2) {
-//
-//            // first param is Storyboard
-//            storyboardName = [command argumentAtIndex: 0];
-//
-//            // second param is ViewController and/or storyboardId
-//            viewControllerName = [command argumentAtIndex: 1];
-//
-//            // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
-//            [self instantiateViewController:viewControllerName fromStoryboard:storyboardName];
-//
-//        } else {
-//            message = [[NSString alloc] initWithFormat:@"An UIViewController name or Storyboard name or URI valid name is required at least. Please, pass in the first param in JS, like this: 'NativeView.show('MyViewController') or NativeView.show('MyStoryboard') or NativeView.show('MyStoryboard', 'MyViewController') or NativeView.show('instagram://')"];
-//            @throw [[NSException alloc] initWithName:@"CLASS_NOT_FOUND_EXCEPTION" reason:message userInfo:nil];
-//        }
+        if ([self isValidURI: uri]) {
+            // Open app with valid uri name
+            [self openAPP:uri withCommand: command];
+            
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        } else if (viewControllerName != nil || storyboardName != nil) {
+            // Init viewController from Storyboard with initial view Controlleror or user defined viewControllerName
+            [self instantiateViewController:viewControllerName fromStoryboard:storyboardName];
+            
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        }
+        
     } @catch (NSException *e) {
         NSLog(@"[%@]: %@", e.name, e.reason);
 
@@ -173,7 +157,6 @@ - (void)showMarket:(CDVInvokedUrlCommand*)command {
             NSString *url = [NSString stringWithFormat:@"itms://itunes.apple.com/app/%@", appId];
 
             [self openAPP:url withCommand: command];
-//            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
 
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
         } else {