clean up code, add ability to set up pager style through settings.sty…

…le variable

Example/Example/BarExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  BarExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/20/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip

Example/Example/ButtonBarExampleViewController.swift

@@ -1,15 +1,32 @@
+//  ButtonBarExampleViewControlle.swift
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
 //
-//  ButtonBarExampleViewController.swift
-//  Example
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
 //
-//  Created by Santiago on 1/21/16.
 //
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip
 
 public class ButtonBarExampleViewControlle: ButtonBarPagerTabStripViewController {
+
     var isReload = false
 
     public override func viewDidLoad() {
@@ -39,11 +56,10 @@ public class ButtonBarExampleViewControlle: ButtonBarPagerTabStripViewController
             return [child_1, child_2, child_3, child_4, child_5, child_6, child_7, child_8]
         }
 
-        var childViewControllers = [child_1, child_2, child_3, child_4, child_6, child_7, child_8] as Array
-        let count = childViewControllers.count
+        var childViewControllers = [child_1, child_2, child_3, child_4, child_6, child_7, child_8]
 
         for (index, _) in childViewControllers.enumerate(){
-            let nElements = count - index
+            let nElements = childViewControllers.count - index
             let n = (Int(arc4random()) % nElements) + index
             if n != index{
                 swap(&childViewControllers[index], &childViewControllers[n])

Example/Example/ChildExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  ChildExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/18/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip
@@ -25,9 +41,9 @@ class ChildExampleViewController: UIViewController, PagerTabStripChildItem {
         view.addConstraint(NSLayoutConstraint(item: label, attribute: .CenterY, relatedBy: .Equal, toItem: view, attribute: .CenterY, multiplier: 1, constant: -50))
     }
 
-    // MARK: - XLPagerTabStripViewControllerDelegate
+    // MARK: - PagerTabStripChildItem
 
     func childHeaderForPagerTabStripViewController(pagerTabStripController: PagerTabStripViewController) -> ChildItemInfo {
-        return ChildItemInfo(title: "View", image: nil, highlightedImage: nil, color: .whiteColor())
+        return ChildItemInfo(title: "View", image: nil, highlightedImage: nil)
     }
 }

Example/Example/NavButtonBarExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  NavButtonBarExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/22/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip

Example/Example/PostCell.swift

@@ -1,10 +1,26 @@
-//
 //  PostCell.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/18/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import UIKit
 

Example/Example/ReloadExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  ReloadExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/20/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import UIKit
 import XLPagerTabStrip

Example/Example/SegmentedExampleViewController.swift

@@ -1,17 +1,40 @@
-//
 //  SegmentedExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/19/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip
 
 public class SegmentedExampleViewController: SegmentedPagerTabStripViewController {
+
     var isReload = false
 
+    required public init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        // change segmented style
+        settings.style.segmentedControlColor = .whiteColor()
+    }
+
     // MARK: - XLPagerTabStripViewControllerDataSource
 
     override public func childViewControllersForPagerTabStripViewController(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
@@ -24,7 +47,7 @@ public class SegmentedExampleViewController: SegmentedPagerTabStripViewControlle
             return [child_1, child_2, child_3, child_4]
         }
 
-        var childViewControllers = [child_1, child_2, child_3, child_4] as Array
+        var childViewControllers = [child_1, child_2, child_3, child_4]
         let count = childViewControllers.count
 
         for (index, _) in childViewControllers.enumerate(){

Example/Example/TableChildExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  TableChildExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/18/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip
@@ -40,9 +56,9 @@ class TableChildExampleViewController: UITableViewController, PagerTabStripChild
         return cell
     }
 
-    // MARK: - XLPagerTabStripChildItem
+    // MARK: - PagerTabStripChildItem
 
     func childHeaderForPagerTabStripViewController(pagerTabStripController: PagerTabStripViewController) -> ChildItemInfo {
-        return ChildItemInfo(title: "Table View", image: nil, highlightedImage: nil, color: .whiteColor())
+        return ChildItemInfo(title: "Table View", image: nil, highlightedImage: nil)
     }
 }

Example/Example/TwitterExampleViewController.swift

@@ -1,10 +1,26 @@
-//
 //  TwitterExampleViewController.swift
-//  Example
+//  XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
+//
+//  Copyright (c) 2016 Xmartlabs ( http://xmartlabs.com )
+//
 //
-//  Created by Santiago on 1/22/16.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 import Foundation
 import XLPagerTabStrip
@@ -34,11 +50,10 @@ public class TwitterExampleViewController: TwitterPagerTabStripViewController {
             return [child_1, child_2, child_3, child_4, child_5, child_6, child_7, child_8]
         }
 
-        var childViewControllers = [child_1, child_2, child_3, child_4, child_6, child_7, child_8] as Array
-        let count = childViewControllers.count
+        var childViewControllers = [child_1, child_2, child_3, child_4, child_6, child_7, child_8]
 
         for (index, _) in childViewControllers.enumerate(){
-            let nElements = count - index
+            let nElements = childViewControllers.count - index
             let n = (Int(arc4random()) % nElements) + index
             if n != index{
                 swap(&childViewControllers[index], &childViewControllers[n])

Example/Storyboard.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ptL-BW-nEP">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ptL-BW-nEP">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -51,7 +51,7 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="containerView" destination="D5t-1q-KDh" id="EwQ-Ub-iYS"/>
+                        <outlet property="containerView" destination="D5t-1q-KDh" id="sbr-x5-J1L"/>
                         <outlet property="segmentedControl" destination="31B-gy-WIH" id="TxS-id-BP5"/>
                     </connections>
                 </viewController>

Sources/ButtonBarPagerTabStripViewController.swift

@@ -272,12 +272,12 @@ public class ButtonBarPagerTabStripViewController: PagerTabStripViewController,
         var collectionViewContentWidth: CGFloat = 0
 
         for viewController in self.viewControllers {
-            let childController = viewController as? PagerTabStripChildItem
+            let childController = viewController as! PagerTabStripChildItem
 
             let label = UILabel()
             label.translatesAutoresizingMaskIntoConstraints = false
             label.font = self.buttonBarView.labelFont!
-            label.text = childController?.childHeaderForPagerTabStripViewController(self).title
+            label.text = childController.childHeaderForPagerTabStripViewController(self).title
             let labelSize = label.intrinsicContentSize()
 
             let minimumCellWidth = labelSize.width + CGFloat(self.buttonBarView.leftRightMargin! * 2)