Skip to content
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

Add state methods to delegate #16

Merged
merged 11 commits into from
Feb 13, 2018
Merged

Add state methods to delegate #16

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c2082e
Merge branch 'hotfix/3.6.1'
kawoou Jun 16, 2017
79443ac
Merge branch 'develop'
kawoou Jan 8, 2018
c876b2b
Merge branch 'develop'
kawoou Jan 8, 2018
f867b95
Merge branch 'develop'
kawoou Jan 8, 2018
804b9b3
Merge branch 'develop'
kawoou Jan 9, 2018
96ea347
Merge branch 'develop'
kawoou Jan 9, 2018
8c18b58
Merge branch 'develop'
kawoou Jan 22, 2018
a0a2b8e
Merge branch 'develop'
kawoou Feb 7, 2018
6b76ede
Add state methods to delegate
0xch4z Feb 13, 2018
88e2e99
add Rx support and close state
0xch4z Feb 13, 2018
ccbbc91
fix old drawer state
0xch4z Feb 13, 2018
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
14 changes: 14 additions & 0 deletions DrawerController/DrawerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ public protocol DrawerControllerDelegate {
@objc optional func drawerWillCancelAnimation(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerDidFinishAnimation(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerDidCancelAnimation(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerWillOpenSide(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerWillCloseSide(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerDidOpenSide(drawerController: DrawerController, side: DrawerSide)
@objc optional func drawerDidCloseSide(drawerController: DrawerController, side: DrawerSide)
}

open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
Expand Down Expand Up @@ -229,6 +233,8 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
/// Golden-Path
guard isEnable() else { return }
guard !isAnimating else { return }

delegate?.drawerWillOpenSide?(drawerController: self, side: side)

if drawerSide != .none && side != drawerSide {
closeSide { [weak self] in
Expand All @@ -252,6 +258,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
didFinishAnimate(side: side, percent: 1.0)

isAnimating = false
delegate?.drawerDidOpenSide?(drawerController: self, side: side)
completion?()
return
}
Expand Down Expand Up @@ -279,6 +286,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
ss.didFinishAnimate(side: side, percent: 1.0)

ss.isAnimating = false
ss.delegate?.drawerDidOpenSide?(drawerController: ss, side: side)
completion?()
}
)
Expand All @@ -295,6 +303,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
ss.didFinishAnimate(side: side, percent: 1.0)

ss.isAnimating = false
ss.delegate?.drawerDidOpenSide?(drawerController: ss, side: side)
completion?()
}
)
Expand All @@ -305,6 +314,8 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
/// Golden-Path
guard isEnable() else { return }
guard !isAnimating else { return }

delegate?.drawerWillCloseSide?(drawerController: self, side: drawerSide)

isAnimating = true

Expand All @@ -321,6 +332,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
didFinishAnimate(side: .none, percent: 0.0)

isAnimating = false
delegate?.drawerDidCloseSide?(drawerController: self, side: drawerSide)
completion?()
return
}
Expand All @@ -346,6 +358,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
ss.didFinishAnimate(side: .none, percent: 0.0)

ss.isAnimating = false
ss.delegate?.drawerDidCloseSide?(drawerController: ss, side: ss.drawerSide)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do not write oldValue, there is likely to be some variation in the middle.

let oldDrawerSide = drawerSide

delegate?.drawerWillCloseSide?(drawerController: self, side: oldDrawerSide)

...

ss.delegate?.drawerDidCloseSide?(drawerController: ss, side: oldDrawerSide)

...

completion?()
}
)
Expand All @@ -361,6 +374,7 @@ open class DrawerController: UIViewController, UIGestureRecognizerDelegate {
ss.didFinishAnimate(side: .none, percent: 0.0)

ss.isAnimating = false
ss.delegate?.drawerDidCloseSide?(drawerController: ss, side: ss.drawerSide)
completion?()
}
)
Expand Down
29 changes: 28 additions & 1 deletion DrawerController/Rx/DrawerController+Rx.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,32 @@ extension Reactive where Base: DrawerController {

return ControlEvent(events: source)
}

public var willOpenSide: ControlEvent<DrawerSide> {
let source = delegate
.methodInvoked(#selector(DrawerControllerDelegate.drawerWillOpenSide(drawerController:side:)))
.map { try castOrThrow(DrawerSide.self, $0[1]) }

return ControlEvent(events: source)
}
public var willCloseSide: ControlEvent<DrawerSide> {
let source = delegate
.methodInvoked(#selector(DrawerControllerDelegate.drawerWillCloseSide(drawerController:side:)))
.map { try castOrThrow(DrawerSide.self, $0[1]) }

return ControlEvent(events: source)
}
public var didOpenSide: ControlEvent<DrawerSide> {
let source = delegate
.methodInvoked(#selector(DrawerControllerDelegate.drawerDidOpenSide(drawerController:side:)))
.map { try castOrThrow(DrawerSide.self, $0[1]) }

return ControlEvent(events: source)
}
public var didCloseSide: ControlEvent<DrawerSide> {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

let source = delegate
.methodInvoked(#selector(DrawerControllerDelegate.drawerDidCloseSide(drawerController:side:)))
.map { try castOrThrow(DrawerSide.self, $0[1]) }

return ControlEvent(events: source)
}
}
28 changes: 26 additions & 2 deletions Example/Conroller/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MainViewController: UITabBarController {

override func viewDidLoad() {
super.viewDidLoad()

drawerController?.rx.didAnimation
.subscribe(onNext: { (side, percent) in
print("DrawerController.rx.didAnimation: \(side.stringValue), \(percent)")
Expand Down Expand Up @@ -52,6 +52,30 @@ class MainViewController: UITabBarController {
})
.disposed(by: disposeBag)

drawerController?.rx.willOpenSide
.subscribe(onNext: { (side) in
print("DrawerController.rx.willOpenSide: \(side.stringValue)")
})
.disposed(by: disposeBag)

drawerController?.rx.willCloseSide
.subscribe(onNext: { (side) in
print("DrawerController.rx.willCloseSide: \(side.stringValue)")
})
.disposed(by: disposeBag)

drawerController?.rx.didOpenSide
.subscribe(onNext: { (side) in
print("DrawerController.rx.didOpenSide: \(side.stringValue)")
})
.disposed(by: disposeBag)

drawerController?.rx.didCloseSide
.subscribe(onNext: { (side) in
print("DrawerController.rx.didCloseSide: \(side.stringValue)")
})
.disposed(by: disposeBag)

}

override func didReceiveMemoryWarning() {
Expand Down Expand Up @@ -92,5 +116,5 @@ class MainViewController: UITabBarController {
// Pass the selected object to the new view controller.
}
*/

}