CB-12320: (iOS) Add support for navigation bar

Author: spongessuck

src/ios/CDVInAppBrowser.h

@@ -48,6 +48,9 @@
 
 @property (nonatomic, assign) BOOL location;
 @property (nonatomic, assign) BOOL toolbar;
+@property (nonatomic, assign) BOOL navigationbar;
+@property (nonatomic, assign) BOOL navigationbuttons;
+@property (nonatomic, copy) NSString* navigationbartitle;
 @property (nonatomic, copy) NSString* closebuttoncaption;
 @property (nonatomic, copy) NSString* toolbarposition;
 @property (nonatomic, assign) BOOL clearcache;
@@ -74,13 +77,13 @@
     NSString* _prevUserAgent;
     NSInteger _userAgentLockToken;
     CDVInAppBrowserOptions *_browserOptions;
-    
+
 #ifdef __CORDOVA_4_0_0
     CDVUIWebViewDelegate* _webViewDelegate;
 #else
     CDVWebViewDelegate* _webViewDelegate;
 #endif
-    
+
 }
 
 @property (nonatomic, strong) IBOutlet UIWebView* webView;

src/ios/CDVInAppBrowser.m

@@ -70,11 +70,11 @@ - (void)close:(CDVInvokedUrlCommand*)command
 
 - (BOOL) isSystemUrl:(NSURL*)url
 {
-	if ([[url host] isEqualToString:@"itunes.apple.com"]) {
-		return YES;
-	}
+    if ([[url host] isEqualToString:@"itunes.apple.com"]) {
+        return YES;
+    }
 
-	return NO;
+    return NO;
 }
 
 - (void)open:(CDVInvokedUrlCommand*)command
@@ -161,7 +161,7 @@ - (void)openInInAppBrowser:(NSURL*)url withOptions:(NSString*)options
     }
 
     [self.inAppBrowserViewController showLocationBar:browserOptions.location];
-    [self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarposition];
+    [self.inAppBrowserViewController showToolBar:browserOptions.navigationbar ? NO : browserOptions.toolbar :browserOptions.toolbarposition];
     if (browserOptions.closebuttoncaption != nil) {
         [self.inAppBrowserViewController setCloseButtonTitle:browserOptions.closebuttoncaption];
     }
@@ -230,9 +230,6 @@ - (void)show:(CDVInvokedUrlCommand*)command
 
     __block CDVInAppBrowserNavigationController* nav = [[CDVInAppBrowserNavigationController alloc]
                                    initWithRootViewController:self.inAppBrowserViewController];
-    nav.orientationDelegate = self.inAppBrowserViewController;
-    nav.navigationBarHidden = YES;
-    nav.modalPresentationStyle = self.inAppBrowserViewController.modalPresentationStyle;
 
     __weak CDVInAppBrowser* weakSelf = self;
 
@@ -591,7 +588,7 @@ - (void)createViews
     self.toolbar.alpha = 1.000;
     self.toolbar.autoresizesSubviews = YES;
     self.toolbar.autoresizingMask = toolbarIsAtBottom ? (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin) : UIViewAutoresizingFlexibleWidth;
-    self.toolbar.barStyle = UIBarStyleBlackOpaque;
+        self.toolbar.barStyle = UIBarStyleBlackOpaque;
     self.toolbar.clearsContextBeforeDrawing = NO;
     self.toolbar.clipsToBounds = NO;
     self.toolbar.contentMode = UIViewContentModeScaleToFill;
@@ -642,7 +639,14 @@ - (void)createViews
     self.backButton.enabled = YES;
     self.backButton.imageInsets = UIEdgeInsetsZero;
 
-    [self.toolbar setItems:@[self.closeButton, flexibleSpaceButton, self.backButton, fixedSpaceButton, self.forwardButton]];
+    if(_browserOptions.navigationbar) {
+        self.navigationItem.leftBarButtonItem = self.closeButton;
+        if(_browserOptions.navigationbuttons)
+            self.navigationItem.rightBarButtonItems = @[self.backButton, fixedSpaceButton, self.forwardButton];
+        if(_browserOptions.navigationbartitle)
+            self.navigationItem.title = _browserOptions.navigationbartitle;
+    } else
+        [self.toolbar setItems:@[self.closeButton, flexibleSpaceButton, self.backButton, fixedSpaceButton, self.forwardButton]];
 
     self.view.backgroundColor = [UIColor grayColor];
     [self.view addSubview:self.toolbar];
@@ -664,9 +668,13 @@ - (void)setCloseButtonTitle:(NSString*)title
     self.closeButton.enabled = YES;
     self.closeButton.tintColor = [UIColor colorWithRed:60.0 / 255.0 green:136.0 / 255.0 blue:230.0 / 255.0 alpha:1];
 
-    NSMutableArray* items = [self.toolbar.items mutableCopy];
-    [items replaceObjectAtIndex:0 withObject:self.closeButton];
-    [self.toolbar setItems:items];
+    if(_browserOptions.navigationbar) {
+        self.navigationItem.leftBarButtonItem = self.closeButton;
+    } else {
+        NSMutableArray* items = [self.toolbar.items mutableCopy];
+        [items replaceObjectAtIndex:0 withObject:self.closeButton];
+        [self.toolbar setItems:items];
+    }
 }
 
 - (void)showLocationBar:(BOOL)show
@@ -985,6 +993,7 @@ - (id)init
         self.toolbar = YES;
         self.closebuttoncaption = nil;
         self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
+        self.navigationbar = NO;
         self.clearcache = NO;
         self.clearsessioncache = NO;
 
@@ -1041,6 +1050,19 @@ + (CDVInAppBrowserOptions*)parseOptions:(NSString*)options
 
 @implementation CDVInAppBrowserNavigationController : UINavigationController
 
+-(instancetype)initWithRootViewController:(UIViewController *)rootViewController {
+    if(self = [super initWithRootViewController:rootViewController]) {
+        if([rootViewController isMemberOfClass:[CDVInAppBrowserViewController class]]) {
+            CDVInAppBrowserViewController* browserVC = (CDVInAppBrowserViewController*)rootViewController;
+            self.orientationDelegate = browserVC;
+            self.navigationBarHidden = !browserVC.navigationItem.leftBarButtonItem;
+            self.modalPresentationStyle = browserVC.modalPresentationStyle;
+        }
+    }
+
+    return self;
+}
+
 - (void) dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
     if ( self.presentedViewController) {
         [super dismissViewControllerAnimated:flag completion:completion];
@@ -1053,10 +1075,12 @@ - (void) viewDidLoad {
     statusBarFrame.size.height = STATUSBAR_HEIGHT;
     // simplified from: http://stackoverflow.com/a/25669695/219684
 
-    UIToolbar* bgToolbar = [[UIToolbar alloc] initWithFrame:statusBarFrame];
-    bgToolbar.barStyle = UIBarStyleDefault;
-    [bgToolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
-    [self.view addSubview:bgToolbar];
+    if(self.navigationBarHidden) {
+        UIToolbar* bgToolbar = [[UIToolbar alloc] initWithFrame:statusBarFrame];
+        bgToolbar.barStyle = UIBarStyleDefault;
+        [bgToolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
+        [self.view addSubview:bgToolbar];
+    }
 
     [super viewDidLoad];
 }