diff --git a/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj b/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj index 66c6090..edd5f06 100644 --- a/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj +++ b/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj @@ -917,7 +917,7 @@ PROVISIONING_PROFILE_SPECIFIER = WildcardProfile; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -940,7 +940,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate index 7329f8d..fed8f11 100644 Binary files a/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate and b/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SJBackGRProject/SwiftVersion/AppDelegate.swift b/SJBackGRProject/SwiftVersion/AppDelegate.swift index 36883c6..c730795 100644 --- a/SJBackGRProject/SwiftVersion/AppDelegate.swift +++ b/SJBackGRProject/SwiftVersion/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // install SJNavigationPopGesture.install() diff --git a/SJBackGRProject/SwiftVersion/TestViewControllerNav.swift b/SJBackGRProject/SwiftVersion/TestViewControllerNav.swift index ac2f598..e8387ed 100644 --- a/SJBackGRProject/SwiftVersion/TestViewControllerNav.swift +++ b/SJBackGRProject/SwiftVersion/TestViewControllerNav.swift @@ -15,7 +15,7 @@ class TestViewControllerNav: UIViewController { let btn = UIButton.init(type: .custom) btn.setTitleColor(UIColor.orange, for: .normal) btn.setTitle("Push", for: .normal) - btn.addTarget(self, action: #selector(push), for: UIControlEvents.touchUpInside) + btn.addTarget(self, action: #selector(push), for: UIControl.Event.touchUpInside) return btn }() @@ -23,7 +23,7 @@ class TestViewControllerNav: UIViewController { let btn = UIButton.init(type: .custom) btn.setTitleColor(UIColor.orange, for: .normal) btn.setTitle("Album", for: .normal) - btn.addTarget(self, action: #selector(album), for: UIControlEvents.touchUpInside) + btn.addTarget(self, action: #selector(album), for: UIControl.Event.touchUpInside) return btn }() @@ -31,7 +31,7 @@ class TestViewControllerNav: UIViewController { let btn = UIButton.init(type: .custom) btn.setTitleColor(UIColor.orange, for: .normal) btn.setTitle("modal_Nav", for: .normal) - btn.addTarget(self, action: #selector(modal_Nav), for: UIControlEvents.touchUpInside) + btn.addTarget(self, action: #selector(modal_Nav), for: UIControl.Event.touchUpInside) return btn }() @@ -39,7 +39,7 @@ class TestViewControllerNav: UIViewController { let btn = UIButton.init(type: .custom) btn.setTitleColor(UIColor.orange, for: .normal) btn.setTitle("Alert", for: .normal) - btn.addTarget(self, action: #selector(alert), for: UIControlEvents.touchUpInside) + btn.addTarget(self, action: #selector(alert), for: UIControl.Event.touchUpInside) return btn }() @@ -107,7 +107,7 @@ class TestViewControllerNav: UIViewController { } @objc private func push() -> Void { - self.navigationController?.pushViewController(ViewControllerMapView(), animated: true) + self.navigationController?.pushViewController(ViewControllerTestTableView(), animated: true) } diff --git a/SJBackGRProject/SwiftVersion/ViewControllerTestTableView.swift b/SJBackGRProject/SwiftVersion/ViewControllerTestTableView.swift index 3f40a03..5bcf075 100644 --- a/SJBackGRProject/SwiftVersion/ViewControllerTestTableView.swift +++ b/SJBackGRProject/SwiftVersion/ViewControllerTestTableView.swift @@ -16,7 +16,7 @@ class ViewControllerTestTableView: UIViewController, UITableViewDataSource, UITa override func viewDidLoad() { super.viewDidLoad() - let tableView = UITableView.init(frame: self.view.frame, style: UITableViewStyle.plain) + let tableView = UITableView.init(frame: self.view.frame, style: UITableView.Style.plain) tableView.rowHeight = 49; tableView .register(UITableViewCell.self, forCellReuseIdentifier: UITableViewCellID) self.view.addSubview(tableView) diff --git a/SJNavigationPopGesture/SJNavigationPopGesture.swift b/SJNavigationPopGesture/SJNavigationPopGesture.swift index 65c300e..44b77c8 100644 --- a/SJNavigationPopGesture/SJNavigationPopGesture.swift +++ b/SJNavigationPopGesture/SJNavigationPopGesture.swift @@ -109,7 +109,7 @@ public extension UINavigationController { } /// pop gesture state. - public var sj_popGestureState: UIGestureRecognizerState { + public var sj_popGestureState: UIGestureRecognizer.State { get { var gesture: UIGestureRecognizer? switch SJ_selectedType { @@ -386,10 +386,10 @@ extension UINavigationController : UIGestureRecognizerDelegate { self.topViewController?.sj_considerWebView?.canGoBack == true ) { return false } - else if ( self.childViewControllers.count <= 1 ) { + else if ( self.children.count <= 1 ) { return false } - else if ( self.childViewControllers.last?.isKind(of: UINavigationController.self) )! { + else if ( self.children.last?.isKind(of: UINavigationController.self) )! { return false } else { @@ -414,8 +414,8 @@ extension UINavigationController : UIGestureRecognizerDelegate { } public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { - if ( gestureRecognizer.state == UIGestureRecognizerState.failed || - gestureRecognizer.state == UIGestureRecognizerState.cancelled ) { + if ( gestureRecognizer.state == UIGestureRecognizer.State.failed || + gestureRecognizer.state == UIGestureRecognizer.State.cancelled ) { return false } @@ -437,21 +437,21 @@ extension UINavigationController : UIGestureRecognizerDelegate { if ( !otherGestureRecognizer.view!.isKind(of: cls) ) { return false } - } - - // if `MKMapContentView` - let point = gestureRecognizer.location(in: gestureRecognizer.view) - if ( (self.topViewController?.sj_fadeArea != nil || self.topViewController?.sj_fadeAreaViews != nil) - && !SJ_isFadeArea(point) ) { - self.SJ_cancellGesture(otherGestureRecognizer) - return true - } - - // map view default fade area - let rect = CGRect.init(origin: CGPoint.init(x: 50, y: 0), size: self.view.frame.size) - if ( !self.rect(rect, containerPoint: point) ) { - self.SJ_cancellGesture(otherGestureRecognizer) - return true + + // if `MKMapContentView` + let point = gestureRecognizer.location(in: gestureRecognizer.view) + if ( (self.topViewController?.sj_fadeArea != nil || self.topViewController?.sj_fadeAreaViews != nil) + && !SJ_isFadeArea(point) ) { + self.SJ_cancellGesture(otherGestureRecognizer) + return true + } + + // map view default fade area + let rect = CGRect.init(origin: CGPoint.init(x: 50, y: 0), size: self.view.frame.size) + if ( !self.rect(rect, containerPoint: point) ) { + self.SJ_cancellGesture(otherGestureRecognizer) + return true + } } return false @@ -552,7 +552,7 @@ extension UINavigationController : UIGestureRecognizerDelegate { } private func SJ_cancellGesture(_ gesture: UIGestureRecognizer) -> Void { - gesture.setValue(UIGestureRecognizerState.cancelled.rawValue, forKey: "state") + gesture.setValue(UIGestureRecognizer.State.cancelled.rawValue, forKey: "state") } @objc private func SJ_handlePanGR(_ pan:UIPanGestureRecognizer) -> Void { @@ -571,7 +571,7 @@ extension UINavigationController : UIGestureRecognizerDelegate { private func SJ_ViewWillBeginDragging(_ offset: CGFloat) -> Void { self.view.endEditing(true) - _SJSnapshotServer.nav(self, preparePopViewController: self.childViewControllers.last!) + _SJSnapshotServer.nav(self, preparePopViewController: self.children.last!) if ( self.topViewController?.sj_viewWillBeginDragging != nil ) { self.topViewController?.sj_viewWillBeginDragging!(self.topViewController!) @@ -587,7 +587,7 @@ extension UINavigationController : UIGestureRecognizerDelegate { } self.view.transform = CGAffineTransform.init(translationX: offset, y: 0) - _SJSnapshotServer.nav(self, poppingViewController: self.childViewControllers.last!, offset: offset) + _SJSnapshotServer.nav(self, poppingViewController: self.children.last!, offset: offset) if ( self.topViewController?.sj_viewDidDrag != nil ) { self.topViewController?.sj_viewDidDrag!(self.topViewController!) } @@ -608,7 +608,7 @@ extension UINavigationController : UIGestureRecognizerDelegate { } UIView.animate(withDuration: TimeInterval(duration), animations: { - _SJSnapshotServer .nav(self, willEndPopViewController: self.childViewControllers.last!, pop: pop) + _SJSnapshotServer .nav(self, willEndPopViewController: self.children.last!, pop: pop) if ( pop ) { self.view.transform = CGAffineTransform.init(translationX: self.view.frame.width, y: 0) } @@ -616,7 +616,7 @@ extension UINavigationController : UIGestureRecognizerDelegate { self.view.transform = CGAffineTransform.identity } }) { (finished) in - _SJSnapshotServer.nav(self, endPopViewController: self.childViewControllers.last!) + _SJSnapshotServer.nav(self, endPopViewController: self.children.last!) if ( pop ) { self.popViewController(animated: false) self.view.transform = CGAffineTransform.identity @@ -739,12 +739,12 @@ fileprivate class _SJSnapshotServer { // MARK: nav action class func nav(_ nav: UINavigationController, pushViewController: UIViewController) { - if ( nav.childViewControllers.count == 0 ) { + if ( nav.children.count == 0 ) { return } - let index = nav.childViewControllers.count - 1 - let currentVC = nav.childViewControllers[index] + let index = nav.children.count - 1 + let currentVC = nav.children[index] if ( nav.isKind(of: UIImagePickerController.self) ) { currentVC.sj_displayMode = .snapshot } @@ -841,7 +841,7 @@ fileprivate class _SJSnapshotRecorder { var index: Int func preparePopViewController() { - let vc = nav.childViewControllers[index] + let vc = nav.children[index] switch vc.sj_displayMode { case .origin: let preview = vc.view @@ -885,7 +885,7 @@ fileprivate class _SJSnapshotRecorder { rootView.addSubview(pre_container!) - let vc = nav.childViewControllers[index] + let vc = nav.children[index] switch vc.sj_displayMode { case .snapshot: pre_snapshot = nav.view.window?.snapshotView(afterScreenUpdates: false)