Convert XLPagerTabStrip to Swift 3 #226

mats-claassen · 2016-09-14T18:26:12Z

No description provided.

mtnbarreto · 2016-09-16T18:22:56Z

Example/Example/ButtonBarExampleViewController.swift

        buttonBarView.backgroundColor = UIColor(red: 7/255, green: 185/255, blue: 155/255, alpha: 1)
    }

    // MARK: - PagerTabStripDataSource

-    override func viewControllersForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {


What about changing this signature to viewControllers(forPagerTabStrip: PagerTabStripViewController) ?

mtnbarreto · 2016-09-16T18:26:06Z

Example/Example/ChildControllers/ChildExampleViewController.swift

    }

    // MARK: - IndicatorInfoProvider

-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfoForPagerTabStrip(_ pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {


indicatorInfo(forPagerTabStrip: PagerTabStripViewController) -> IndicatorInfo is more close to swift 3 syntax.

mtnbarreto · 2016-09-16T18:29:52Z

Example/Example/ChildControllers/TableChildExampleViewController.swift

@@ -79,7 +79,7 @@ class TableChildExampleViewController: UITableViewController, IndicatorInfoProvi

    // MARK: - IndicatorInfoProvider

-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
+    func indicatorInfoForPagerTabStrip(_ pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {


use for: instead..

indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInf

mtnbarreto · 2016-09-16T18:30:51Z

Example/Example/Helpers/DataProvider.swift

-    override func preferredStatusBarStyle() -> UIStatusBarStyle {
-        return UIStatusBarStyle.LightContent
+    override var preferredStatusBarStyle : UIStatusBarStyle {
+        return UIStatusBarStyle.lightContent


please delete UIStatusBarStyle

mtnbarreto · 2016-09-16T18:31:06Z

Example/Example/Helpers/DataProvider.swift

-    override func preferredStatusBarStyle() -> UIStatusBarStyle {
-        return UIStatusBarStyle.LightContent
+    override var preferredStatusBarStyle : UIStatusBarStyle {
+        return UIStatusBarStyle.lightContent


mtnbarreto · 2016-09-16T18:55:36Z

Sources/BaseButtonBarPagerTabStripViewController.swift


-        buttonBarView.selectedBarHeight = settings.style.selectedBarHeight ?? buttonBarView.selectedBarHeight


mtnbarreto · 2016-09-16T18:56:58Z

Sources/BaseButtonBarPagerTabStripViewController.swift

        buttonBarView.reloadData()
        cachedCellWidths = calculateWidths()
-        buttonBarView.moveToIndex(currentIndex, animated: false, swipeDirection: .None, pagerScroll: .Yes)


.moveTo(index: currentIndex, withAnimation: false, swipeDirection: .None, pagerScroll: .Yes)

mtnbarreto · 2016-09-16T18:59:58Z

Sources/BaseButtonBarPagerTabStripViewController.swift

            fatalError("UICollectionViewCell should be or extend from ButtonBarViewCell")
        }
-        let childController = viewControllers[indexPath.item] as! IndicatorInfoProvider
+        let childController = viewControllers[(indexPath as NSIndexPath).item] as! IndicatorInfoProvider


we should not need the casting... indexPath as NSIndexPath

mtnbarreto · 2016-09-16T19:00:32Z

Sources/BaseButtonBarPagerTabStripViewController.swift

        let indicatorInfo = childController.indicatorInfoForPagerTabStrip(self)

        configureCell(cell, indicatorInfo: indicatorInfo)

        if pagerBehaviour.isProgressiveIndicator {
            if let changeCurrentIndexProgressive = changeCurrentIndexProgressive {
-                changeCurrentIndexProgressive(oldCell: currentIndex == indexPath.item ? nil : cell, newCell: currentIndex == indexPath.item ? cell : nil, progressPercentage: 1, changeCurrentIndex: true, animated: false)
+                changeCurrentIndexProgressive(currentIndex == (indexPath as NSIndexPath).item ? nil : cell, currentIndex == (indexPath as NSIndexPath).item ? cell : nil, 1, true, false)


i would prefer to keep the named parameters in closure variables. Let's check if this is possible

mtnbarreto · 2016-09-16T19:04:31Z

Sources/ButtonBarPagerTabStripViewController.swift

        var newContainerViewFrame = self.containerView.frame
        newContainerViewFrame.origin.y = buttonBarHeight
        newContainerViewFrame.size.height = self.containerView.frame.size.height - (buttonBarHeight - self.containerView.frame.origin.y)
        self.containerView.frame = newContainerViewFrame
        return buttonBar
    }()

-    lazy private var cachedCellWidths: [CGFloat]? = { [unowned self] in
+    lazy fileprivate var cachedCellWidths: [CGFloat]? = { [unowned self] in


we may have to use private sometimes. private means it can be used from the current context.

mtnbarreto · 2016-09-16T19:08:58Z

Sources/ButtonBarView.swift

@@ -63,39 +63,39 @@ public class ButtonBarView: UICollectionView {
        addSubview(selectedBar)
    }

-    public func moveToIndex(toIndex: Int, animated: Bool, swipeDirection: SwipeDirection, pagerScroll: PagerScroll) {
+    open func moveToIndex(_ toIndex: Int, animated: Bool, swipeDirection: SwipeDirection, pagerScroll: PagerScroll) {


refactor signacture

mtnbarreto · 2016-09-16T19:09:06Z

Sources/ButtonBarView.swift

        selectedIndex = toIndex
        updateSelectedBarPosition(animated, swipeDirection: swipeDirection, pagerScroll: pagerScroll)
    }

-    public func moveFromIndex(fromIndex: Int, toIndex: Int, progressPercentage: CGFloat,pagerScroll: PagerScroll) {
+    open func moveFromIndex(_ fromIndex: Int, toIndex: Int, progressPercentage: CGFloat,pagerScroll: PagerScroll) {


mtnbarreto · 2016-09-16T19:14:21Z

Sources/ButtonBarView.swift

@@ -133,24 +133,24 @@ public class ButtonBarView: UICollectionView {

    // MARK: - Helpers

-    private func updateContentOffset(animated: Bool, pagerScroll: PagerScroll, toFrame: CGRect, toIndex: Int) -> Void {
-        guard pagerScroll != .No || (pagerScroll != .ScrollOnlyIfOutOfScreen && (toFrame.origin.x < contentOffset.x || toFrame.origin.x >= (contentOffset.x + frame.size.width - contentInset.left))) else { return }
+    fileprivate func updateContentOffset(_ animated: Bool, pagerScroll: PagerScroll, toFrame: CGRect, toIndex: Int) -> Void {


withAnimation:

mtnbarreto · 2016-09-16T19:15:17Z

Sources/ButtonBarViewCell.swift

-        label.font = UIFont.boldSystemFontOfSize(14.0)
+        label.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        label.textAlignment = .center
+        label.font = UIFont.boldSystemFont(ofSize: 14.0)


remove UIFont please

mtnbarreto · 2016-09-16T19:16:15Z

Sources/PagerTabStripViewController.swift

@@ -30,66 +30,66 @@ import Foundation

 public protocol IndicatorInfoProvider {

-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo
+    func indicatorInfoForPagerTabStrip(_ pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo


indicatorInfo(for pagerTabStripController: ......

mtnbarreto · 2016-09-16T19:24:19Z

Sources/PagerTabStripViewController.swift

@@ -30,66 +30,66 @@ import Foundation

 public protocol IndicatorInfoProvider {

-    func indicatorInfoForPagerTabStrip(pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo
+    func indicatorInfoForPagerTabStrip(_ pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo
 }

 public protocol PagerTabStripDelegate: class {


this protocol method signatures should be updated!

mtnbarreto · 2016-09-16T19:34:10Z

Sources/PagerTabStripViewController.swift

        super.viewDidLayoutSubviews()
        updateIfNeeded()
    }

-    public func moveToViewControllerAtIndex(index: Int, animated: Bool = true) {
-        guard isViewLoaded() && view.window != nil else {
+    open func moveToViewControllerAtIndex(_ index: Int, animated: Bool = true) {


Tomas Radvansky and others added 2 commits September 14, 2016 15:22

Swift3 Xcode8 GM Conversion

49f963b

Converted whole project to Xcode 8 and Swift 3

1e73449

mats-claassen assigned mtnbarreto Sep 14, 2016

mtnbarreto reviewed Sep 16, 2016

View reviewed changes

mtnbarreto mentioned this pull request Sep 16, 2016

Update to Xcode 8 and Swift 3 #228

Closed

Swiftly function names

9d80d20

mats-claassen merged commit 794f085 into master Sep 16, 2016

mtnbarreto deleted the Swift3 branch September 27, 2016 15:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert XLPagerTabStrip to Swift 3 #226

Convert XLPagerTabStrip to Swift 3 #226

mats-claassen commented Sep 14, 2016

mtnbarreto Sep 16, 2016 •

edited

Loading

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016

mtnbarreto Sep 16, 2016


		buttonBarView.selectedBarHeight = settings.style.selectedBarHeight ?? buttonBarView.selectedBarHeight

Convert XLPagerTabStrip to Swift 3 #226

Convert XLPagerTabStrip to Swift 3 #226

Conversation

mats-claassen commented Sep 14, 2016

mtnbarreto Sep 16, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mtnbarreto Sep 16, 2016 •

edited

Loading