diff --git a/Demo/Podfile b/Demo/Podfile new file mode 100644 index 0000000..648dd9f --- /dev/null +++ b/Demo/Podfile @@ -0,0 +1,2 @@ +platform :ios, '6.0' +pod 'SVWebViewController', :git => 'https://github.com/pilot34/SVWebViewController.git' \ No newline at end of file diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock new file mode 100644 index 0000000..01380ef --- /dev/null +++ b/Demo/Podfile.lock @@ -0,0 +1,21 @@ +PODS: + - NJKWebViewProgress (0.2): + - NJKWebViewProgress/Core + - NJKWebViewProgress/ProgressView + - NJKWebViewProgress/Core (0.2) + - NJKWebViewProgress/ProgressView (0.2) + - SVWebViewController (1.0): + - NJKWebViewProgress + +DEPENDENCIES: + - SVWebViewController (from `https://github.com/pilot34/SVWebViewController.git`) + +EXTERNAL SOURCES: + SVWebViewController: + :git: https://github.com/pilot34/SVWebViewController.git + +SPEC CHECKSUMS: + NJKWebViewProgress: fd46c9489d799d97f3b09210886bf83884f6c725 + SVWebViewController: d36c892657f24b9eb8ae39795e7619ce79f7fe94 + +COCOAPODS: 0.29.0 diff --git a/Demo/SVWeb.xcodeproj/project.pbxproj b/Demo/SVWeb.xcodeproj/project.pbxproj index f53c67d..3a8414b 100755 --- a/Demo/SVWeb.xcodeproj/project.pbxproj +++ b/Demo/SVWeb.xcodeproj/project.pbxproj @@ -1,394 +1,698 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; }; - 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 220F0B9F138E0EF400F59FC3 /* SVWebViewController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 220F0B9E138E0EF400F59FC3 /* SVWebViewController.bundle */; }; - 221C80AF13BBDA2F005F0AB8 /* SVWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 221C80AE13BBDA2F005F0AB8 /* SVWebViewController.m */; }; - 22473B9C133800DD00F497E6 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22473B9B133800DD00F497E6 /* MainWindow-iPad.xib */; }; - 22AAF0B61831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0AB1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad.png */; }; - 22AAF0B71831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0AC1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad@2x.png */; }; - 22AAF0B81831F52F00AB15C4 /* SVWebViewControllerActivityChrome.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AAF0AE1831F52F00AB15C4 /* SVWebViewControllerActivityChrome.m */; }; - 22AAF0B91831F52F00AB15C4 /* SVWebViewControllerActivityChrome@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0AF1831F52F00AB15C4 /* SVWebViewControllerActivityChrome@2x.png */; }; - 22AAF0BA1831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0B11831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad.png */; }; - 22AAF0BB1831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0B21831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad@2x.png */; }; - 22AAF0BC1831F52F00AB15C4 /* SVWebViewControllerActivitySafari.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AAF0B41831F52F00AB15C4 /* SVWebViewControllerActivitySafari.m */; }; - 22AAF0BD1831F52F00AB15C4 /* SVWebViewControllerActivitySafari@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0B51831F52F00AB15C4 /* SVWebViewControllerActivitySafari@2x.png */; }; - 22AAF0BF1831F5B300AB15C4 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 22AAF0BE1831F5B300AB15C4 /* README.md */; }; - 22DBB66A1831E05D0008887C /* SVWebViewControllerActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DBB6691831E05D0008887C /* SVWebViewControllerActivity.m */; }; - 22F087701458794B003ECD31 /* SVModalWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F0876F1458794B003ECD31 /* SVModalWebViewController.m */; }; - 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; }; - 28C286E10D94DF7D0034E888 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* ViewController.m */; }; - 28F335F11007B36200424DE2 /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* ViewController.xib */; }; - D53D8F1316A8688600711E30 /* SVWebViewController.strings in Resources */ = {isa = PBXBuildFile; fileRef = D53D8F1516A8688600711E30 /* SVWebViewController.strings */; }; - D5FA63C516A8707A0087531C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D5FA63C416A8707A0087531C /* Default-568h@2x.png */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 1A3406D316B7F32300150B11 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/SVWebViewController.strings"; sourceTree = ""; }; - 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 1D6058910D05DD3D006BFB54 /* SVWeb.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SVWeb.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 220F0B9E138E0EF400F59FC3 /* SVWebViewController.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVWebViewController.bundle; sourceTree = ""; }; - 221C80AD13BBDA2F005F0AB8 /* SVWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWebViewController.h; sourceTree = ""; }; - 221C80AE13BBDA2F005F0AB8 /* SVWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVWebViewController.m; sourceTree = ""; }; - 22473B9B133800DD00F497E6 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = ""; }; - 22AAF0AB1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivityChrome-iPad.png"; sourceTree = ""; }; - 22AAF0AC1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivityChrome-iPad@2x.png"; sourceTree = ""; }; - 22AAF0AD1831F52F00AB15C4 /* SVWebViewControllerActivityChrome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWebViewControllerActivityChrome.h; sourceTree = ""; }; - 22AAF0AE1831F52F00AB15C4 /* SVWebViewControllerActivityChrome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVWebViewControllerActivityChrome.m; sourceTree = ""; }; - 22AAF0AF1831F52F00AB15C4 /* SVWebViewControllerActivityChrome@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivityChrome@2x.png"; sourceTree = ""; }; - 22AAF0B11831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivitySafari-iPad.png"; sourceTree = ""; }; - 22AAF0B21831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivitySafari-iPad@2x.png"; sourceTree = ""; }; - 22AAF0B31831F52F00AB15C4 /* SVWebViewControllerActivitySafari.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWebViewControllerActivitySafari.h; sourceTree = ""; }; - 22AAF0B41831F52F00AB15C4 /* SVWebViewControllerActivitySafari.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVWebViewControllerActivitySafari.m; sourceTree = ""; }; - 22AAF0B51831F52F00AB15C4 /* SVWebViewControllerActivitySafari@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivitySafari@2x.png"; sourceTree = ""; }; - 22AAF0BE1831F5B300AB15C4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; - 22B0DA4C1832008E00B331B3 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SVWebViewController.strings; sourceTree = ""; }; - 22DBB6681831E05D0008887C /* SVWebViewControllerActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWebViewControllerActivity.h; sourceTree = ""; }; - 22DBB6691831E05D0008887C /* SVWebViewControllerActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVWebViewControllerActivity.m; sourceTree = ""; }; - 22F0876E1458794B003ECD31 /* SVModalWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVModalWebViewController.h; sourceTree = ""; }; - 22F0876F1458794B003ECD31 /* SVModalWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVModalWebViewController.m; sourceTree = ""; }; - 28A0AAE50D9B0CCF005BE974 /* SVWeb_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWeb_Prefix.pch; sourceTree = ""; }; - 28AD735F0D9D9599002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; - 28C286DF0D94DF7D0034E888 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 28C286E00D94DF7D0034E888 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 28F335F01007B36200424DE2 /* ViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ViewController.xib; path = ../ViewController.xib; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 431F485D17145A510045AA32 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SVWebViewController.strings; sourceTree = ""; }; - 6DAD2E4EAB184F72ACE29999 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D1107310486CEB800E47090 /* SVWeb-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SVWeb-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; - A0667BBC457D4307AC51AC26 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; }; - D53D8F1716A868C900711E30 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SVWebViewController.strings; sourceTree = ""; }; - D53D8F1816A8693200711E30 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/SVWebViewController.strings"; sourceTree = ""; }; - D53D8F1916A8693A00711E30 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SVWebViewController.strings; sourceTree = ""; }; - D5FA63C416A8707A0087531C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - 28C286DF0D94DF7D0034E888 /* ViewController.h */, - 28C286E00D94DF7D0034E888 /* ViewController.m */, - 28F335F01007B36200424DE2 /* ViewController.xib */, - 1D3623240D0F684500981E51 /* AppDelegate.h */, - 1D3623250D0F684500981E51 /* AppDelegate.m */, - ); - path = Classes; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* SVWeb.app */, - ); - name = Products; - sourceTree = ""; - }; - 2214586C13132D3200ED7D83 /* SVWebViewController */ = { - isa = PBXGroup; - children = ( - 22F0876E1458794B003ECD31 /* SVModalWebViewController.h */, - 22F0876F1458794B003ECD31 /* SVModalWebViewController.m */, - 220F0B9E138E0EF400F59FC3 /* SVWebViewController.bundle */, - 221C80AD13BBDA2F005F0AB8 /* SVWebViewController.h */, - 221C80AE13BBDA2F005F0AB8 /* SVWebViewController.m */, - D53D8F1516A8688600711E30 /* SVWebViewController.strings */, - 22DBB63A1831DD8C0008887C /* UIActivities */, - ); - name = SVWebViewController; - path = ../SVWebViewController; - sourceTree = SOURCE_ROOT; - }; - 22473B9A133800DC00F497E6 /* Resources-iPad */ = { - isa = PBXGroup; - children = ( - 22473B9B133800DD00F497E6 /* MainWindow-iPad.xib */, - ); - name = "Resources-iPad"; - sourceTree = ""; - }; - 22AAF0AA1831F52F00AB15C4 /* Chrome */ = { - isa = PBXGroup; - children = ( - 22AAF0AB1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad.png */, - 22AAF0AC1831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad@2x.png */, - 22AAF0AD1831F52F00AB15C4 /* SVWebViewControllerActivityChrome.h */, - 22AAF0AE1831F52F00AB15C4 /* SVWebViewControllerActivityChrome.m */, - 22AAF0AF1831F52F00AB15C4 /* SVWebViewControllerActivityChrome@2x.png */, - ); - path = Chrome; - sourceTree = ""; - }; - 22AAF0B01831F52F00AB15C4 /* Safari */ = { - isa = PBXGroup; - children = ( - 22AAF0B11831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad.png */, - 22AAF0B21831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad@2x.png */, - 22AAF0B31831F52F00AB15C4 /* SVWebViewControllerActivitySafari.h */, - 22AAF0B41831F52F00AB15C4 /* SVWebViewControllerActivitySafari.m */, - 22AAF0B51831F52F00AB15C4 /* SVWebViewControllerActivitySafari@2x.png */, - ); - path = Safari; - sourceTree = ""; - }; - 22DBB63A1831DD8C0008887C /* UIActivities */ = { - isa = PBXGroup; - children = ( - 22DBB6681831E05D0008887C /* SVWebViewControllerActivity.h */, - 22DBB6691831E05D0008887C /* SVWebViewControllerActivity.m */, - 22AAF0B01831F52F00AB15C4 /* Safari */, - 22AAF0AA1831F52F00AB15C4 /* Chrome */, - ); - path = UIActivities; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - 22AAF0BE1831F5B300AB15C4 /* README.md */, - 080E96DDFE201D6D7F000001 /* Classes */, - 2214586C13132D3200ED7D83 /* SVWebViewController */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 22473B9A133800DC00F497E6 /* Resources-iPad */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - A0667BBC457D4307AC51AC26 /* Pods.xcconfig */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 28A0AAE50D9B0CCF005BE974 /* SVWeb_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 28AD735F0D9D9599002E5188 /* MainWindow.xib */, - D5FA63C416A8707A0087531C /* Default-568h@2x.png */, - 8D1107310486CEB800E47090 /* SVWeb-Info.plist */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, - 1D30AB110D05D00D00671497 /* Foundation.framework */, - 6DAD2E4EAB184F72ACE29999 /* libPods.a */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* SVWeb */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "SVWeb" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = SVWeb; - productName = SVWeb; - productReference = 1D6058910D05DD3D006BFB54 /* SVWeb.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0500; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SVWeb" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - fr, - de, - "es-ES", - es, - "zh-Hant", - cs, - eu, - fi, - it, - ja, - ko, - nl, - no, - pl, - pt, - ru, - sk, - sv, - vi, - zh_CN, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* SVWeb */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */, - 22AAF0BA1831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad.png in Resources */, - 22AAF0BB1831F52F00AB15C4 /* SVWebViewControllerActivitySafari-iPad@2x.png in Resources */, - 22AAF0B71831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad@2x.png in Resources */, - 22AAF0B61831F52F00AB15C4 /* SVWebViewControllerActivityChrome-iPad.png in Resources */, - 28F335F11007B36200424DE2 /* ViewController.xib in Resources */, - 22473B9C133800DD00F497E6 /* MainWindow-iPad.xib in Resources */, - 220F0B9F138E0EF400F59FC3 /* SVWebViewController.bundle in Resources */, - 22AAF0BD1831F52F00AB15C4 /* SVWebViewControllerActivitySafari@2x.png in Resources */, - 22AAF0BF1831F5B300AB15C4 /* README.md in Resources */, - D53D8F1316A8688600711E30 /* SVWebViewController.strings in Resources */, - 22AAF0B91831F52F00AB15C4 /* SVWebViewControllerActivityChrome@2x.png in Resources */, - D5FA63C516A8707A0087531C /* Default-568h@2x.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1D60589B0D05DD56006BFB54 /* main.m in Sources */, - 22DBB66A1831E05D0008887C /* SVWebViewControllerActivity.m in Sources */, - 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */, - 28C286E10D94DF7D0034E888 /* ViewController.m in Sources */, - 221C80AF13BBDA2F005F0AB8 /* SVWebViewController.m in Sources */, - 22F087701458794B003ECD31 /* SVModalWebViewController.m in Sources */, - 22AAF0B81831F52F00AB15C4 /* SVWebViewControllerActivityChrome.m in Sources */, - 22AAF0BC1831F52F00AB15C4 /* SVWebViewControllerActivitySafari.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - D53D8F1516A8688600711E30 /* SVWebViewController.strings */ = { - isa = PBXVariantGroup; - children = ( - D53D8F1716A868C900711E30 /* en */, - D53D8F1816A8693200711E30 /* es-ES */, - D53D8F1916A8693A00711E30 /* es */, - 1A3406D316B7F32300150B11 /* zh-Hant */, - 431F485D17145A510045AA32 /* fr */, - 22B0DA4C1832008E00B331B3 /* ja */, - ); - name = SVWebViewController.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ENABLE_OBJC_ARC = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = SVWeb_Prefix.pch; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - INFOPLIST_FILE = "SVWeb-Info.plist"; - PRODUCT_NAME = SVWeb; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "SVWeb" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SVWeb" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} + + + + + archiveVersion + 1 + classes + + objectVersion + 46 + objects + + 080E96DDFE201D6D7F000001 + + children + + 28C286DF0D94DF7D0034E888 + 28C286E00D94DF7D0034E888 + 28F335F01007B36200424DE2 + 1D3623240D0F684500981E51 + 1D3623250D0F684500981E51 + + isa + PBXGroup + path + Classes + sourceTree + <group> + + 19C28FACFE9D520D11CA2CBB + + children + + 1D6058910D05DD3D006BFB54 + + isa + PBXGroup + name + Products + sourceTree + <group> + + 1D30AB110D05D00D00671497 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + Foundation.framework + path + System/Library/Frameworks/Foundation.framework + sourceTree + SDKROOT + + 1D3623240D0F684500981E51 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + AppDelegate.h + sourceTree + <group> + + 1D3623250D0F684500981E51 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + AppDelegate.m + sourceTree + <group> + + 1D3623260D0F684500981E51 + + fileRef + 1D3623250D0F684500981E51 + isa + PBXBuildFile + + 1D60588D0D05DD3D006BFB54 + + buildActionMask + 2147483647 + files + + 28AD73600D9D9599002E5188 + 28F335F11007B36200424DE2 + 22473B9C133800DD00F497E6 + 22AAF0BF1831F5B300AB15C4 + D5FA63C516A8707A0087531C + + isa + PBXResourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 1D60588E0D05DD3D006BFB54 + + buildActionMask + 2147483647 + files + + 1D60589B0D05DD56006BFB54 + 1D3623260D0F684500981E51 + 28C286E10D94DF7D0034E888 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 1D60588F0D05DD3D006BFB54 + + buildActionMask + 2147483647 + files + + 1D60589F0D05DD5A006BFB54 + 1DF5F4E00D08C38300B7A737 + 5272E57C0EB543868DCC528A + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 1D6058900D05DD3D006BFB54 + + buildConfigurationList + 1D6058960D05DD3E006BFB54 + buildPhases + + DDBCADFDD584442382BECF15 + 1D60588D0D05DD3D006BFB54 + 1D60588E0D05DD3D006BFB54 + 1D60588F0D05DD3D006BFB54 + 4CEE75F78DE5435AB64181CD + + buildRules + + dependencies + + isa + PBXNativeTarget + name + SVWeb + productName + SVWeb + productReference + 1D6058910D05DD3D006BFB54 + productType + com.apple.product-type.application + + 1D6058910D05DD3D006BFB54 + + explicitFileType + wrapper.application + includeInIndex + 0 + isa + PBXFileReference + path + SVWeb.app + sourceTree + BUILT_PRODUCTS_DIR + + 1D6058940D05DD3E006BFB54 + + baseConfigurationReference + A0667BBC457D4307AC51AC26 + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_ENABLE_OBJC_ARC + YES + COPY_PHASE_STRIP + NO + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + SVWeb_Prefix.pch + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INFOPLIST_FILE + SVWeb-Info.plist + PRODUCT_NAME + SVWeb + SDKROOT + iphoneos + TARGETED_DEVICE_FAMILY + 1,2 + + isa + XCBuildConfiguration + name + Debug + + 1D6058960D05DD3E006BFB54 + + buildConfigurations + + 1D6058940D05DD3E006BFB54 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Debug + isa + XCConfigurationList + + 1D60589B0D05DD56006BFB54 + + fileRef + 29B97316FDCFA39411CA2CEA + isa + PBXBuildFile + + 1D60589F0D05DD5A006BFB54 + + fileRef + 1D30AB110D05D00D00671497 + isa + PBXBuildFile + + 1DF5F4DF0D08C38300B7A737 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + UIKit.framework + path + System/Library/Frameworks/UIKit.framework + sourceTree + SDKROOT + + 1DF5F4E00D08C38300B7A737 + + fileRef + 1DF5F4DF0D08C38300B7A737 + isa + PBXBuildFile + + 22473B9A133800DC00F497E6 + + children + + 22473B9B133800DD00F497E6 + + isa + PBXGroup + name + Resources-iPad + sourceTree + <group> + + 22473B9B133800DD00F497E6 + + isa + PBXFileReference + lastKnownFileType + file.xib + name + MainWindow-iPad.xib + path + Resources-iPad/MainWindow-iPad.xib + sourceTree + <group> + + 22473B9C133800DD00F497E6 + + fileRef + 22473B9B133800DD00F497E6 + isa + PBXBuildFile + + 22AAF0BE1831F5B300AB15C4 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + text + name + README.md + path + ../README.md + sourceTree + <group> + + 22AAF0BF1831F5B300AB15C4 + + fileRef + 22AAF0BE1831F5B300AB15C4 + isa + PBXBuildFile + + 28A0AAE50D9B0CCF005BE974 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + SVWeb_Prefix.pch + sourceTree + <group> + + 28AD735F0D9D9599002E5188 + + isa + PBXFileReference + lastKnownFileType + file.xib + path + MainWindow.xib + sourceTree + <group> + + 28AD73600D9D9599002E5188 + + fileRef + 28AD735F0D9D9599002E5188 + isa + PBXBuildFile + + 28C286DF0D94DF7D0034E888 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + ViewController.h + sourceTree + <group> + + 28C286E00D94DF7D0034E888 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + ViewController.m + sourceTree + <group> + + 28C286E10D94DF7D0034E888 + + fileRef + 28C286E00D94DF7D0034E888 + isa + PBXBuildFile + + 28F335F01007B36200424DE2 + + isa + PBXFileReference + lastKnownFileType + file.xib + name + ViewController.xib + path + ../ViewController.xib + sourceTree + <group> + + 28F335F11007B36200424DE2 + + fileRef + 28F335F01007B36200424DE2 + isa + PBXBuildFile + + 29B97313FDCFA39411CA2CEA + + attributes + + LastUpgradeCheck + 0500 + + buildConfigurationList + C01FCF4E08A954540054247B + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 1 + isa + PBXProject + knownRegions + + English + Japanese + French + German + en + fr + de + es-ES + es + zh-Hant + cs + eu + fi + it + ja + ko + nl + no + pl + pt + ru + sk + sv + vi + zh_CN + + mainGroup + 29B97314FDCFA39411CA2CEA + projectDirPath + + projectReferences + + projectRoot + + targets + + 1D6058900D05DD3D006BFB54 + + + 29B97314FDCFA39411CA2CEA + + children + + 22AAF0BE1831F5B300AB15C4 + 080E96DDFE201D6D7F000001 + 29B97315FDCFA39411CA2CEA + 29B97317FDCFA39411CA2CEA + 22473B9A133800DC00F497E6 + 29B97323FDCFA39411CA2CEA + 19C28FACFE9D520D11CA2CBB + A0667BBC457D4307AC51AC26 + + isa + PBXGroup + name + CustomTemplate + sourceTree + <group> + + 29B97315FDCFA39411CA2CEA + + children + + 28A0AAE50D9B0CCF005BE974 + 29B97316FDCFA39411CA2CEA + + isa + PBXGroup + name + Other Sources + sourceTree + <group> + + 29B97316FDCFA39411CA2CEA + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + main.m + sourceTree + <group> + + 29B97317FDCFA39411CA2CEA + + children + + 28AD735F0D9D9599002E5188 + D5FA63C416A8707A0087531C + 8D1107310486CEB800E47090 + + isa + PBXGroup + name + Resources + sourceTree + <group> + + 29B97323FDCFA39411CA2CEA + + children + + 1DF5F4DF0D08C38300B7A737 + 1D30AB110D05D00D00671497 + 6DAD2E4EAB184F72ACE29999 + + isa + PBXGroup + name + Frameworks + sourceTree + <group> + + 4CEE75F78DE5435AB64181CD + + buildActionMask + 2147483647 + files + + inputPaths + + isa + PBXShellScriptBuildPhase + name + Copy Pods Resources + outputPaths + + runOnlyForDeploymentPostprocessing + 0 + shellPath + /bin/sh + shellScript + "${SRCROOT}/Pods/Pods-resources.sh" + + showEnvVarsInLog + 0 + + 5272E57C0EB543868DCC528A + + fileRef + 6DAD2E4EAB184F72ACE29999 + isa + PBXBuildFile + + 6DAD2E4EAB184F72ACE29999 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + path + libPods.a + sourceTree + BUILT_PRODUCTS_DIR + + 8D1107310486CEB800E47090 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + text.plist.xml + path + SVWeb-Info.plist + plistStructureDefinitionIdentifier + com.apple.xcode.plist.structure-definition.iphone.info-plist + sourceTree + <group> + + A0667BBC457D4307AC51AC26 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + name + Pods.xcconfig + path + Pods/Pods.xcconfig + sourceTree + <group> + + C01FCF4E08A954540054247B + + buildConfigurations + + C01FCF4F08A954540054247B + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Debug + isa + XCConfigurationList + + C01FCF4F08A954540054247B + + buildSettings + + CLANG_ENABLE_OBJC_ARC + NO + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + GCC_C_LANGUAGE_STANDARD + c99 + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + ONLY_ACTIVE_ARCH + YES + SDKROOT + iphoneos + + isa + XCBuildConfiguration + name + Debug + + D5FA63C416A8707A0087531C + + isa + PBXFileReference + lastKnownFileType + image.png + path + Default-568h@2x.png + sourceTree + <group> + + D5FA63C516A8707A0087531C + + fileRef + D5FA63C416A8707A0087531C + isa + PBXBuildFile + + DDBCADFDD584442382BECF15 + + buildActionMask + 2147483647 + files + + inputPaths + + isa + PBXShellScriptBuildPhase + name + Check Pods Manifest.lock + outputPaths + + runOnlyForDeploymentPostprocessing + 0 + shellPath + /bin/sh + shellScript + diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null +if [[ $? != 0 ]] ; then + cat << EOM +error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. +EOM + exit 1 +fi + + showEnvVarsInLog + 0 + + + rootObject + 29B97313FDCFA39411CA2CEA + + diff --git a/Demo/SVWeb.xcworkspace/contents.xcworkspacedata b/Demo/SVWeb.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..01497e6 --- /dev/null +++ b/Demo/SVWeb.xcworkspace/contents.xcworkspacedata @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Demo/SVWeb.xcworkspace/xcshareddata/SVWeb.xccheckout b/Demo/SVWeb.xcworkspace/xcshareddata/SVWeb.xccheckout new file mode 100644 index 0000000..2ab0e8b --- /dev/null +++ b/Demo/SVWeb.xcworkspace/xcshareddata/SVWeb.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 7FBBD4B1-99D4-49D8-AF2C-0FE239469EDA + IDESourceControlProjectName + SVWeb + IDESourceControlProjectOriginsDictionary + + 096512C9-BDD9-46BE-A961-EFE6E1D08FBB + https://github.com/pilot34/SVWebViewController.git + + IDESourceControlProjectPath + Demo/SVWeb.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 096512C9-BDD9-46BE-A961-EFE6E1D08FBB + ../.. + + IDESourceControlProjectURL + https://github.com/pilot34/SVWebViewController.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 096512C9-BDD9-46BE-A961-EFE6E1D08FBB + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 096512C9-BDD9-46BE-A961-EFE6E1D08FBB + IDESourceControlWCCName + SVWebViewController + + + + diff --git a/SVWebViewController.podspec b/SVWebViewController.podspec index fa48ca4..f0811a2 100644 --- a/SVWebViewController.podspec +++ b/SVWebViewController.podspec @@ -5,9 +5,10 @@ Pod::Spec.new do |s| s.homepage = 'http://samvermette.com/173' s.license = 'MIT' s.author = { 'Sam Vermette' => 'hello@samvermette.com' } - s.source = { :git => 'https://github.com/samvermette/SVWebViewController.git', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/pilot34/SVWebViewController.git', :tag => s.version.to_s } s.platform = :ios, '6.0' s.source_files = 'SVWebViewController/**/*.{h,m}' s.resources = 'SVWebViewController/**/*.{bundle,png}' s.requires_arc = true + s.dependency 'NJKWebViewProgress' end diff --git a/SVWebViewController/SVWebViewController.m b/SVWebViewController/SVWebViewController.m index 2e08ebc..a3afbf8 100644 --- a/SVWebViewController/SVWebViewController.m +++ b/SVWebViewController/SVWebViewController.m @@ -9,8 +9,10 @@ #import "SVWebViewControllerActivityChrome.h" #import "SVWebViewControllerActivitySafari.h" #import "SVWebViewController.h" +#import "NJKWebViewProgressView.h" +#import "NJKWebViewProgress.h" -@interface SVWebViewController () +@interface SVWebViewController () @property (nonatomic, strong) UIBarButtonItem *backBarButtonItem; @property (nonatomic, strong) UIBarButtonItem *forwardBarButtonItem; @@ -21,6 +23,9 @@ @interface SVWebViewController () @property (nonatomic, strong) UIWebView *webView; @property (nonatomic, strong) NSURL *URL; +@property (strong, nonatomic) NJKWebViewProgressView *progressView; +@property (strong, nonatomic) NJKWebViewProgress *progressProxy; + - (id)initWithAddress:(NSString*)urlString; - (id)initWithURL:(NSURL*)URL; - (void)loadURL:(NSURL*)URL; @@ -73,6 +78,7 @@ - (void)loadView { - (void)viewDidLoad { [super viewDidLoad]; [self updateToolbarItems]; + [self prepareProgress]; } - (void)viewDidUnload { @@ -93,6 +99,8 @@ - (void)viewWillAppear:(BOOL)animated { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { [self.navigationController setToolbarHidden:NO animated:animated]; } + + [self.navigationController.navigationBar addSubview:self.progressView]; } - (void)viewWillDisappear:(BOOL)animated { @@ -101,6 +109,8 @@ - (void)viewWillDisappear:(BOOL)animated { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { [self.navigationController setToolbarHidden:YES animated:animated]; } + + [self.progressView removeFromSuperview]; } - (void)viewDidDisappear:(BOOL)animated { @@ -169,6 +179,20 @@ - (UIBarButtonItem *)actionBarButtonItem { return _actionBarButtonItem; } +#pragma mark - Progress + +- (void)prepareProgress { + self.progressProxy = [[NJKWebViewProgress alloc] init]; + self.webView.delegate = self.progressProxy; + self.progressProxy.webViewProxyDelegate = self; + self.progressProxy.progressDelegate = self; + + CGFloat progressBarHeight = 2.5f; + CGRect navigaitonBarBounds = self.navigationController.navigationBar.bounds; + CGRect barFrame = CGRectMake(0, navigaitonBarBounds.size.height - progressBarHeight, navigaitonBarBounds.size.width, progressBarHeight); + self.progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame]; +} + #pragma mark - Toolbar - (void)updateToolbarItems { @@ -272,4 +296,9 @@ - (void)doneButtonClicked:(id)sender { [self dismissViewControllerAnimated:YES completion:NULL]; } +#pragma mark - NJKWebViewProgressDelegate +- (void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress { + [self.progressView setProgress:progress animated:YES]; +} + @end