From 22b467c5a1ae952e3950236f80a6ded68679d30c Mon Sep 17 00:00:00 2001 From: Filipp Date: Tue, 22 Dec 2015 13:36:33 +0300 Subject: [PATCH 1/3] modified version --- JBWebViewController/JBWebViewController.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/JBWebViewController/JBWebViewController.h b/JBWebViewController/JBWebViewController.h index e495eab..1d19cb2 100644 --- a/JBWebViewController/JBWebViewController.h +++ b/JBWebViewController/JBWebViewController.h @@ -11,10 +11,10 @@ #import // Required third-party libraries -#import -#import -#import -#import +#import "ARChromeActivity/ARChromeActivity.h" +#import "ARSafariActivity/ARSafariActivity.h" +#import "NJKWebViewProgress/NJKWebViewProgress.h" +#import "NJKWebViewProgress/NJKWebViewProgressView.h" @interface JBWebViewController : UIViewController From e8f2dc22d1a6b3dfcf26e22e7e3f20c35a0d36d5 Mon Sep 17 00:00:00 2001 From: Filipp Date: Tue, 22 Dec 2015 13:37:19 +0300 Subject: [PATCH 2/3] bump pod version --- JBWebViewController.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JBWebViewController.podspec b/JBWebViewController.podspec index bef2205..e54413b 100644 --- a/JBWebViewController.podspec +++ b/JBWebViewController.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "JBWebViewController" - s.version = "1.0.8" + s.version = "1.0.9" s.summary = "A modal view controller for showing websites - inspired by the Facebook app" s.description = <<-DESC A drop-in Facebook inspired modal web browser. From 0464d35fa0633f46886c0aad04fa638c68a949da Mon Sep 17 00:00:00 2001 From: Filipp Date: Thu, 21 Jan 2016 10:27:46 +0300 Subject: [PATCH 3/3] fixing images lost while integrating using use_frameworks option --- JBWebViewController/JBWebViewController.h | 8 ++--- JBWebViewController/JBWebViewController.m | 36 +++++++++++++++++++---- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/JBWebViewController/JBWebViewController.h b/JBWebViewController/JBWebViewController.h index 1d19cb2..e495eab 100644 --- a/JBWebViewController/JBWebViewController.h +++ b/JBWebViewController/JBWebViewController.h @@ -11,10 +11,10 @@ #import // Required third-party libraries -#import "ARChromeActivity/ARChromeActivity.h" -#import "ARSafariActivity/ARSafariActivity.h" -#import "NJKWebViewProgress/NJKWebViewProgress.h" -#import "NJKWebViewProgress/NJKWebViewProgressView.h" +#import +#import +#import +#import @interface JBWebViewController : UIViewController diff --git a/JBWebViewController/JBWebViewController.m b/JBWebViewController/JBWebViewController.m index c536021..0e435ab 100644 --- a/JBWebViewController/JBWebViewController.m +++ b/JBWebViewController/JBWebViewController.m @@ -123,9 +123,21 @@ - (void)setup { self.navigationItem.titleView = _titleView; // Inset right buttons - UIBarButtonItem *shareButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Share"] style:UIBarButtonItemStylePlain target:self action:@selector(share)]; - UIBarButtonItem *dismissButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Dismiss"] style:UIBarButtonItemStylePlain target:self action:@selector(dismiss)]; - [self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects:dismissButton, shareButton, nil]]; + UIImage *shareImage = [UIImage imageNamed:@"Share" + inBundle:[NSBundle bundleForClass:[JBWebViewController class]] + compatibleWithTraitCollection:nil]; + UIBarButtonItem *shareButton = [[UIBarButtonItem alloc] initWithImage:shareImage + style:UIBarButtonItemStylePlain + target:self + action:@selector(share)]; + UIImage *dismissImage = [UIImage imageNamed:@"Dismiss" + inBundle:[NSBundle bundleForClass:[JBWebViewController class]] + compatibleWithTraitCollection:nil]; + UIBarButtonItem *dismissButton = [[UIBarButtonItem alloc] initWithImage:dismissImage + style:UIBarButtonItemStylePlain + target:self + action:@selector(dismiss)]; + [self.navigationItem setRightBarButtonItems:@[dismissButton, shareButton]]; // Add a webview _webView = [[UIWebView alloc] initWithFrame:self.view.frame]; @@ -273,11 +285,23 @@ - (void)adjustNavigationbar { - (void)addNavigationButtonsButtons { // Creating buttons - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Back"] style:UIBarButtonItemStylePlain target:self action:@selector(navigateBack)]; - UIBarButtonItem *forwardButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Forward"] style:UIBarButtonItemStylePlain target:self action:@selector(navigateForward)]; + UIImage *backImage = [UIImage imageNamed:@"Back" + inBundle:[NSBundle bundleForClass:[JBWebViewController class]] + compatibleWithTraitCollection:nil]; + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithImage:backImage + style:UIBarButtonItemStylePlain + target:self + action:@selector(navigateBack)]; + UIImage *forwardImage = [UIImage imageNamed:@"Forward" + inBundle:[NSBundle bundleForClass:[JBWebViewController class]] + compatibleWithTraitCollection:nil]; + UIBarButtonItem *forwardButton = [[UIBarButtonItem alloc] initWithImage:forwardImage + style:UIBarButtonItemStylePlain + target:self + action:@selector(navigateForward)]; // Adding buttons to NavigationBar - [self.navigationItem setLeftBarButtonItems:[NSArray arrayWithObjects:backButton, forwardButton, nil]]; + [self.navigationItem setLeftBarButtonItems:@[backButton, forwardButton]]; // Remember that we have extra buttons now _hasExtraButtons = YES;