Skip to content

support swift 4.2 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
monzy613 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support swift 4.2 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions PageController/PageController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(PageController.growCachePolicyToHigh), object: nil)
memCache.removeAllObjects()
if memoryWarningCount < 3 {
perform(#selector(PageController.growCachePolicyAfterMemoryWarning), with: nil, afterDelay: 3.0, inModes: [RunLoopMode.commonModes])
perform(#selector(PageController.growCachePolicyAfterMemoryWarning), with: nil, afterDelay: 3.0, inModes: [RunLoop.Mode.common])
}
}

Expand Down Expand Up @@ -312,8 +312,8 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
for viewController in displayingControllers.allValues {
if let vc = viewController as? UIViewController {
vc.view.removeFromSuperview()
vc.willMove(toParentViewController: nil)
vc.removeFromParentViewController()
vc.willMove(toParent: nil)
vc.removeFromParent()
}
}
memoryWarningCount = 0
Expand Down Expand Up @@ -454,9 +454,9 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
}

fileprivate func addCachedViewController(_ viewController: UIViewController, atIndex index: Int) {
addChildViewController(viewController)
addChild(viewController)
viewController.view.frame = childViewFrames[index]
viewController.didMove(toParentViewController: self)
viewController.didMove(toParent: self)
contentView?.addSubview(viewController.view)
willEnterController(viewController, atIndex: index)
displayingControllers.setObject(viewController, forKey: index as NSCopying)
Expand All @@ -468,18 +468,18 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
if let optionalKeys = keys {
viewController.setValue(values?[index], forKey: optionalKeys[index])
}
addChildViewController(viewController)
addChild(viewController)
viewController.view.frame = childViewFrames.count > 0 ? childViewFrames[index] : view.frame
viewController.didMove(toParentViewController: self)
viewController.didMove(toParent: self)
contentView?.addSubview(viewController.view)
willEnterController(viewController, atIndex: index)
displayingControllers.setObject(viewController, forKey: index as NSCopying)
}

fileprivate func removeViewController(_ viewController: UIViewController, atIndex index: Int) {
viewController.view.removeFromSuperview()
viewController.willMove(toParentViewController: nil)
viewController.removeFromParentViewController()
viewController.willMove(toParent: nil)
viewController.removeFromParent()
displayingControllers.removeObject(forKey: index)
if memCache.object(forKey: NSNumber(integerLiteral: index)) == nil {
willCachedController(viewController, atIndex: index)
Expand All @@ -505,12 +505,12 @@ open class PageController: UIViewController, UIScrollViewDelegate, MenuViewDeleg
menuView?.reload()
guard selectedIndex != 0 else { return }
menuView?.selectItemAtIndex(selectedIndex)
view.bringSubview(toFront: menuView!)
view.bringSubviewToFront(menuView!)
}

@objc fileprivate func growCachePolicyAfterMemoryWarning() {
cachePolicy = CachePolicy.balanced
perform(#selector(PageController.growCachePolicyToHigh), with: nil, afterDelay: 2.0, inModes: [RunLoopMode.commonModes])
perform(#selector(PageController.growCachePolicyToHigh), with: nil, afterDelay: 2.0, inModes: [RunLoop.Mode.common])
}

@objc fileprivate func growCachePolicyToHigh() {
Expand Down
6 changes: 3 additions & 3 deletions PageController/ProgressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ class ProgressView: UIView {
gap = fabs(progress - pos)
sign = progress > pos ? -1 : 1
step = gap / 15.0
link?.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
link?.remove(from: RunLoop.main, forMode: RunLoop.Mode.common)
let tempLink = CADisplayLink(target: self, selector: #selector(ProgressView.progressChanged))
tempLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
tempLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
link = tempLink
}

func progressChanged() {
@objc func progressChanged() {
if gap > 0.000001 {
gap -= step
if gap < 0.0 {
Expand Down
4 changes: 2 additions & 2 deletions WMPageController-Swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "WMPageController-Swift"
s.version = "1.4.0"
s.version = "1.4.1"
s.summary = "An easy solution to page controllers like NetEase News.(Swift Implementation)"
s.homepage = "https://github.com/wangmchn/WMPageController-Swift"
s.license = 'MIT (LICENSE)'
Expand All @@ -13,4 +13,4 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
s.requires_arc = true
end
end