TouchInstinct
/
XLPagerTabStrip
314
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename pagerTabStripChildViewControllers to viewControllers

This commit is contained in:
Martin Barreto 2016-01-21 12:56:03 -03:00
parent 16c617f21a
commit 1a31d5a938
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/BarPagerTabStripViewController.swift
View File

@ -39,13 +39,13 @@ public class BarPagerTabStripViewController: PagerTabStripViewController {
if barView.superview == nil {
view.addSubview(barView)
}
barView.optionsCount = pagerTabStripChildViewControllers.count
barView.optionsCount = viewControllers.count
barView.moveToIndex(index: currentIndex, animated: false)
}
public override func reloadPagerTabStripView() {
super.reloadPagerTabStripView()
barView.optionsCount = pagerTabStripChildViewControllers.count
barView.optionsCount = viewControllers.count
if isViewLoaded(){
barView.moveToIndex(index: currentIndex, animated: false)
}

37
Sources/PagerTabStripViewController.swift
View File

@ -28,17 +28,20 @@ import Foundation
// MARK: Protocols
public protocol PagerTabStripChildItem {
func childHeaderForPagerTabStripViewController(pagerTabStripController: PagerTabStripViewController) -> ChildItemInfo
}
public protocol PagerTabStripViewControllerDelegate: class {
func pagerTabStripViewController(pagerTabStripViewController: PagerTabStripViewController, updateIndicatorFromIndex fromIndex: Int, toIndex: Int) throws
func pagerTabStripViewController(pagerTabStripViewController: PagerTabStripViewController, updateIndicatorFromIndex fromIndex: Int, toIndex: Int, withProgressPercentage progressPercentage: Float, indexWasChanged: Bool) throws
}
public protocol PagerTabStripViewControllerDataSource: class {
func childViewControllersForPagerTabStripViewController(pagerTabStripController: PagerTabStripViewController) ->[UIViewController]
}
@ -59,7 +62,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
public var pagerOptions = PagerTabStripOptions.SkipIntermediateViewControllers.union(.IsProgressiveIndicator).union(.IsElasticIndicatorLimit)
private(set) var pagerTabStripChildViewControllers = [UIViewController]()
private(set) var viewControllers = [UIViewController]()
private(set) var currentIndex = 0
public var pageWidth: CGFloat {
@ -98,7 +101,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
guard childViewControllers.count != 0 else {
fatalError("childViewControllersForPagerTabStripViewController should provide at least one child view controller")
}
pagerTabStripChildViewControllers = childViewControllers
viewControllers = childViewControllers
}
override public func viewDidAppear(animated: Bool) {
@ -121,10 +124,10 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
currentIndex = index
}
if animated && pagerOptions.contains(.SkipIntermediateViewControllers) && abs(currentIndex - index) > 1 {
var tmpChildViewControllers = pagerTabStripChildViewControllers
let currentChildVC = pagerTabStripChildViewControllers[currentIndex]
var tmpChildViewControllers = viewControllers
let currentChildVC = viewControllers[currentIndex]
let fromIndex = currentIndex < index ? index - 1 : index + 1
let fromChildVC = pagerTabStripChildViewControllers[fromIndex]
let fromChildVC = viewControllers[fromIndex]
tmpChildViewControllers[currentIndex] = fromChildVC
tmpChildViewControllers[fromIndex] = currentChildVC
pagerTabStripChildViewControllersForScrolling = tmpChildViewControllers
@ -138,11 +141,11 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
}
public func moveToViewController(viewController: UIViewController) {
moveToViewControllerAtIndex(pagerTabStripChildViewControllers.indexOf(viewController)!)
moveToViewControllerAtIndex(viewControllers.indexOf(viewController)!)
}
public func moveToViewController(viewController: UIViewController, animated: Bool) {
moveToViewControllerAtIndex(pagerTabStripChildViewControllers.indexOf(viewController)!, animated: animated)
moveToViewControllerAtIndex(viewControllers.indexOf(viewController)!, animated: animated)
}
//MARK: - PagerTabStripViewControllerDataSource
@ -179,7 +182,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
}
public func canMoveToIndex(index index: Int) -> Bool{
return currentIndex != index && pagerTabStripChildViewControllers.count > index
return currentIndex != index && viewControllers.count > index
}
public func pageOffsetForChildIndex(index index: Int) -> CGFloat{
@ -191,7 +194,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
}
public func offsetForChildViewController(viewController: UIViewController) throws -> CGFloat{
guard let index = self.pagerTabStripChildViewControllers.indexOf(viewController) else {
guard let index = viewControllers.indexOf(viewController) else {
throw PagerTabStripError.ViewControllerNotContainedInPagerTabStripChildViewControllers
}
return offsetForChildIndex(index: index)
@ -210,7 +213,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
if virtualPage < 0 {
return 0
}
if virtualPage > pagerTabStripChildViewControllers.count - 1 { return pagerTabStripChildViewControllers.count - 1 }
if virtualPage > viewControllers.count - 1 { return viewControllers.count - 1 }
return virtualPage
}
@ -325,7 +328,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
public func reloadPagerTabStripView() {
if isViewLoaded() {
for childController in pagerTabStripChildViewControllers {
for childController in viewControllers {
if let _ = childController.parentViewController {
childController.view.removeFromSuperview()
childController.willMoveToParentViewController(nil)
@ -333,10 +336,10 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
}
}
pagerTabStripChildViewControllers = datasource?.childViewControllersForPagerTabStripViewController(self) ?? []
containerView.contentSize = CGSizeMake(CGRectGetWidth(containerView.bounds) * CGFloat(pagerTabStripChildViewControllers.count), containerView.contentSize.height)
if currentIndex >= pagerTabStripChildViewControllers.count {
currentIndex = pagerTabStripChildViewControllers.count - 1
viewControllers = datasource?.childViewControllersForPagerTabStripViewController(self) ?? []
containerView.contentSize = CGSizeMake(CGRectGetWidth(containerView.bounds) * CGFloat(viewControllers.count), containerView.contentSize.height)
if currentIndex >= viewControllers.count {
currentIndex = viewControllers.count - 1
}
containerView.contentOffset = CGPointMake(pageOffsetForChildIndex(index: currentIndex), 0)
updateContent()
@ -389,7 +392,7 @@ public class PagerTabStripViewController: UIViewController, UIScrollViewDelegate
private var pagerTabStripChildViewControllersForScrolling : [UIViewController]?
private var getPagerTabStripChildViewControllersForScrolling : [UIViewController] {
return pagerTabStripChildViewControllersForScrolling ?? pagerTabStripChildViewControllers
return pagerTabStripChildViewControllersForScrolling ?? viewControllers
}
private var lastPageNumber = 0
private var lastContentOffset: CGFloat = 0.0

10
Sources/SegmentedPagerTabStripViewController.swift
View File

@ -49,7 +49,7 @@ public class SegmentedPagerTabStripViewController: PagerTabStripViewController {
func reloadSegmentedControl() throws -> Void {
segmentedControl.removeAllSegments()
for (index, item) in pagerTabStripChildViewControllers.enumerate(){
for (index, item) in viewControllers.enumerate(){
guard let child = item as? PagerTabStripChildItem else {
throw PagerTabStripError.ChildViewControllerMustConformToPagerTabStripChildItem
}
@ -61,7 +61,7 @@ public class SegmentedPagerTabStripViewController: PagerTabStripViewController {
}
}
guard let child = pagerTabStripChildViewControllers[currentIndex] as? PagerTabStripChildItem else {
guard let child = viewControllers[currentIndex] as? PagerTabStripChildItem else {
throw PagerTabStripError.CurrentIndexIsGreaterThanChildsCount
}
segmentedControl.selectedSegmentIndex = currentIndex
@ -82,7 +82,7 @@ public class SegmentedPagerTabStripViewController: PagerTabStripViewController {
override public func pagerTabStripViewController(pagerTabStripViewController: PagerTabStripViewController, updateIndicatorFromIndex fromIndex: Int, toIndex: Int) throws {
try super.pagerTabStripViewController(pagerTabStripViewController, updateIndicatorFromIndex: fromIndex, toIndex: toIndex)
if shouldUpdateSegmentedControl {
guard let child = pagerTabStripChildViewControllers[toIndex] as? PagerTabStripChildItem else {
guard let child = viewControllers[toIndex] as? PagerTabStripChildItem else {
throw PagerTabStripError.CurrentIndexIsGreaterThanChildsCount
}
if let color = child.childHeaderForPagerTabStripViewController(self).color{
@ -95,13 +95,13 @@ public class SegmentedPagerTabStripViewController: PagerTabStripViewController {
public override func pagerTabStripViewController(pagerTabStripViewController: PagerTabStripViewController, updateIndicatorFromIndex fromIndex: Int, toIndex index: Int, withProgressPercentage progressPercentage: Float, indexWasChanged changed: Bool) throws {
if shouldUpdateSegmentedControl{
let currentIndex = (progressPercentage > 0.5) ? index : fromIndex
guard let child = pagerTabStripChildViewControllers[currentIndex] as? PagerTabStripChildItem else {
guard let child = viewControllers[currentIndex] as? PagerTabStripChildItem else {
throw PagerTabStripError.CurrentIndexIsGreaterThanChildsCount
}
if let color = child.childHeaderForPagerTabStripViewController(self).color{
segmentedControl.tintColor = color
}
segmentedControl.selectedSegmentIndex = min(currentIndex, pagerTabStripChildViewControllers.count - 1)
segmentedControl.selectedSegmentIndex = min(currentIndex, viewControllers.count - 1)
}
}