diff --git a/TSMiniWebBrowser.podspec b/TSMiniWebBrowser.podspec new file mode 100644 index 0000000..1eed023 --- /dev/null +++ b/TSMiniWebBrowser.podspec @@ -0,0 +1,14 @@ +Pod::Spec.new do |s| + s.name = 'TSMiniWebBrowser' + s.version = '1.0.2' + s.platform = :ios + s.license = 'MIT' + s.summary = 'An in-app web browser control for iOS apps.' + s.homepage = 'https://github.com/DamienMartin/TSMiniWebBrowser' + s.author = { 'Toni Sala' => 'tonisalae@gmail.com' } + s.source = { :git => 'https://github.com/DamienMartin/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 \ No newline at end of file diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index 0c8a9f5..e66a2a1 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -80,7 +80,7 @@ -(void) dismissController { if ( webView.loading ) { [webView stopLoading]; } - [self dismissModalViewControllerAnimated:YES]; + [self dismissViewControllerAnimated:YES completion:nil]; // Notify the delegate if (self.delegate != NULL && [self.delegate respondsToSelector:@selector(tsMiniWebBrowserDidDismiss)]) { @@ -252,9 +252,6 @@ - (void)viewDidLoad [self initTitleBar]; } - // Status bar style - [[UIApplication sharedApplication] setStatusBarStyle:barStyle animated:YES]; - // UI state buttonGoBack.enabled = NO; buttonGoForward.enabled = NO; @@ -290,10 +287,7 @@ -(void) viewWillDisappear:(BOOL)animated { if (mode == TSMiniWebBrowserModeNavigation) { self.navigationController.navigationBar.barStyle = originalBarStyle; } - - // Restore Status bar style - [[UIApplication sharedApplication] setStatusBarStyle:originalBarStyle animated:NO]; - + // Stop loading [webView stopLoading]; } diff --git a/TSMiniWebBrowserDemo.xcodeproj/project.pbxproj b/TSMiniWebBrowserDemo.xcodeproj/project.pbxproj index e5707d8..ee8a45e 100644 --- a/TSMiniWebBrowserDemo.xcodeproj/project.pbxproj +++ b/TSMiniWebBrowserDemo.xcodeproj/project.pbxproj @@ -192,7 +192,7 @@ 6F69CDA714C6339C00BB6C57 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0510; }; buildConfigurationList = 6F69CDAA14C6339C00BB6C57 /* Build configuration list for PBXProject "TSMiniWebBrowserDemo" */; compatibilityVersion = "Xcode 3.2"; @@ -274,8 +274,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -287,10 +292,15 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; @@ -299,16 +309,25 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -321,7 +340,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "TSMiniWebBrowserDemo/TSMiniWebBrowserDemo-Prefix.pch"; INFOPLIST_FILE = "TSMiniWebBrowserDemo/TSMiniWebBrowserDemo-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -333,7 +352,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "TSMiniWebBrowserDemo/TSMiniWebBrowserDemo-Prefix.pch"; INFOPLIST_FILE = "TSMiniWebBrowserDemo/TSMiniWebBrowserDemo-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; diff --git a/TSMiniWebBrowserDemo/ViewController.m b/TSMiniWebBrowserDemo/ViewController.m index 81b4f2f..199157d 100644 --- a/TSMiniWebBrowserDemo/ViewController.m +++ b/TSMiniWebBrowserDemo/ViewController.m @@ -89,7 +89,7 @@ - (IBAction)buttonTouchUp:(id)sender { if (webBrowser.mode == TSMiniWebBrowserModeModal) { webBrowser.modalDismissButtonTitle = @"Home"; - [self presentModalViewController:webBrowser animated:YES]; + [self presentViewController:webBrowser animated:YES completion:nil]; } else if(webBrowser.mode == TSMiniWebBrowserModeNavigation) { [self.navigationController pushViewController:webBrowser animated:YES]; }