diff --git a/Pod/Classes/SideMenuManager.swift b/Pod/Classes/SideMenuManager.swift index 247b0ac..7bd949a 100644 --- a/Pod/Classes/SideMenuManager.swift +++ b/Pod/Classes/SideMenuManager.swift @@ -115,7 +115,7 @@ open class SideMenuManager: NSObject { open var menuAnimationOptions: UIView.AnimationOptions = .curveEaseInOut /// Animation curve of the remaining animation when the menu is partially dismissed with gestures. Default is .easeIn. - open var menuAnimationCompletionCurve: UIViewAnimationCurve = .easeIn + open var menuAnimationCompletionCurve: UIView.AnimationCurve = .easeIn /// The animation spring damping when a menu is displayed. Ignored when displayed with a gesture. open var menuAnimationUsingSpringWithDamping: CGFloat = 1 diff --git a/Pod/Classes/SideMenuTransition.swift b/Pod/Classes/SideMenuTransition.swift index 7979d79..6779697 100644 --- a/Pod/Classes/SideMenuTransition.swift +++ b/Pod/Classes/SideMenuTransition.swift @@ -63,8 +63,8 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition { required public init(sideMenuManager: SideMenuManager) { super.init() - NotificationCenter.default.addObserver(self, selector:#selector(handleNotification), name: .UIApplicationDidEnterBackground, object: nil) - NotificationCenter.default.addObserver(self, selector:#selector(handleNotification), name: .UIApplicationWillChangeStatusBarFrame, object: nil) + NotificationCenter.default.addObserver(self, selector:#selector(handleNotification), name: UIApplication.didEnterBackgroundNotification, object: nil) + NotificationCenter.default.addObserver(self, selector:#selector(handleNotification), name: UIApplication.willChangeStatusBarFrameNotification, object: nil) self.sideMenuManager = sideMenuManager } @@ -367,7 +367,7 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition { originalSuperview.addSubview(mainViewController.view) } - if notification.name == .UIApplicationDidEnterBackground { + if notification.name == UIApplication.didEnterBackgroundNotification { hideMenuStart().hideMenuComplete() menuViewController?.dismiss(animated: false, completion: nil) return @@ -488,7 +488,7 @@ extension SideMenuTransition: UIViewControllerAnimatedTransitioning { self.tapView = tapView } if let statusBarView = self.statusBarView { - container.bringSubview(toFront: statusBarView) + container.bringSubviewToFront(statusBarView) } return diff --git a/Pod/Classes/UISideMenuNavigationController.swift b/Pod/Classes/UISideMenuNavigationController.swift index 68ab663..1a2ee47 100644 --- a/Pod/Classes/UISideMenuNavigationController.swift +++ b/Pod/Classes/UISideMenuNavigationController.swift @@ -233,11 +233,11 @@ open class UISideMenuNavigationController: UINavigationController { return } - NotificationCenter.default.removeObserver(self.transition, name: .UIApplicationWillChangeStatusBarFrame, object: nil) + NotificationCenter.default.removeObserver(self.transition, name: UIApplication.willChangeStatusBarFrameNotification, object: nil) coordinator.animate(alongsideTransition: { (context) in self.transition.presentMenuStart() }) { (context) in - NotificationCenter.default.addObserver(self.transition, selector:#selector(SideMenuTransition.handleNotification), name: .UIApplicationWillChangeStatusBarFrame, object: nil) + NotificationCenter.default.addObserver(self.transition, selector:#selector(SideMenuTransition.handleNotification), name: UIApplication.willChangeStatusBarFrameNotification, object: nil) } } diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index e2e26f1..371d4db 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -329,6 +329,11 @@ attributes = { LastSwiftUpdateCheck = 0730; LastUpgradeCheck = 0930; + TargetAttributes = { + 88B64A039CB85A823B85B2EF1C336387 = { + LastSwiftMigration = 1000; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -478,7 +483,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -709,7 +714,7 @@ PRODUCT_NAME = SideMenu; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/SideMenu.xcodeproj/project.pbxproj b/SideMenu.xcodeproj/project.pbxproj index ae37297..4170bb7 100644 --- a/SideMenu.xcodeproj/project.pbxproj +++ b/SideMenu.xcodeproj/project.pbxproj @@ -7,12 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 108F6C478E56A4CA081F8E09 /* Pods_Example_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52C8DD7BE43A8987854CA726 /* Pods_Example_ExampleTests.framework */; }; - 456193561EADC00AC505B531 /* Pods_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D1435FAD2F735E43F383BE96 /* Pods_ExampleTests.framework */; }; 65FF1B3E1DE321D8007B0845 /* SideMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 65FF1B3D1DE321D8007B0845 /* SideMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7B48A0D61DCB2487002990A1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0D51DCB2487002990A1 /* AppDelegate.swift */; }; 7B48A0DD1DCB2487002990A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B48A0DC1DCB2487002990A1 /* Assets.xcassets */; }; - 7B48A0EB1DCB2487002990A1 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0EA1DCB2487002990A1 /* Tests.swift */; }; 7B48A0F61DCB2518002990A1 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F31DCB2518002990A1 /* MainViewController.swift */; }; 7B48A0F71DCB2518002990A1 /* PresentedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F41DCB2518002990A1 /* PresentedViewController.swift */; }; 7B48A0F81DCB2518002990A1 /* SideMenuTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F51DCB2518002990A1 /* SideMenuTableViewController.swift */; }; @@ -28,16 +25,6 @@ ACD6DAED90DE36FEA68CDF38 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47896ABC5C8830D88945A8D3 /* Pods_Example.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7B48A0E71DCB2487002990A1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7B9DC8FB1DC6E8C1000D4007 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7B48A0D21DCB2487002990A1; - remoteInfo = Example; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 1F17B9D56ADA958C611FAA83 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = ""; }; 281FB58A39C022692CEEBF0D /* Pods-Example-ExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-ExampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests.debug.xcconfig"; sourceTree = ""; }; @@ -48,7 +35,6 @@ 7B48A0D51DCB2487002990A1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7B48A0DC1DCB2487002990A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7B48A0E11DCB2487002990A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 7B48A0E61DCB2487002990A1 /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7B48A0EA1DCB2487002990A1 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; 7B48A0EC1DCB2487002990A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7B48A0F31DCB2518002990A1 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; @@ -80,15 +66,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7B48A0E31DCB2487002990A1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 456193561EADC00AC505B531 /* Pods_ExampleTests.framework in Frameworks */, - 108F6C478E56A4CA081F8E09 /* Pods_Example_ExampleTests.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 7B9DC9001DC6E8C1000D4007 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -161,7 +138,6 @@ children = ( 7B9DC9041DC6E8C1000D4007 /* SideMenu.framework */, 7B48A0D31DCB2487002990A1 /* Example.app */, - 7B48A0E61DCB2487002990A1 /* ExampleTests.xctest */, ); name = Products; sourceTree = ""; @@ -233,27 +209,6 @@ productReference = 7B48A0D31DCB2487002990A1 /* Example.app */; productType = "com.apple.product-type.application"; }; - 7B48A0E51DCB2487002990A1 /* ExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7B48A0F21DCB2487002990A1 /* Build configuration list for PBXNativeTarget "ExampleTests" */; - buildPhases = ( - 189AEFF809982E08C107BDD8 /* [CP] Check Pods Manifest.lock */, - 7B48A0E21DCB2487002990A1 /* Sources */, - 7B48A0E31DCB2487002990A1 /* Frameworks */, - 7B48A0E41DCB2487002990A1 /* Resources */, - A5F2AF9B69C815BBA71DAD09 /* [CP] Embed Pods Frameworks */, - 3625CA9A4E129791488E06FE /* [CP] Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - 7B48A0E81DCB2487002990A1 /* PBXTargetDependency */, - ); - name = ExampleTests; - productName = ExampleTests; - productReference = 7B48A0E61DCB2487002990A1 /* ExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 7B9DC9031DC6E8C1000D4007 /* SideMenu */ = { isa = PBXNativeTarget; buildConfigurationList = 7B9DC90C1DC6E8C1000D4007 /* Build configuration list for PBXNativeTarget "SideMenu" */; @@ -284,15 +239,10 @@ TargetAttributes = { 7B48A0D21DCB2487002990A1 = { CreatedOnToolsVersion = 8.0; + DevelopmentTeam = QTJ767UH3L; LastSwiftMigration = 0900; ProvisioningStyle = Automatic; }; - 7B48A0E51DCB2487002990A1 = { - CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; - ProvisioningStyle = Automatic; - TestTargetID = 7B48A0D21DCB2487002990A1; - }; 7B9DC9031DC6E8C1000D4007 = { CreatedOnToolsVersion = 8.0; LastSwiftMigration = 0900; @@ -315,7 +265,6 @@ targets = ( 7B9DC9031DC6E8C1000D4007 /* SideMenu */, 7B48A0D21DCB2487002990A1 /* Example */, - 7B48A0E51DCB2487002990A1 /* ExampleTests */, ); }; /* End PBXProject section */ @@ -331,13 +280,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7B48A0E41DCB2487002990A1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 7B9DC9021DC6E8C1000D4007 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -351,36 +293,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 189AEFF809982E08C107BDD8 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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; - }; - 3625CA9A4E129791488E06FE /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 558DEC0A930F44C17D50F99B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -411,21 +323,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - A5F2AF9B69C815BBA71DAD09 /* [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-Example-ExampleTests/Pods-Example-ExampleTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; B96CD08B77E6CAC7B3180AE2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -455,14 +352,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7B48A0E21DCB2487002990A1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7B48A0EB1DCB2487002990A1 /* Tests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 7B9DC8FF1DC6E8C1000D4007 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -476,14 +365,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 7B48A0E81DCB2487002990A1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7B48A0D21DCB2487002990A1 /* Example */; - targetProxy = 7B48A0E71DCB2487002990A1 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 7B48A0ED1DCB2487002990A1 /* Debug */ = { isa = XCBuildConfiguration; @@ -513,36 +394,6 @@ }; name = Release; }; - 7B48A0EF1DCB2487002990A1 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 281FB58A39C022692CEEBF0D /* Pods-Example-ExampleTests.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = ExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.jonkykong.ExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; - }; - name = Debug; - }; - 7B48A0F01DCB2487002990A1 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CAE41BBB5F14E59C1FA0A821 /* Pods-Example-ExampleTests.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = ExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.jonkykong.ExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; - }; - name = Release; - }; 7B9DC90A1DC6E8C1000D4007 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -717,15 +568,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7B48A0F21DCB2487002990A1 /* Build configuration list for PBXNativeTarget "ExampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7B48A0EF1DCB2487002990A1 /* Debug */, - 7B48A0F01DCB2487002990A1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 7B9DC8FE1DC6E8C1000D4007 /* Build configuration list for PBXProject "SideMenu" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/SideMenu.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SideMenu.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/SideMenu.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + +