From 0aaf00f7137ad2578114c4f0d10819b710b7fd61 Mon Sep 17 00:00:00 2001 From: Alex Hill Date: Thu, 27 Apr 2017 18:15:06 -0700 Subject: [PATCH 1/5] - Cleanup Pod files by adding the Pods directory to .gitignore (a 'pod install' will be needed after cloning, but this reduces space generated by the Sample app) - Retain reference to navigation bar to fix temperamental KVO crash on dealloc. - Clear progress view in viewDidDisappear: as well as viewWillDisappear: - just in case there is a situation in which we receive delegate progress callbacks. --- .gitignore | 8 + Examples/Sample/Podfile | 4 +- Examples/Sample/Podfile.lock | 10 +- .../DZNWebViewController/DZNPolyActivity.h | 1 - .../Build/DZNWebViewController/DZNWebView.h | 1 - .../DZNWebViewController.h | 1 - .../DZNWebViewController/DZNPolyActivity.h | 1 - .../Public/DZNWebViewController/DZNWebView.h | 1 - .../DZNWebViewController.h | 1 - .../DZNWebViewController.podspec | 19 - Examples/Sample/Pods/Manifest.lock | 14 - .../Pods/Pods.xcodeproj/project.pbxproj | 1513 ----------------- ...Pods-DZNWebViewController-Private.xcconfig | 5 - .../Pods-DZNWebViewController-dummy.m | 5 - .../Pods-DZNWebViewController-prefix.pch | 5 - .../Pods-DZNWebViewController.xcconfig | 1 - .../Pods/Pods-acknowledgements.markdown | 16 - .../Pods/Pods-acknowledgements.plist | 46 - .../Target Support Files/Pods/Pods-dummy.m | 5 - .../Pods/Pods-environment.h | 14 - .../Pods/Pods-resources.sh | 102 -- .../Pods/Pods.debug.xcconfig | 6 - .../Pods/Pods.release.xcconfig | 6 - .../Sample/Sample.xcodeproj/project.pbxproj | 52 +- Source/Classes/DZNWebViewController.m | 19 +- 25 files changed, 61 insertions(+), 1795 deletions(-) delete mode 120000 Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNPolyActivity.h delete mode 120000 Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebView.h delete mode 120000 Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebViewController.h delete mode 120000 Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNPolyActivity.h delete mode 120000 Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebView.h delete mode 120000 Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebViewController.h delete mode 100644 Examples/Sample/Pods/Local Podspecs/DZNWebViewController.podspec delete mode 100644 Examples/Sample/Pods/Manifest.lock delete mode 100644 Examples/Sample/Pods/Pods.xcodeproj/project.pbxproj delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-Private.xcconfig delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-dummy.m delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController.xcconfig delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods-dummy.m delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods-environment.h delete mode 100755 Examples/Sample/Pods/Target Support Files/Pods/Pods-resources.sh delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods.debug.xcconfig delete mode 100644 Examples/Sample/Pods/Target Support Files/Pods/Pods.release.xcconfig diff --git a/.gitignore b/.gitignore index 6c3fcd0..fe8c6b3 100755 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,11 @@ build/* xcuserdata profile *.moved-aside + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +Pods/ diff --git a/Examples/Sample/Podfile b/Examples/Sample/Podfile index 5550501..94634f8 100644 --- a/Examples/Sample/Podfile +++ b/Examples/Sample/Podfile @@ -2,4 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' -pod 'DZNWebViewController', :path => '../../DZNWebViewController.podspec' \ No newline at end of file +target "Sample" do + pod 'DZNWebViewController', :path => '../../DZNWebViewController.podspec' +end diff --git a/Examples/Sample/Podfile.lock b/Examples/Sample/Podfile.lock index f5377c2..a494290 100644 --- a/Examples/Sample/Podfile.lock +++ b/Examples/Sample/Podfile.lock @@ -1,14 +1,16 @@ PODS: - - DZNWebViewController (3.1) + - DZNWebViewController (3.2) DEPENDENCIES: - DZNWebViewController (from `../../DZNWebViewController.podspec`) EXTERNAL SOURCES: DZNWebViewController: - :path: ../../DZNWebViewController.podspec + :path: "../../DZNWebViewController.podspec" SPEC CHECKSUMS: - DZNWebViewController: 2c5dbb6874e49297a74011380bef6c8059402e4d + DZNWebViewController: 8e927a5de637fe0c4104c001d5cccd4fa5621e50 -COCOAPODS: 0.35.0 +PODFILE CHECKSUM: 51f540e277a3055aeb765a75d4273bb2a8d1999f + +COCOAPODS: 1.2.1 diff --git a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNPolyActivity.h b/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNPolyActivity.h deleted file mode 120000 index ebce148..0000000 --- a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNPolyActivity.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNPolyActivity.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebView.h b/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebView.h deleted file mode 120000 index a32a496..0000000 --- a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebView.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNWebView.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebViewController.h b/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebViewController.h deleted file mode 120000 index aa49a31..0000000 --- a/Examples/Sample/Pods/Headers/Build/DZNWebViewController/DZNWebViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNWebViewController.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNPolyActivity.h b/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNPolyActivity.h deleted file mode 120000 index ebce148..0000000 --- a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNPolyActivity.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNPolyActivity.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebView.h b/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebView.h deleted file mode 120000 index a32a496..0000000 --- a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebView.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNWebView.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebViewController.h b/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebViewController.h deleted file mode 120000 index aa49a31..0000000 --- a/Examples/Sample/Pods/Headers/Public/DZNWebViewController/DZNWebViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Source/Classes/DZNWebViewController.h \ No newline at end of file diff --git a/Examples/Sample/Pods/Local Podspecs/DZNWebViewController.podspec b/Examples/Sample/Pods/Local Podspecs/DZNWebViewController.podspec deleted file mode 100644 index c36e333..0000000 --- a/Examples/Sample/Pods/Local Podspecs/DZNWebViewController.podspec +++ /dev/null @@ -1,19 +0,0 @@ - -@version = "3.1" - -Pod::Spec.new do |s| - s.name = "DZNWebViewController" - s.version = @version - s.summary = "An iPhone/iPad mini WebKit browser controller, useful for in-app web browsing experience." - s.homepage = "https://github.com/dzenbot/DZNWebViewController" - s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { "Ignacio Romero Z." => "iromero@dzen.cl" } - s.source = { :git => "https://github.com/dzenbot/DZNWebViewController.git", :tag => "v#{s.version}" } - - s.platform = :ios, '8.0' - s.requires_arc = true - - s.source_files = 'Source/Classes/*.{h,m}' - s.resources = 'Source/Resources/*.*' - s.framework = 'UIKit', 'WebKit' -end \ No newline at end of file diff --git a/Examples/Sample/Pods/Manifest.lock b/Examples/Sample/Pods/Manifest.lock deleted file mode 100644 index f5377c2..0000000 --- a/Examples/Sample/Pods/Manifest.lock +++ /dev/null @@ -1,14 +0,0 @@ -PODS: - - DZNWebViewController (3.1) - -DEPENDENCIES: - - DZNWebViewController (from `../../DZNWebViewController.podspec`) - -EXTERNAL SOURCES: - DZNWebViewController: - :path: ../../DZNWebViewController.podspec - -SPEC CHECKSUMS: - DZNWebViewController: 2c5dbb6874e49297a74011380bef6c8059402e4d - -COCOAPODS: 0.35.0 diff --git a/Examples/Sample/Pods/Pods.xcodeproj/project.pbxproj b/Examples/Sample/Pods/Pods.xcodeproj/project.pbxproj deleted file mode 100644 index 033dd1a..0000000 --- a/Examples/Sample/Pods/Pods.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1513 +0,0 @@ - - - - - archiveVersion - 1 - classes - - objectVersion - 46 - objects - - 00992094D449B82BFE521790 - - buildActionMask - 2147483647 - files - - 489DE318E0BE706769B0A255 - 0C5667C37C643E1F7DD34234 - 77C1293EC1045853E9890F1C - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 060EE6D168CB06AB0907F49D - - buildConfigurationList - F9F02554DD20416666AE8F68 - buildPhases - - 7BEFEC1D3363176AA500EED6 - 69CF079DFC013721B50A3EF8 - - buildRules - - dependencies - - B20259E709BA1E5E2CB9B864 - - isa - PBXNativeTarget - name - Pods - productName - Pods - productReference - D23D81F62ACDAA0D78B22DCA - productType - com.apple.product-type.library.static - - 0ADD65D0C66E2BC1BD5BAC11 - - includeInIndex - 1 - isa - PBXFileReference - name - en.lproj - path - Source/Resources/en.lproj - sourceTree - <group> - - 0C5667C37C643E1F7DD34234 - - fileRef - 631330A98DE7D3AC6A0F1D78 - isa - PBXBuildFile - - 11A49D7CD845C2046617D881 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - DZNWebViewController.m - path - Source/Classes/DZNWebViewController.m - sourceTree - <group> - - 12F7014E1AC3F7AC0A0F696C - - fileRef - 11A49D7CD845C2046617D881 - isa - PBXBuildFile - - 13566D3EE0324E1BC41C95A4 - - fileRef - 6F34DEA9389058F3F93B9970 - isa - PBXBuildFile - - 167242C1C6CDE3EC47B3FB40 - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods-DZNWebViewController.a - sourceTree - BUILT_PRODUCTS_DIR - - 184335DCDEA903E14D9B69A4 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Pods-environment.h - sourceTree - <group> - - 223BE380810D19655A7557C8 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_forward@2x.png - path - Source/Resources/dzn_icn_toolbar_forward@2x.png - sourceTree - <group> - - 25E4569ABE690F1197CDA5E1 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_reload@2x.png - path - Source/Resources/dzn_icn_toolbar_reload@2x.png - sourceTree - <group> - - 261D7B11D5C334CC3001232E - - buildActionMask - 2147483647 - files - - E8076C68AC3506FE1F55385F - 77C0667D535E0909871E8EED - 13566D3EE0324E1BC41C95A4 - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 29EA6B754BCAC07F6C97C521 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_safari@2x~ipad.png - path - Source/Resources/dzn_icn_activity_safari@2x~ipad.png - sourceTree - <group> - - 2BD9BBCD0CDCD76A0C4FD13F - - fileRef - CD0A5778901D1F5D38C931B2 - isa - PBXBuildFile - - 2CEDB7C2CA6E94C27228A8A7 - - buildActionMask - 2147483647 - files - - 69214F9058C6702C2234F435 - 7C9D3F5A208ABC8B0F0675D4 - 12F7014E1AC3F7AC0A0F696C - EC4475FC84960C3E274CBC92 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 2EC87CD0A7605389E9F1A5F1 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_dolphin@2x.png - path - Source/Resources/dzn_icn_activity_dolphin@2x.png - sourceTree - <group> - - 2F372510FAD32C2AF1851CCA - - children - - 50F3AA83F6F772402F9EC76C - F51C082400401E76F31FCBCF - 77124B2EDD31A43571D1BB67 - 3A423D280596CA74C739EACF - - isa - PBXGroup - name - Support Files - path - Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController - sourceTree - <group> - - 35BC6AFB18B7B05B084F6BBA - - children - - DEDC09ACF0D5C9FDA6963F74 - 40B6E3113023B003AB8CD381 - C7C7FA4ADEFEF38FE6AA137B - 2EC87CD0A7605389E9F1A5F1 - 3E270E0684DDEEAEF0DE2280 - D6F1572F7C8A163BBF469114 - 4537B42F60528ECE04A0B67B - E6BA76B55DC931D7C3FF7632 - 83633C0014F84EDA90584B18 - 623FA5E9F386B8C7DF5FCB8B - 29EA6B754BCAC07F6C97C521 - 7DF077DE5F6704B25467862E - EF18671346DA073675CA3870 - EC72286D346A2CFFE781138C - FCB28C339A32828D635E49A0 - ACF8F7406C2FE95403DE0104 - FC694D639C08E81FDD3ED757 - EFD63726D6A6EFDF9D871E22 - 223BE380810D19655A7557C8 - 797D09502EBA880224FCB104 - 40818501EAB22367ADFB7E35 - 25E4569ABE690F1197CDA5E1 - 6314A3AC3A4B46A587C1954F - 83B3DC5AA1B5D106A1ECD845 - 690626E999B65865ABFBC7F0 - FAD64E9115270D63A618110D - 0ADD65D0C66E2BC1BD5BAC11 - EB2E2AB7460D364B0BF4663A - - isa - PBXGroup - name - Resources - sourceTree - <group> - - 3A423D280596CA74C739EACF - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Pods-DZNWebViewController-prefix.pch - sourceTree - <group> - - 3E270E0684DDEEAEF0DE2280 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_dolphin@2x~ipad.png - path - Source/Resources/dzn_icn_activity_dolphin@2x~ipad.png - sourceTree - <group> - - 3FF547B5D7CA7122FFC77C8F - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - DZNPolyActivity.m - path - Source/Classes/DZNPolyActivity.m - sourceTree - <group> - - 40818501EAB22367ADFB7E35 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_reload.png - path - Source/Resources/dzn_icn_toolbar_reload.png - sourceTree - <group> - - 40B6E3113023B003AB8CD381 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_chrome@2x.png - path - Source/Resources/dzn_icn_activity_chrome@2x.png - sourceTree - <group> - - 4537B42F60528ECE04A0B67B - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_link@2x~ipad.png - path - Source/Resources/dzn_icn_activity_link@2x~ipad.png - sourceTree - <group> - - 489DE318E0BE706769B0A255 - - fileRef - CD0A5778901D1F5D38C931B2 - isa - PBXBuildFile - - 4B0D8CA8F9BB1FF5F8FDFF0D - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - DZNPolyActivity.h - path - Source/Classes/DZNPolyActivity.h - sourceTree - <group> - - 4C5D16CBA8587A7E5FE7DC29 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text - path - Pods-acknowledgements.markdown - sourceTree - <group> - - 50F3AA83F6F772402F9EC76C - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-DZNWebViewController.xcconfig - sourceTree - <group> - - 5B25D61AA9800BB616F07184 - - buildConfigurations - - 944B8DFE58EB10B815B6DD31 - 7D5E1F1062506F75CC6109CB - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 5D1330EC72F1909F6DDED80F - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods.debug.xcconfig - sourceTree - <group> - - 623FA5E9F386B8C7DF5FCB8B - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_safari@2x.png - path - Source/Resources/dzn_icn_activity_safari@2x.png - sourceTree - <group> - - 631330A98DE7D3AC6A0F1D78 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - UIKit.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework - sourceTree - DEVELOPER_DIR - - 6314A3AC3A4B46A587C1954F - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_reload@3x.png - path - Source/Resources/dzn_icn_toolbar_reload@3x.png - sourceTree - <group> - - 661D528838509E39B7CE74D1 - - children - - DA0F7D9CA81A16E97160F44E - - isa - PBXGroup - name - Development Pods - sourceTree - <group> - - 66E5113B0B379652BAA7CA00 - - containerPortal - A267B8507A4014B520B818E9 - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 8145AF67BCA4DD5287A8AE6E - remoteInfo - Pods-DZNWebViewController - - 690626E999B65865ABFBC7F0 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_stop@2x.png - path - Source/Resources/dzn_icn_toolbar_stop@2x.png - sourceTree - <group> - - 69214F9058C6702C2234F435 - - fileRef - 3FF547B5D7CA7122FFC77C8F - isa - PBXBuildFile - - 69CF079DFC013721B50A3EF8 - - buildActionMask - 2147483647 - files - - 2BD9BBCD0CDCD76A0C4FD13F - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6F34DEA9389058F3F93B9970 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - DZNWebViewController.h - path - Source/Classes/DZNWebViewController.h - sourceTree - <group> - - 77124B2EDD31A43571D1BB67 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-DZNWebViewController-dummy.m - sourceTree - <group> - - 77C0667D535E0909871E8EED - - fileRef - EC56A55EDBDDF2467C190740 - isa - PBXBuildFile - - 77C1293EC1045853E9890F1C - - fileRef - EC9CA13F29828E2A41EF7FF6 - isa - PBXBuildFile - - 797D09502EBA880224FCB104 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_forward@3x.png - path - Source/Resources/dzn_icn_toolbar_forward@3x.png - sourceTree - <group> - - 7B4F693050D5379CEAD383AB - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods.release.xcconfig - sourceTree - <group> - - 7BEFEC1D3363176AA500EED6 - - buildActionMask - 2147483647 - files - - A3C79AABED1C735058D73EC6 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 7C9D3F5A208ABC8B0F0675D4 - - fileRef - C4649FE3F0F25087E0B9582D - isa - PBXBuildFile - - 7D5E1F1062506F75CC6109CB - - baseConfigurationReference - F51C082400401E76F31FCBCF - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - YES - DSTROOT - /tmp/xcodeproj.dst - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - 7DF077DE5F6704B25467862E - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_action.png - path - Source/Resources/dzn_icn_toolbar_action.png - sourceTree - <group> - - 8145AF67BCA4DD5287A8AE6E - - buildConfigurationList - 5B25D61AA9800BB616F07184 - buildPhases - - 2CEDB7C2CA6E94C27228A8A7 - 00992094D449B82BFE521790 - 261D7B11D5C334CC3001232E - - buildRules - - dependencies - - isa - PBXNativeTarget - name - Pods-DZNWebViewController - productName - Pods-DZNWebViewController - productReference - 167242C1C6CDE3EC47B3FB40 - productType - com.apple.product-type.library.static - - 822236213FCC681C17E61870 - - children - - 4C5D16CBA8587A7E5FE7DC29 - 8D44E7924F66411D7D7118B6 - F568817304C7FD7C988F8D4A - 184335DCDEA903E14D9B69A4 - CD758D411B297D91031A8995 - 5D1330EC72F1909F6DDED80F - 7B4F693050D5379CEAD383AB - - isa - PBXGroup - name - Pods - path - Target Support Files/Pods - sourceTree - <group> - - 83633C0014F84EDA90584B18 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_opera@2x~ipad.png - path - Source/Resources/dzn_icn_activity_opera@2x~ipad.png - sourceTree - <group> - - 83B3DC5AA1B5D106A1ECD845 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_stop.png - path - Source/Resources/dzn_icn_toolbar_stop.png - sourceTree - <group> - - 8D44E7924F66411D7D7118B6 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - Pods-acknowledgements.plist - sourceTree - <group> - - 944B8DFE58EB10B815B6DD31 - - baseConfigurationReference - F51C082400401E76F31FCBCF - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Debug - - 987DBCBFDBBCCA5A66034CA7 - - children - - CD0A5778901D1F5D38C931B2 - 631330A98DE7D3AC6A0F1D78 - EC9CA13F29828E2A41EF7FF6 - - isa - PBXGroup - name - iOS - sourceTree - <group> - - 9B313F2655F8AF6426C84CF8 - - children - - D23D81F62ACDAA0D78B22DCA - 167242C1C6CDE3EC47B3FB40 - - isa - PBXGroup - name - Products - sourceTree - <group> - - A267B8507A4014B520B818E9 - - attributes - - LastUpgradeCheck - 0510 - - buildConfigurationList - F4E5A4CD9F354A711A9BEE96 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - - mainGroup - F204D602667ADC04842D0D4F - productRefGroup - 9B313F2655F8AF6426C84CF8 - projectDirPath - - projectReferences - - projectRoot - - targets - - 060EE6D168CB06AB0907F49D - 8145AF67BCA4DD5287A8AE6E - - - A3C79AABED1C735058D73EC6 - - fileRef - F568817304C7FD7C988F8D4A - isa - PBXBuildFile - - AA4C0AAA4D64776B24FDEDBB - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - COPY_PHASE_STRIP - NO - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_PREPROCESSOR_DEFINITIONS - - RELEASE=1 - - GCC_WARN_64_TO_32_BIT_CONVERSION - 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 - 8.0 - STRIP_INSTALLED_PRODUCT - NO - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - ACF8F7406C2FE95403DE0104 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_backward@2x.png - path - Source/Resources/dzn_icn_toolbar_backward@2x.png - sourceTree - <group> - - AD361AD18726B5814429968E - - baseConfigurationReference - 7B4F693050D5379CEAD383AB - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - YES - DSTROOT - /tmp/xcodeproj.dst - GCC_PRECOMPILE_PREFIX_HEADER - YES - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - B20259E709BA1E5E2CB9B864 - - isa - PBXTargetDependency - name - Pods-DZNWebViewController - target - 8145AF67BCA4DD5287A8AE6E - targetProxy - 66E5113B0B379652BAA7CA00 - - C4649FE3F0F25087E0B9582D - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - DZNWebView.m - path - Source/Classes/DZNWebView.m - sourceTree - <group> - - C7C7FA4ADEFEF38FE6AA137B - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_chrome@2x~ipad.png - path - Source/Resources/dzn_icn_activity_chrome@2x~ipad.png - sourceTree - <group> - - CD0A5778901D1F5D38C931B2 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Foundation.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework - sourceTree - DEVELOPER_DIR - - CD758D411B297D91031A8995 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.script.sh - path - Pods-resources.sh - sourceTree - <group> - - CF67EA2AAA5B5989C537FE07 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text - name - Podfile - path - ../Podfile - sourceTree - SOURCE_ROOT - xcLanguageSpecificationIdentifier - xcode.lang.ruby - - D23D81F62ACDAA0D78B22DCA - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods.a - sourceTree - BUILT_PRODUCTS_DIR - - D56CDD786B58B4FF1D2192FF - - baseConfigurationReference - 5D1330EC72F1909F6DDED80F - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Debug - - D6F1572F7C8A163BBF469114 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_link@2x.png - path - Source/Resources/dzn_icn_activity_link@2x.png - sourceTree - <group> - - DA0F7D9CA81A16E97160F44E - - children - - 4B0D8CA8F9BB1FF5F8FDFF0D - 3FF547B5D7CA7122FFC77C8F - EC56A55EDBDDF2467C190740 - C4649FE3F0F25087E0B9582D - 6F34DEA9389058F3F93B9970 - 11A49D7CD845C2046617D881 - 35BC6AFB18B7B05B084F6BBA - 2F372510FAD32C2AF1851CCA - - isa - PBXGroup - name - DZNWebViewController - path - ../../.. - sourceTree - <group> - - DEDC09ACF0D5C9FDA6963F74 - - includeInIndex - 1 - isa - PBXFileReference - name - de.lproj - path - Source/Resources/de.lproj - sourceTree - <group> - - E6BA76B55DC931D7C3FF7632 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_activity_opera@2x.png - path - Source/Resources/dzn_icn_activity_opera@2x.png - sourceTree - <group> - - E8076C68AC3506FE1F55385F - - fileRef - 4B0D8CA8F9BB1FF5F8FDFF0D - isa - PBXBuildFile - - EB2E2AB7460D364B0BF4663A - - includeInIndex - 1 - isa - PBXFileReference - name - es.lproj - path - Source/Resources/es.lproj - sourceTree - <group> - - EC4475FC84960C3E274CBC92 - - fileRef - 77124B2EDD31A43571D1BB67 - isa - PBXBuildFile - - EC56A55EDBDDF2467C190740 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - DZNWebView.h - path - Source/Classes/DZNWebView.h - sourceTree - <group> - - EC72286D346A2CFFE781138C - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_action@3x.png - path - Source/Resources/dzn_icn_toolbar_action@3x.png - sourceTree - <group> - - EC9CA13F29828E2A41EF7FF6 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - WebKit.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/WebKit.framework - sourceTree - DEVELOPER_DIR - - EF18671346DA073675CA3870 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_action@2x.png - path - Source/Resources/dzn_icn_toolbar_action@2x.png - sourceTree - <group> - - EFD63726D6A6EFDF9D871E22 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_forward.png - path - Source/Resources/dzn_icn_toolbar_forward.png - sourceTree - <group> - - F1771922735E3CA9114E0186 - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - COPY_PHASE_STRIP - YES - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - 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 - 8.0 - ONLY_ACTIVE_ARCH - YES - STRIP_INSTALLED_PRODUCT - NO - - isa - XCBuildConfiguration - name - Debug - - F204D602667ADC04842D0D4F - - children - - CF67EA2AAA5B5989C537FE07 - 661D528838509E39B7CE74D1 - F729CA2E30BCD7C2EA8C57BA - 9B313F2655F8AF6426C84CF8 - F5D6E8ECBF094FBC9B3C08B2 - - isa - PBXGroup - sourceTree - <group> - - F4E5A4CD9F354A711A9BEE96 - - buildConfigurations - - F1771922735E3CA9114E0186 - AA4C0AAA4D64776B24FDEDBB - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - F51C082400401E76F31FCBCF - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-DZNWebViewController-Private.xcconfig - sourceTree - <group> - - F568817304C7FD7C988F8D4A - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-dummy.m - sourceTree - <group> - - F5D6E8ECBF094FBC9B3C08B2 - - children - - 822236213FCC681C17E61870 - - isa - PBXGroup - name - Targets Support Files - sourceTree - <group> - - F729CA2E30BCD7C2EA8C57BA - - children - - 987DBCBFDBBCCA5A66034CA7 - - isa - PBXGroup - name - Frameworks - sourceTree - <group> - - F9F02554DD20416666AE8F68 - - buildConfigurations - - D56CDD786B58B4FF1D2192FF - AD361AD18726B5814429968E - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - FAD64E9115270D63A618110D - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_stop@3x.png - path - Source/Resources/dzn_icn_toolbar_stop@3x.png - sourceTree - <group> - - FC694D639C08E81FDD3ED757 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_backward@3x.png - path - Source/Resources/dzn_icn_toolbar_backward@3x.png - sourceTree - <group> - - FCB28C339A32828D635E49A0 - - includeInIndex - 1 - isa - PBXFileReference - name - dzn_icn_toolbar_backward.png - path - Source/Resources/dzn_icn_toolbar_backward.png - sourceTree - <group> - - - rootObject - A267B8507A4014B520B818E9 - - diff --git a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-Private.xcconfig b/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-Private.xcconfig deleted file mode 100644 index 94348a8..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-Private.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -#include "Pods-DZNWebViewController.xcconfig" -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Build" "${PODS_ROOT}/Headers/Build/DZNWebViewController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DZNWebViewController" -OTHER_LDFLAGS = ${PODS_DZNWEBVIEWCONTROLLER_OTHER_LDFLAGS} -ObjC -PODS_ROOT = ${SRCROOT} \ No newline at end of file diff --git a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-dummy.m b/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-dummy.m deleted file mode 100644 index 0986303..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_Pods_DZNWebViewController : NSObject -@end -@implementation PodsDummy_Pods_DZNWebViewController -@end diff --git a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch b/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch deleted file mode 100644 index 95cf11d..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController-prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __OBJC__ -#import -#endif - -#import "Pods-environment.h" diff --git a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController.xcconfig b/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController.xcconfig deleted file mode 100644 index d7e576d..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods-DZNWebViewController/Pods-DZNWebViewController.xcconfig +++ /dev/null @@ -1 +0,0 @@ -PODS_DZNWEBVIEWCONTROLLER_OTHER_LDFLAGS = -framework "UIKit" -framework "WebKit" \ No newline at end of file diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown deleted file mode 100644 index 48f643f..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown +++ /dev/null @@ -1,16 +0,0 @@ -# Acknowledgements -This application makes use of the following third party libraries: - -## DZNWebViewController - -The MIT License (MIT) - -Copyright (c) 2014 Ignacio Romero Zurbuchen, DZN Labs, iromero@dzen.cl - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Generated by CocoaPods - http://cocoapods.org diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist deleted file mode 100644 index 16357d0..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - PreferenceSpecifiers - - - FooterText - This application makes use of the following third party libraries: - Title - Acknowledgements - Type - PSGroupSpecifier - - - FooterText - The MIT License (MIT) - -Copyright (c) 2014 Ignacio Romero Zurbuchen, DZN Labs, iromero@dzen.cl - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Title - DZNWebViewController - Type - PSGroupSpecifier - - - FooterText - Generated by CocoaPods - http://cocoapods.org - Title - - Type - PSGroupSpecifier - - - StringsTable - Acknowledgements - Title - Acknowledgements - - diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods-dummy.m b/Examples/Sample/Pods/Target Support Files/Pods/Pods-dummy.m deleted file mode 100644 index ade64bd..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_Pods : NSObject -@end -@implementation PodsDummy_Pods -@end diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods-environment.h b/Examples/Sample/Pods/Target Support Files/Pods/Pods-environment.h deleted file mode 100644 index d11edba..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods-environment.h +++ /dev/null @@ -1,14 +0,0 @@ - -// To check if a library is compiled with CocoaPods you -// can use the `COCOAPODS` macro definition which is -// defined in the xcconfigs so it is available in -// headers also when they are imported in the client -// project. - - -// DZNWebViewController -#define COCOAPODS_POD_AVAILABLE_DZNWebViewController -#define COCOAPODS_VERSION_MAJOR_DZNWebViewController 3 -#define COCOAPODS_VERSION_MINOR_DZNWebViewController 1 -#define COCOAPODS_VERSION_PATCH_DZNWebViewController 0 - diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods-resources.sh b/Examples/Sample/Pods/Target Support Files/Pods/Pods-resources.sh deleted file mode 100755 index 4a86b83..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods-resources.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -set -e - -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - -RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt -> "$RESOURCES_TO_COPY" - -install_resource() -{ - case $1 in - *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" - ;; - *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" - ;; - *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - ;; - *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" - ;; - *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" - ;; - *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" - ;; - *.xcassets) - ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; - *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" - ;; - esac -} - install_resource "../../../Source/Resources/dzn_icn_activity_chrome@2x.png" - install_resource "../../../Source/Resources/dzn_icn_activity_chrome@2x~ipad.png" - install_resource "../../../Source/Resources/dzn_icn_activity_dolphin@2x.png" - install_resource "../../../Source/Resources/dzn_icn_activity_dolphin@2x~ipad.png" - install_resource "../../../Source/Resources/dzn_icn_activity_link@2x.png" - install_resource "../../../Source/Resources/dzn_icn_activity_link@2x~ipad.png" - install_resource "../../../Source/Resources/dzn_icn_activity_opera@2x.png" - install_resource "../../../Source/Resources/dzn_icn_activity_opera@2x~ipad.png" - install_resource "../../../Source/Resources/dzn_icn_activity_safari@2x.png" - install_resource "../../../Source/Resources/dzn_icn_activity_safari@2x~ipad.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_action.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_action@2x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_action@3x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_backward.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_backward@2x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_backward@3x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_forward.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_forward@2x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_forward@3x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_reload.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_reload@2x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_reload@3x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_stop.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_stop@2x.png" - install_resource "../../../Source/Resources/dzn_icn_toolbar_stop@3x.png" - install_resource "../../../Source/Resources/de.lproj" - install_resource "../../../Source/Resources/en.lproj" - install_resource "../../../Source/Resources/es.lproj" - -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -if [[ "${ACTION}" == "install" ]]; then - rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -fi -rm -f "$RESOURCES_TO_COPY" - -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ] -then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -fi diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/Examples/Sample/Pods/Target Support Files/Pods/Pods.debug.xcconfig deleted file mode 100644 index c5d930e..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods.debug.xcconfig +++ /dev/null @@ -1,6 +0,0 @@ -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DZNWebViewController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DZNWebViewController" -OTHER_LDFLAGS = -ObjC -l"Pods-DZNWebViewController" -framework "UIKit" -framework "WebKit" -OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS) -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/Examples/Sample/Pods/Target Support Files/Pods/Pods.release.xcconfig b/Examples/Sample/Pods/Target Support Files/Pods/Pods.release.xcconfig deleted file mode 100644 index c5d930e..0000000 --- a/Examples/Sample/Pods/Target Support Files/Pods/Pods.release.xcconfig +++ /dev/null @@ -1,6 +0,0 @@ -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DZNWebViewController" -OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DZNWebViewController" -OTHER_LDFLAGS = -ObjC -l"Pods-DZNWebViewController" -framework "UIKit" -framework "WebKit" -OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS) -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/Examples/Sample/Sample.xcodeproj/project.pbxproj b/Examples/Sample/Sample.xcodeproj/project.pbxproj index 2ae3f17..b40afbe 100644 --- a/Examples/Sample/Sample.xcodeproj/project.pbxproj +++ b/Examples/Sample/Sample.xcodeproj/project.pbxproj @@ -34,7 +34,7 @@ 4FC763F118E725C60009F375 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4FC763EE18E725C60009F375 /* Default-568h@2x.png */; }; 4FC763F218E725C60009F375 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 4FC763EF18E725C60009F375 /* Default.png */; }; 4FC763F318E725C60009F375 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4FC763F018E725C60009F375 /* Default@2x.png */; }; - AA22BA647F7D4AA39B479ABC /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9934BD31402B4CBE9A91C229 /* libPods.a */; }; + 70C5FB929024B82113774E20 /* libPods-Sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D6EA876E9AFE8A8A7B6AF9 /* libPods-Sample.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -48,6 +48,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 27E750A6A97661096252F0EB /* Pods-Sample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Sample.release.xcconfig"; path = "Pods/Target Support Files/Pods-Sample/Pods-Sample.release.xcconfig"; sourceTree = ""; }; + 4974D7F7054723C64D548E1D /* Pods-Sample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Sample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Sample/Pods-Sample.debug.xcconfig"; sourceTree = ""; }; 4F3041DB1A1EFA8900F702A5 /* DZNWebViewController.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = DZNWebViewController.podspec; path = ../../DZNWebViewController.podspec; sourceTree = ""; }; 4F5F8A0C1A224CC400C95C4C /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = ""; }; 4F6A375A1A20E09100323282 /* NSHipster.com.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = NSHipster.com.html; sourceTree = ""; }; @@ -80,9 +82,7 @@ 4FC763EE18E725C60009F375 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 4FC763EF18E725C60009F375 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; 4FC763F018E725C60009F375 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - 84072172328E77E3D64B7C81 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; - 9934BD31402B4CBE9A91C229 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; - ED4997A7C5F4D6AACC9BD7B0 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; + F6D6EA876E9AFE8A8A7B6AF9 /* libPods-Sample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Sample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -93,7 +93,7 @@ 4FB8460518E50C450056BDFB /* CoreGraphics.framework in Frameworks */, 4FB8460718E50C450056BDFB /* UIKit.framework in Frameworks */, 4FB8460318E50C450056BDFB /* Foundation.framework in Frameworks */, - AA22BA647F7D4AA39B479ABC /* libPods.a in Frameworks */, + 70C5FB929024B82113774E20 /* libPods-Sample.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -114,8 +114,8 @@ isa = PBXGroup; children = ( 4F3041DB1A1EFA8900F702A5 /* DZNWebViewController.podspec */, - ED4997A7C5F4D6AACC9BD7B0 /* Pods.debug.xcconfig */, - 84072172328E77E3D64B7C81 /* Pods.release.xcconfig */, + 4974D7F7054723C64D548E1D /* Pods-Sample.debug.xcconfig */, + 27E750A6A97661096252F0EB /* Pods-Sample.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -182,7 +182,7 @@ 4FB8460418E50C450056BDFB /* CoreGraphics.framework */, 4FB8460618E50C450056BDFB /* UIKit.framework */, 4FB8461B18E50C450056BDFB /* XCTest.framework */, - 9934BD31402B4CBE9A91C229 /* libPods.a */, + F6D6EA876E9AFE8A8A7B6AF9 /* libPods-Sample.a */, ); name = Frameworks; sourceTree = ""; @@ -238,11 +238,12 @@ isa = PBXNativeTarget; buildConfigurationList = 4FB8462B18E50C450056BDFB /* Build configuration list for PBXNativeTarget "Sample" */; buildPhases = ( - 1EC6BC6C7A664F638AC7E348 /* Check Pods Manifest.lock */, + 97E404219D0E88A2A2CE6A80 /* [CP] Check Pods Manifest.lock */, 4FB845FB18E50C450056BDFB /* Sources */, 4FB845FC18E50C450056BDFB /* Frameworks */, 4FB845FD18E50C450056BDFB /* Resources */, - A50537A689D94FC3A207D8C1 /* Copy Pods Resources */, + EFDC61F9DBD0E69559CC8483 /* [CP] Embed Pods Frameworks */, + 25582C500D5ED75825E7C999 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -340,34 +341,49 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1EC6BC6C7A664F638AC7E348 /* Check Pods Manifest.lock */ = { + 25582C500D5ED75825E7C999 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - A50537A689D94FC3A207D8C1 /* Copy Pods Resources */ = { + 97E404219D0E88A2A2CE6A80 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + EFDC61F9DBD0E69559CC8483 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -493,7 +509,7 @@ }; 4FB8462C18E50C450056BDFB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED4997A7C5F4D6AACC9BD7B0 /* Pods.debug.xcconfig */; + baseConfigurationReference = 4974D7F7054723C64D548E1D /* Pods-Sample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -510,7 +526,7 @@ }; 4FB8462D18E50C450056BDFB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 84072172328E77E3D64B7C81 /* Pods.release.xcconfig */; + baseConfigurationReference = 27E750A6A97661096252F0EB /* Pods-Sample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; diff --git a/Source/Classes/DZNWebViewController.m b/Source/Classes/DZNWebViewController.m index acc1b2a..dbfaf26 100644 --- a/Source/Classes/DZNWebViewController.m +++ b/Source/Classes/DZNWebViewController.m @@ -27,8 +27,8 @@ @interface DZNWebViewController () @property (nonatomic, strong) UILongPressGestureRecognizer *backwardLongPress; @property (nonatomic, strong) UILongPressGestureRecognizer *forwardLongPress; +@property (nonatomic, strong) UINavigationBar *navigationBar; @property (nonatomic, weak) UIToolbar *toolbar; -@property (nonatomic, weak) UINavigationBar *navigationBar; @property (nonatomic, weak) UIView *navigationBarSuperView; @property (nonatomic) BOOL completedInitialLoad; @@ -65,6 +65,7 @@ - (instancetype)initWithFileURL:(NSURL *)URL - (void)awakeFromNib { + [super awakeFromNib]; [self commonInit]; } @@ -133,16 +134,16 @@ - (void)viewDidAppear:(BOOL)animated - (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - + [super viewWillDisappear:animated]; [self clearProgressViewAnimated:animated]; } - (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; + [super viewDidDisappear:animated]; [self.webView stopLoading]; + [self clearProgressViewAnimated:animated]; } @@ -875,12 +876,12 @@ - (void)viewDidUnload - (void)dealloc { - if (self.hideBarsWithGestures) { - [self.navigationBar removeObserver:self forKeyPath:@"hidden" context:&DZNWebViewControllerKVOContext]; - [self.navigationBar removeObserver:self forKeyPath:@"center" context:&DZNWebViewControllerKVOContext]; - [self.navigationBar removeObserver:self forKeyPath:@"alpha" context:&DZNWebViewControllerKVOContext]; + if (_hideBarsWithGestures) { + [_navigationBar removeObserver:self forKeyPath:@"hidden" context:&DZNWebViewControllerKVOContext]; + [_navigationBar removeObserver:self forKeyPath:@"center" context:&DZNWebViewControllerKVOContext]; + [_navigationBar removeObserver:self forKeyPath:@"alpha" context:&DZNWebViewControllerKVOContext]; } - [self.webView removeObserver:self forKeyPath:@"loading" context:&DZNWebViewControllerKVOContext]; + [_webView removeObserver:self forKeyPath:@"loading" context:&DZNWebViewControllerKVOContext]; _backwardBarItem = nil; _forwardBarItem = nil; From b089ac0e026e1736016247a70d77fbaf42a7ff3f Mon Sep 17 00:00:00 2001 From: Alex Hill Date: Fri, 28 Apr 2017 11:45:57 -0700 Subject: [PATCH 2/5] - Xcode 8.3 warning - Final removal of progressView in dealloc if need be. May be redundant, but it's a valid case. --- Source/Classes/DZNWebViewController.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Classes/DZNWebViewController.m b/Source/Classes/DZNWebViewController.m index dbfaf26..a91e856 100644 --- a/Source/Classes/DZNWebViewController.m +++ b/Source/Classes/DZNWebViewController.m @@ -11,7 +11,7 @@ #import "DZNWebViewController.h" #import "DZNPolyActivity.h" -#define DZN_IS_IPAD [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad +#define DZN_IS_IPAD ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) #define DZN_IS_LANDSCAPE ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft || [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) static char DZNWebViewControllerKVOContext = 0; @@ -887,11 +887,13 @@ - (void)dealloc _forwardBarItem = nil; _stateBarItem = nil; _actionBarItem = nil; - _progressView = nil; _backwardLongPress = nil; _forwardLongPress = nil; + [_progressView removeFromSuperview]; + _progressView = nil; + _webView.scrollView.delegate = nil; _webView.navDelegate = nil; _webView.UIDelegate = nil; From 0648cde7d849c7cb204bd9cfaec1bf07edfd75a6 Mon Sep 17 00:00:00 2001 From: Alex Hill Date: Thu, 4 May 2017 17:11:11 -0700 Subject: [PATCH 3/5] - Revert dealloc logic regarding direct reference to ivars --- Source/Classes/DZNWebViewController.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Classes/DZNWebViewController.m b/Source/Classes/DZNWebViewController.m index a91e856..69500e8 100644 --- a/Source/Classes/DZNWebViewController.m +++ b/Source/Classes/DZNWebViewController.m @@ -27,8 +27,8 @@ @interface DZNWebViewController () @property (nonatomic, strong) UILongPressGestureRecognizer *backwardLongPress; @property (nonatomic, strong) UILongPressGestureRecognizer *forwardLongPress; -@property (nonatomic, strong) UINavigationBar *navigationBar; @property (nonatomic, weak) UIToolbar *toolbar; +@property (nonatomic, strong) UINavigationBar *navigationBar; @property (nonatomic, weak) UIView *navigationBarSuperView; @property (nonatomic) BOOL completedInitialLoad; @@ -876,12 +876,12 @@ - (void)viewDidUnload - (void)dealloc { - if (_hideBarsWithGestures) { - [_navigationBar removeObserver:self forKeyPath:@"hidden" context:&DZNWebViewControllerKVOContext]; - [_navigationBar removeObserver:self forKeyPath:@"center" context:&DZNWebViewControllerKVOContext]; - [_navigationBar removeObserver:self forKeyPath:@"alpha" context:&DZNWebViewControllerKVOContext]; + if (self.hideBarsWithGestures) { + [self.navigationBar removeObserver:self forKeyPath:@"hidden" context:&DZNWebViewControllerKVOContext]; + [self.navigationBar removeObserver:self forKeyPath:@"center" context:&DZNWebViewControllerKVOContext]; + [self.navigationBar removeObserver:self forKeyPath:@"alpha" context:&DZNWebViewControllerKVOContext]; } - [_webView removeObserver:self forKeyPath:@"loading" context:&DZNWebViewControllerKVOContext]; + [self.webView removeObserver:self forKeyPath:@"loading" context:&DZNWebViewControllerKVOContext]; _backwardBarItem = nil; _forwardBarItem = nil; From 7622293b3cd9fff3d743fd04b63e4c1db7eab3e7 Mon Sep 17 00:00:00 2001 From: Iswariya Madhavan Date: Wed, 17 Jun 2020 16:26:43 +0530 Subject: [PATCH 4/5] Ignore plugin change error. --- Source/Classes/DZNWebViewController.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Classes/DZNWebViewController.m b/Source/Classes/DZNWebViewController.m index 69500e8..9130009 100644 --- a/Source/Classes/DZNWebViewController.m +++ b/Source/Classes/DZNWebViewController.m @@ -15,6 +15,7 @@ #define DZN_IS_LANDSCAPE ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft || [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) static char DZNWebViewControllerKVOContext = 0; +const int isPluginHandledError = 204; @interface DZNWebViewController () @@ -419,7 +420,9 @@ - (void)setLoadingError:(NSError *)error { switch (error.code) { case NSURLErrorUnknown: - case NSURLErrorCancelled: return; + case NSURLErrorCancelled: + case isPluginHandledError: // When there is a plugin in error ignore it, as the content will continue to play. + return; } [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; From a6c4ed705be00748c780296b3048d3631e137bba Mon Sep 17 00:00:00 2001 From: Iswariya Madhavan Date: Wed, 17 Jun 2020 17:18:53 +0530 Subject: [PATCH 5/5] Changed constant name. --- Source/Classes/DZNWebViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Classes/DZNWebViewController.m b/Source/Classes/DZNWebViewController.m index 9130009..637420a 100644 --- a/Source/Classes/DZNWebViewController.m +++ b/Source/Classes/DZNWebViewController.m @@ -15,7 +15,7 @@ #define DZN_IS_LANDSCAPE ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft || [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) static char DZNWebViewControllerKVOContext = 0; -const int isPluginHandledError = 204; +const int KPLUGINHANDLEDERROR = 204; @interface DZNWebViewController () @@ -421,7 +421,7 @@ - (void)setLoadingError:(NSError *)error switch (error.code) { case NSURLErrorUnknown: case NSURLErrorCancelled: - case isPluginHandledError: // When there is a plugin in error ignore it, as the content will continue to play. + case KPLUGINHANDLEDERROR: // When there is a plugin in error ignore it, as the content will continue to play. return; }