Skip to content

Commit 2543d12

Browse files
committed
Get rid of additional duration parameter and directly use provided animationDuration
1 parent 5829aab commit 2543d12

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

SampleSporify/MainTabBarController.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public protocol StickyViewControllerSupporting: UITabBarController {
1212
var collapsedHeight: CGFloat { get }
1313
var animationDuration: TimeInterval { get }
1414
func configureCollapsedTrainingView(withChildViewController childViewController: Expandable)
15-
func removeCollapsibleView(withAnimation: Bool, duration: TimeInterval)
16-
func collapseCollapsibleVC(duration: TimeInterval)
15+
func removeCollapsibleView(animated: Bool)
16+
func collapseCollapsibleVC()
1717
}
1818

1919
public class StickyViewControllerSupportingTabBarController: UITabBarController, StickyViewControllerSupporting {
@@ -46,12 +46,12 @@ public class StickyViewControllerSupportingTabBarController: UITabBarController,
4646
collapsableVCFlow!.didMove(toParent: self)
4747
}
4848

49-
final public func removeCollapsibleView(withAnimation: Bool, duration: TimeInterval) {
49+
final public func removeCollapsibleView(animated: Bool) {
5050
guard let collapsableVCFlow = collapsableVCFlow else {
5151
return
5252
}
53-
if withAnimation {
54-
UIView.animate(withDuration: duration,
53+
if animated {
54+
UIView.animate(withDuration: animationDuration,
5555
animations: {
5656
collapsableVCFlow.heightConstraint.constant = 0.0
5757
collapsableVCFlow.view.layoutIfNeeded()
@@ -70,7 +70,7 @@ public class StickyViewControllerSupportingTabBarController: UITabBarController,
7070
}
7171
}
7272

73-
final public func collapseCollapsibleVC(duration: TimeInterval) {
73+
final public func collapseCollapsibleVC() {
7474
guard let collapsableVCFlow = collapsableVCFlow else {
7575
return
7676
}

SampleSporify/SampleChildViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class SampleChildViewController: UIViewController, Expandable {
2121
}
2222

2323
@IBAction func shutDownTapped(_ sender: Any) {
24-
expander?.removeCollapsibleView(withAnimation: true, duration: 0.50)
24+
expander?.removeCollapsibleView(animated: true)
2525
}
2626
@IBAction func collapseFromExpandedTapped(_ sender: Any) {
27-
expander?.collapseCollapsibleVC(duration: 0.50)
27+
expander?.collapseCollapsibleVC()
2828
}
2929
}

SampleSporify/ViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import UIKit
1111
class ViewController: UIViewController {
1212

1313
var tabController: StickyViewControllerSupporting? {
14-
if let tabBarController = tabBarController as? StickyViewControllerSupporting {
14+
if let tabBarController = tabBarController as? StickyViewControllerSupportingTabBarController {
1515
return tabBarController
1616
}
1717
return nil
@@ -27,7 +27,7 @@ class ViewController: UIViewController {
2727
}
2828

2929
@IBAction func removerTapped(_ sender: Any) {
30-
tabController?.removeCollapsibleView(withAnimation: true, duration: 0.5)
30+
tabController?.removeCollapsibleView(animated: true)
3131
}
3232
}
3333

0 commit comments

Comments
 (0)