From ac939398a73f59ff8075067677c12008b0140357 Mon Sep 17 00:00:00 2001 From: pyro2927 Date: Sat, 18 Jan 2014 11:37:57 -0600 Subject: [PATCH 1/5] Updating for iOS7 --- TSMiniWebBrowser/TSMiniWebBrowser.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index 0c8a9f5..bff5b0a 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -180,13 +180,16 @@ -(void) initWebView { if (mode == TSMiniWebBrowserModeModal) { webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, kToolBarHeight, viewSize.width, viewSize.height-kToolBarHeight*2)]; } else if(mode == TSMiniWebBrowserModeNavigation) { - webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, viewSize.width, viewSize.height-kToolBarHeight)]; + webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, viewSize.width, viewSize.height)]; + [[webView scrollView] setContentInset:UIEdgeInsetsMake(64, 0, 44, 0)]; + [[webView scrollView] setScrollIndicatorInsets:UIEdgeInsetsMake(64, 0, 44, 0)]; } else if(mode == TSMiniWebBrowserModeTabBar) { self.view.backgroundColor = [UIColor redColor]; webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, kToolBarHeight-1, viewSize.width, viewSize.height-kToolBarHeight+1)]; } webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [self.view addSubview:webView]; + [self.view bringSubviewToFront:toolBar]; webView.scalesPageToFit = YES; @@ -215,6 +218,7 @@ - (id)initWithUrl:(NSURL*)url { forcedTitleBarText = nil; barStyle = UIBarStyleDefault; barTintColor = nil; + self.automaticallyAdjustsScrollViewInsets = NO; } return self; From 4b79572e22f55964c1fa9de9daa3893536aaad3d Mon Sep 17 00:00:00 2001 From: pyro2927 Date: Sat, 18 Jan 2014 11:42:17 -0600 Subject: [PATCH 2/5] Addin in Podspec --- TSMiniWebBrowser.podspec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 TSMiniWebBrowser.podspec diff --git a/TSMiniWebBrowser.podspec b/TSMiniWebBrowser.podspec new file mode 100644 index 0000000..222e08f --- /dev/null +++ b/TSMiniWebBrowser.podspec @@ -0,0 +1,14 @@ +Pod::Spec.new do |s| + s.name = 'TSMiniWebBrowser' + s.version = '1.0.1' + s.platform = :ios + s.license = 'MIT' + s.summary = 'An in-app web browser control for iOS apps.' + s.homepage = 'https://github.com/pyro2927/TSMiniWebBrowser' + s.author = { 'Toni Sala' => 'tonisalae@gmail.com' } + s.source = { :git => 'https://github.com/pyro2927/TSMiniWebBrowser.git', :branch => "master" } + s.source_files = 'TSMiniWebBrowser/*.{h,m}' + s.framework = 'QuartzCore' + s.requires_arc = true + s.resources = 'TSMiniWebBrowser/images/*.png', 'TSMiniWebBrowser/*.xib' +end From 42c31db77f1efc8ffaa3a8a0f36ade0ec2106e52 Mon Sep 17 00:00:00 2001 From: pyro2927 Date: Sat, 18 Jan 2014 11:50:23 -0600 Subject: [PATCH 3/5] Checking requests by host instead of http:// --- TSMiniWebBrowser/TSMiniWebBrowser.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index bff5b0a..97f73ba 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -462,8 +462,8 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *) else { if ([[request.URL absoluteString] hasPrefix:@"http://www.youtube.com/v/"] || - [[request.URL absoluteString] hasPrefix:@"http://itunes.apple.com/"] || - [[request.URL absoluteString] hasPrefix:@"http://phobos.apple.com/"]) { + [[request.URL host] isEqualToString:@"itunes.apple.com"] || + [[request.URL host] isEqualToString:@"phobos.apple.com"]) { [[UIApplication sharedApplication] openURL:request.URL]; return NO; } From e7040a65c95b0f769c90a480246030be693beffa Mon Sep 17 00:00:00 2001 From: pyro2927 Date: Wed, 29 Jan 2014 17:16:05 -0600 Subject: [PATCH 4/5] Pointing podspec back at tonisalae's repo --- TSMiniWebBrowser.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TSMiniWebBrowser.podspec b/TSMiniWebBrowser.podspec index 222e08f..e1242d5 100644 --- a/TSMiniWebBrowser.podspec +++ b/TSMiniWebBrowser.podspec @@ -4,9 +4,9 @@ Pod::Spec.new do |s| s.platform = :ios s.license = 'MIT' s.summary = 'An in-app web browser control for iOS apps.' - s.homepage = 'https://github.com/pyro2927/TSMiniWebBrowser' + s.homepage = 'https://github.com/tonisalae/TSMiniWebBrowser' s.author = { 'Toni Sala' => 'tonisalae@gmail.com' } - s.source = { :git => 'https://github.com/pyro2927/TSMiniWebBrowser.git', :branch => "master" } + s.source = { :git => 'https://github.com/tonisalae/TSMiniWebBrowser.git', :branch => "master" } s.source_files = 'TSMiniWebBrowser/*.{h,m}' s.framework = 'QuartzCore' s.requires_arc = true From c8cc5565c048b7dd2e8c839af8619e3dd5aa2193 Mon Sep 17 00:00:00 2001 From: pyro2927 Date: Wed, 29 Jan 2014 17:23:39 -0600 Subject: [PATCH 5/5] Handling translucent and non-translucent nav bars --- TSMiniWebBrowser/TSMiniWebBrowser.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index 97f73ba..f1d94f1 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -181,8 +181,9 @@ -(void) initWebView { webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, kToolBarHeight, viewSize.width, viewSize.height-kToolBarHeight*2)]; } else if(mode == TSMiniWebBrowserModeNavigation) { webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, viewSize.width, viewSize.height)]; - [[webView scrollView] setContentInset:UIEdgeInsetsMake(64, 0, 44, 0)]; - [[webView scrollView] setScrollIndicatorInsets:UIEdgeInsetsMake(64, 0, 44, 0)]; + bool translucentNavBar = self.navigationController.navigationBar.isTranslucent; + [[webView scrollView] setContentInset:UIEdgeInsetsMake((translucentNavBar ? 64 : 0), 0, 44, 0)]; + [[webView scrollView] setScrollIndicatorInsets:UIEdgeInsetsMake((translucentNavBar ? 64 : 0), 0, 44, 0)]; } else if(mode == TSMiniWebBrowserModeTabBar) { self.view.backgroundColor = [UIColor redColor]; webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, kToolBarHeight-1, viewSize.width, viewSize.height-kToolBarHeight+1)];