From fe5b872ca75eab5d14bd2de2614c741482adf190 Mon Sep 17 00:00:00 2001
From: Martin Barreto <martin@xmartlabs.com>
Date: Tue, 10 Feb 2015 09:52:17 -0200
Subject: [PATCH] Added isProgressiveIndicator property. Now we can update the
 current indicator each time UIScrollView content offset changes. Added
 isElasticIndicatorLimit. If isProgressiveIndicator is YES we can choose
 between elastic and fixed first and last view controllers indicators. Update
 examples.

---
 XLPagerTabStrip/Base.lproj/LaunchScreen.xib   |   4 +-
 .../Demo/BarExampleViewController.m           |   3 +
 .../Demo/ButtonBarExampleViewController.m     |   5 +-
 .../ChildExampleViewController.m              |   2 +-
 .../Helpers/ReloadExampleViewController.m     |  38 ++++
 .../Demo/SegmentedExampleViewController.m     |   2 +
 XLPagerTabStrip/Demo/Storyboard.storyboard    |  33 ++-
 XLPagerTabStrip/Info.plist                    |   4 +
 .../XLBarPagerTabStripViewController.m        |  13 +-
 .../XLButtonBarPagerTabStripViewController.m  |  12 ++
 .../XLPagerTabStripViewController.h           |   7 +
 .../XLPagerTabStripViewController.m           | 190 ++++++++++++------
 .../XLSegmentedPagerTabStripViewController.m  |  18 +-
 XLPagerTabStrip/XL/Views/XLBarView.h          |   1 +
 XLPagerTabStrip/XL/Views/XLBarView.m          |  15 ++
 XLPagerTabStrip/XL/Views/XLButtonBarView.h    |   1 +
 XLPagerTabStrip/XL/Views/XLButtonBarView.m    |  77 +++++--
 17 files changed, 328 insertions(+), 97 deletions(-)

diff --git a/XLPagerTabStrip/Base.lproj/LaunchScreen.xib b/XLPagerTabStrip/Base.lproj/LaunchScreen.xib
index da81f055..ad1a4269 100644
--- a/XLPagerTabStrip/Base.lproj/LaunchScreen.xib
+++ b/XLPagerTabStrip/Base.lproj/LaunchScreen.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
@@ -14,7 +14,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
                 </imageView>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2014 Xmartlabs. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="20.5"/>
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
diff --git a/XLPagerTabStrip/Demo/BarExampleViewController.m b/XLPagerTabStrip/Demo/BarExampleViewController.m
index 20589a59..a452f6f6 100644
--- a/XLPagerTabStrip/Demo/BarExampleViewController.m
+++ b/XLPagerTabStrip/Demo/BarExampleViewController.m
@@ -40,6 +40,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder
     self = [super initWithCoder:coder];
     if (self) {
         _isReload = NO;
+        self.isProgressiveIndicator = YES;
     }
     return self;
 }
@@ -81,6 +82,8 @@ -(NSArray *)childViewControllersForPagerTabStripViewController:(XLPagerTabStripV
 -(void)reloadPagerTabStripView
 {
     _isReload = YES;
+    self.isProgressiveIndicator = (rand() % 2 == 0);
+    self.isElasticIndicatorLimit = (rand() % 2 == 0);;
     [super reloadPagerTabStripView];
 }
 
diff --git a/XLPagerTabStrip/Demo/ButtonBarExampleViewController.m b/XLPagerTabStrip/Demo/ButtonBarExampleViewController.m
index eee8533b..ad9c1d57 100644
--- a/XLPagerTabStrip/Demo/ButtonBarExampleViewController.m
+++ b/XLPagerTabStrip/Demo/ButtonBarExampleViewController.m
@@ -32,9 +32,9 @@ @implementation ButtonBarExampleViewController
     BOOL _isReload;
 }
 
-
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.isProgressiveIndicator = NO;
     // Do any additional setup after loading the view.
     [self.buttonBarView.selectedBar setBackgroundColor:[UIColor orangeColor]];
 }
@@ -71,8 +71,9 @@ -(NSArray *)childViewControllersForPagerTabStripViewController:(XLPagerTabStripV
 -(void)reloadPagerTabStripView
 {
     _isReload = YES;
+    self.isProgressiveIndicator = (rand() % 2 == 0);
+    self.isElasticIndicatorLimit = (rand() % 2 == 0);
     [super reloadPagerTabStripView];
 }
 
-
 @end
diff --git a/XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.m b/XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.m
index fe4923e9..d542d059 100644
--- a/XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.m
+++ b/XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.m
@@ -66,7 +66,7 @@ -(NSString *)titleForPagerTabStripViewController:(XLPagerTabStripViewController
 
 -(UIColor *)colorForPagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
 {
-    return [UIColor whiteColor];
+    return [UIColor blackColor];
 }
 
 @end
diff --git a/XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.m b/XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.m
index 0c168b3c..8765bf5a 100644
--- a/XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.m
+++ b/XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.m
@@ -10,12 +10,32 @@
 
 @interface ReloadExampleViewController ()
 
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+
 @end
 
 @implementation ReloadExampleViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    if (self.navigationController){
+        UILabel *bigLabel = [[UILabel alloc] init];
+        bigLabel.backgroundColor = [UIColor clearColor];
+        bigLabel.textColor = [UIColor whiteColor];
+        bigLabel.font = [UIFont boldSystemFontOfSize:20];
+        bigLabel.adjustsFontSizeToFitWidth = YES;
+        self.navigationItem.titleView = bigLabel;
+        [bigLabel sizeToFit];
+    }
+    [[self childViewControllers] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        if ([obj isKindOfClass:[XLPagerTabStripViewController class]]){
+            XLPagerTabStripViewController * pagerController = (id)obj;
+            [self updateTitle:pagerController];
+            *stop = YES;
+        }
+    }];
+
+    
 }
 
 - (IBAction)reloadTapped:(id)sender {
@@ -23,9 +43,27 @@ - (IBAction)reloadTapped:(id)sender {
         if ([obj isKindOfClass:[XLPagerTabStripViewController class]]){
             XLPagerTabStripViewController * pagerController = (id)obj;
             [pagerController reloadPagerTabStripView];
+            [self updateTitle:pagerController];
             *stop = YES;
         }
     }];
 }
 
+-(void)updateTitle:(XLPagerTabStripViewController *)pagerController
+{
+    NSString * title = @"isProgressiveIndicator = NO";
+    if (pagerController.isProgressiveIndicator){
+        if (pagerController.isElasticIndicatorLimit){
+            title = @"isProgressiveIndicator = YES,  isElasticIndicatorLimit = YES";
+        }
+        else{
+            title = @"isProgressiveIndicator = YES, isElasticIndicatorLimit = NO";
+        }
+    }
+    
+    self.titleLabel.text = title;
+    ((UILabel *)self.navigationItem.titleView).text = title;
+    [((UILabel *)self.navigationItem.titleView) sizeToFit];
+}
+
 @end
diff --git a/XLPagerTabStrip/Demo/SegmentedExampleViewController.m b/XLPagerTabStrip/Demo/SegmentedExampleViewController.m
index a5724f6b..5db0d9ca 100644
--- a/XLPagerTabStrip/Demo/SegmentedExampleViewController.m
+++ b/XLPagerTabStrip/Demo/SegmentedExampleViewController.m
@@ -70,6 +70,8 @@ -(NSArray *)childViewControllersForPagerTabStripViewController:(XLPagerTabStripV
 
 - (IBAction)reloadTapped:(id)sender {
     _isReload = YES;
+    self.isProgressiveIndicator = (rand() % 2 == 0);
+    self.isElasticIndicatorLimit = (rand() % 2 == 0);
     [self reloadPagerTabStripView];
 }
 
diff --git a/XLPagerTabStrip/Demo/Storyboard.storyboard b/XLPagerTabStrip/Demo/Storyboard.storyboard
index 11ab8b90..688ae699 100644
--- a/XLPagerTabStrip/Demo/Storyboard.storyboard
+++ b/XLPagerTabStrip/Demo/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="6254" systemVersion="14B25" 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="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ptL-BW-nEP">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
@@ -77,12 +77,6 @@
                                     <segue destination="MOL-Zx-vbf" kind="embed" id="i47-4L-xIB"/>
                                 </connections>
                             </containerView>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Storyboard Demo" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cZN-qT-VUq">
-                                <rect key="frame" x="207" y="52" width="187" height="27.5"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="23"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jSE-G2-qe6">
                                 <rect key="frame" x="527" y="83" width="57" height="34"/>
                                 <state key="normal" title="Reload">
@@ -92,11 +86,19 @@
                                     <action selector="reloadTapped:" destination="uba-Iz-2L2" eventType="touchUpInside" id="KNI-Zr-Zz0"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Storyboard Demo" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="cZN-qT-VUq">
+                                <rect key="frame" x="207" y="52" width="187" height="27.5"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="23"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" red="0.027450980390000001" green="0.72549019609999998" blue="0.60784313729999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
+                            <constraint firstItem="cZN-qT-VUq" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leadingMargin" id="9eC-5j-2zk"/>
                             <constraint firstAttribute="centerX" secondItem="cZN-qT-VUq" secondAttribute="centerX" id="AYy-gw-Ryh"/>
                             <constraint firstItem="NbE-e0-l2n" firstAttribute="top" secondItem="qkQ-UG-MKG" secondAttribute="bottom" id="K6Q-s5-nzV"/>
+                            <constraint firstItem="cZN-qT-VUq" firstAttribute="trailing" secondItem="Mqm-sG-Qyv" secondAttribute="trailingMargin" id="Lma-fO-UC9"/>
                             <constraint firstItem="jSE-G2-qe6" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="63" id="NWc-fy-XOc"/>
                             <constraint firstItem="cZN-qT-VUq" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="32" id="RvZ-BV-1SL"/>
                             <constraint firstItem="qkQ-UG-MKG" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leading" id="Slo-zY-IGj"/>
@@ -104,13 +106,28 @@
                             <constraint firstItem="qkQ-UG-MKG" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="101" id="nJw-ag-ddh"/>
                             <constraint firstAttribute="trailing" secondItem="qkQ-UG-MKG" secondAttribute="trailing" id="pTb-BC-Duc"/>
                         </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="9eC-5j-2zk"/>
+                                <exclude reference="Lma-fO-UC9"/>
+                            </mask>
+                        </variation>
+                        <variation key="heightClass=regular-widthClass=compact">
+                            <mask key="constraints">
+                                <include reference="9eC-5j-2zk"/>
+                                <include reference="Lma-fO-UC9"/>
+                            </mask>
+                        </variation>
                     </view>
                     <tabBarItem key="tabBarItem" systemItem="contacts" id="1d9-i6-g9L"/>
                     <navigationItem key="navigationItem" id="ni8-Kh-JRq"/>
+                    <connections>
+                        <outlet property="titleLabel" destination="cZN-qT-VUq" id="tRG-O0-13z"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jkN-pv-eFH" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1340" y="139"/>
+            <point key="canvasLocation" x="1339.5" y="138.75"/>
         </scene>
         <!--Buttons Example-->
         <scene sceneID="c3d-TB-Hyh">
diff --git a/XLPagerTabStrip/Info.plist b/XLPagerTabStrip/Info.plist
index 1679552f..e1e8ffe1 100644
--- a/XLPagerTabStrip/Info.plist
+++ b/XLPagerTabStrip/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 	<key>UILaunchImageFile</key>
 	<string>LaunchImage</string>
 	<key>UILaunchStoryboardName</key>
diff --git a/XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.m b/XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.m
index b74b4956..7584788d 100644
--- a/XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.m
@@ -84,7 +84,18 @@ -(XLBarView *)barView
 
 -(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController updateIndicatorToViewController:(UIViewController *)toViewController fromViewController:(UIViewController *)fromViewController
 {
-    [self.barView moveToIndex:[self.pagerTabStripChildViewControllers indexOfObject:toViewController] animated:YES];
+    [self.barView moveToIndex:[self.pagerTabStripChildViewControllers indexOfObject:toViewController]
+                     animated:YES];
+}
+
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+          updateIndicatorFromIndex:(NSInteger)fromIndex
+                           toIndex:(NSInteger)toIndex
+            withProgressPercentage:(CGFloat)progressPercentage
+{
+    [self.barView moveFromIndex:fromIndex
+                        toIndex:toIndex
+         withProgressPercentage:progressPercentage];
 }
 
 
diff --git a/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m b/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
index 59d1f89a..e79c67e9 100644
--- a/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
@@ -125,6 +125,18 @@ -(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStri
     }
 }
 
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+          updateIndicatorFromIndex:(NSInteger)fromIndex
+                           toIndex:(NSInteger)toIndex
+            withProgressPercentage:(CGFloat)progressPercentage
+{
+    if (self.shouldUpdateButtonBarView){
+        [self.buttonBarView moveFromIndex:fromIndex
+                                  toIndex:toIndex
+                   withProgressPercentage:progressPercentage];
+    }
+}
+
 
 
 #pragma merk - UICollectionViewDelegateFlowLayout
diff --git a/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h b/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
index 0fcd8a5e..fc01b5b3 100644
--- a/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
+++ b/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
@@ -60,6 +60,11 @@ typedef NS_ENUM(NSUInteger, XLPagerTabStripDirection) {
 
 -(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController updateIndicatorToViewController:(UIViewController *)toViewController fromViewController:(UIViewController *)fromViewController;
 
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+          updateIndicatorFromIndex:(NSInteger)fromIndex
+                           toIndex:(NSInteger)toIndex
+            withProgressPercentage:(CGFloat)progressPercentage;
+
 @end
 
 
@@ -82,6 +87,8 @@ typedef NS_ENUM(NSUInteger, XLPagerTabStripDirection) {
 
 @property (readonly) NSUInteger currentIndex;
 @property BOOL skipIntermediateViewControllers;
+@property BOOL isProgressiveIndicator;
+@property BOOL isElasticIndicatorLimit;
 
 -(void)moveToViewControllerAtIndex:(NSUInteger)index;
 -(void)moveToViewController:(UIViewController *)viewController;
diff --git a/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m b/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
index 03ec878a..d9c89d12 100644
--- a/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
@@ -70,7 +70,9 @@ -(void)pagerTabStripViewControllerInit
     _delegate = self;
     _dataSource = self;
     _lastContentOffset = 0.0f;
+    _isElasticIndicatorLimit = NO;
     _skipIntermediateViewControllers = YES;
+    _isProgressiveIndicator = NO;
 }
 
 - (void)viewDidLoad
@@ -110,30 +112,6 @@ -(void)moveToViewControllerAtIndex:(NSUInteger)index
     [self moveToViewControllerAtIndex:index animated:YES];
 }
 
--(void)moveToViewControllerAtIndex:(NSInteger)index withDirection:(XLPagerTabStripDirection)direction animated:(BOOL)animated
-{
-    if (self.skipIntermediateViewControllers && fabs(self.currentIndex - index) > 1){
-        NSArray * originalPagerTabStripChildViewControllers = self.pagerTabStripChildViewControllers;
-        NSMutableArray * tempChildViewControllers = [NSMutableArray arrayWithArray:originalPagerTabStripChildViewControllers];
-        UIViewController * currentChildVC = [originalPagerTabStripChildViewControllers objectAtIndex:self.currentIndex];
-        NSUInteger fromIndex = (direction == XLPagerTabStripDirectionLeft) ? index - 1 : index + 1;
-                [tempChildViewControllers setObject:[originalPagerTabStripChildViewControllers objectAtIndex:fromIndex] atIndexedSubscript:self.currentIndex];
-        [tempChildViewControllers setObject:currentChildVC atIndexedSubscript:fromIndex];
-        _pagerTabStripChildViewControllers = tempChildViewControllers;
-        [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:fromIndex], 0) animated:NO];
-        if (self.navigationController){
-            self.navigationController.view.userInteractionEnabled = NO;
-        }
-        else{
-            self.view.userInteractionEnabled = NO;
-        }
-        _originalPagerTabStripChildViewControllers = originalPagerTabStripChildViewControllers;
-        [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:index], 0) animated:YES];
-    }
-    else{
-        [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:index], 0) animated:animated];
-    }
-}
 
 -(void)moveToViewControllerAtIndex:(NSUInteger)index animated:(bool)animated
 {
@@ -141,12 +119,28 @@ -(void)moveToViewControllerAtIndex:(NSUInteger)index animated:(bool)animated
         self.currentIndex = index;
     }
     else{
-        if (self.currentIndex < index){
-            [self moveToViewControllerAtIndex:index withDirection:XLPagerTabStripDirectionLeft animated:YES];
+        if (self.skipIntermediateViewControllers && fabs(self.currentIndex - index) > 1){
+            NSArray * originalPagerTabStripChildViewControllers = self.pagerTabStripChildViewControllers;
+            NSMutableArray * tempChildViewControllers = [NSMutableArray arrayWithArray:originalPagerTabStripChildViewControllers];
+            UIViewController * currentChildVC = [originalPagerTabStripChildViewControllers objectAtIndex:self.currentIndex];
+            NSUInteger fromIndex = (self.currentIndex < index) ? index - 1 : index + 1;
+            [tempChildViewControllers setObject:[originalPagerTabStripChildViewControllers objectAtIndex:fromIndex] atIndexedSubscript:self.currentIndex];
+            [tempChildViewControllers setObject:currentChildVC atIndexedSubscript:fromIndex];
+            _pagerTabStripChildViewControllers = tempChildViewControllers;
+            [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:fromIndex], 0) animated:NO];
+            if (self.navigationController){
+                self.navigationController.view.userInteractionEnabled = NO;
+            }
+            else{
+                self.view.userInteractionEnabled = NO;
+            }
+            _originalPagerTabStripChildViewControllers = originalPagerTabStripChildViewControllers;
+            [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:index], 0) animated:YES];
         }
-        else if (self.currentIndex > index){
-            [self moveToViewControllerAtIndex:index withDirection:XLPagerTabStripDirectionRight animated:YES];
+        else{
+            [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:index], 0) animated:animated];
         }
+        
     }
 }
 
@@ -159,7 +153,15 @@ -(void)moveToViewController:(UIViewController *)viewController
 
 #pragma mark - XLPagerTabStripViewControllerDelegate
 
--(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController updateIndicatorToViewController:(UIViewController *)toViewController fromViewController:(UIViewController *)fromViewController{
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+   updateIndicatorToViewController:(UIViewController *)toViewController
+                fromViewController:(UIViewController *)fromViewController{
+}
+
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+          updateIndicatorFromIndex:(NSInteger)fromIndex
+                           toIndex:(NSInteger)toIndex
+            withProgressPercentage:(CGFloat)progressPercentage{
 }
 
 
@@ -173,6 +175,17 @@ -(NSArray *)childViewControllersForPagerTabStripViewController:(XLPagerTabStripV
 
 #pragma mark - Helpers
 
+-(XLPagerTabStripDirection)scrollDirection
+{
+    if (self.containerView.contentOffset.x > _lastContentOffset){
+        return XLPagerTabStripDirectionLeft;
+    }
+    else if (self.containerView.contentOffset.x < _lastContentOffset){
+        return XLPagerTabStripDirectionRight;
+    }
+    return XLPagerTabStripDirectionNone;
+}
+
 -(BOOL)canMoveToIndex:(NSUInteger)index
 {
     return (self.currentIndex != index && self.pagerTabStripChildViewControllers.count > index);
@@ -199,7 +212,25 @@ -(CGFloat)offsetForChildViewController:(UIViewController *)viewController
 
 -(NSUInteger)pageForContentOffset:(CGFloat)contentOffset
 {
-    return (contentOffset + (0.5f * [self pageWidth])) / [self pageWidth];
+    NSInteger result = [self virtualPageForContentOffset:contentOffset];
+    return [self pageForVirtualPage:result];
+}
+
+-(NSInteger)virtualPageForContentOffset:(CGFloat)contentOffset
+{
+    NSInteger result = (contentOffset + (1.5f * [self pageWidth])) / [self pageWidth];
+    return result - 1;
+}
+
+-(NSUInteger)pageForVirtualPage:(NSInteger)virtualPage
+{
+    if (virtualPage < 0){
+        return 0;
+    }
+    if (virtualPage > self.pagerTabStripChildViewControllers.count - 1){
+        return self.pagerTabStripChildViewControllers.count - 1;
+    }
+    return virtualPage;
 }
 
 -(CGFloat)pageWidth
@@ -209,17 +240,16 @@ -(CGFloat)pageWidth
 
 -(CGFloat)scrollPercentage
 {
-    return fmodf(self.containerView.contentOffset.x, [self pageWidth]) / [self pageWidth];
+    if ([self scrollDirection] == XLPagerTabStripDirectionLeft || [self scrollDirection] == XLPagerTabStripDirectionNone){
+        return fmodf(self.containerView.contentOffset.x, [self pageWidth]) / [self pageWidth];
+    }
+    return 1 - fmodf(self.containerView.contentOffset.x >= 0 ? self.containerView.contentOffset.x : [self pageWidth] + self.containerView.contentOffset.x, [self pageWidth]) / [self pageWidth];
 }
 
 -(void)updateContent
 {
     NSArray * childViewControllers = self.pagerTabStripChildViewControllers;
     self.containerView.contentSize = CGSizeMake(CGRectGetWidth(self.containerView.bounds) * childViewControllers.count, self.containerView.contentSize.height);
-    NSUInteger currentPage = [self pageForContentOffset:self.containerView.contentOffset.x];
-    if (currentPage != self.currentIndex){
-        self.currentIndex = currentPage;
-    }
 
     [childViewControllers enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
         UIViewController * childController = (UIViewController *)obj;
@@ -247,6 +277,63 @@ -(void)updateContent
             }
         }
     }];
+    
+    NSUInteger oldCurrentIndex = self.currentIndex;
+    NSInteger virtualPage = [self virtualPageForContentOffset:self.containerView.contentOffset.x];
+    NSUInteger newCurrentIndex = [self pageForVirtualPage:virtualPage];
+    self.currentIndex = newCurrentIndex;
+
+    if (self.isProgressiveIndicator){
+        if ([self.delegate respondsToSelector:@selector(pagerTabStripViewController:updateIndicatorFromIndex:toIndex:withProgressPercentage:)]){
+            CGFloat scrollPercentage = [self scrollPercentage];
+            if (scrollPercentage > 0) {
+                NSInteger fromIndex = self.currentIndex;
+                NSInteger toIndex = self.currentIndex;
+                XLPagerTabStripDirection scrollDirection = [self scrollDirection];
+                if (scrollDirection == XLPagerTabStripDirectionLeft){
+                    if (virtualPage > self.pagerTabStripChildViewControllers.count - 1){
+                        fromIndex = self.pagerTabStripChildViewControllers.count - 1;
+                        toIndex = self.pagerTabStripChildViewControllers.count;
+                    }
+                    else{
+                        if (scrollPercentage > 0.5f){
+                            fromIndex = MAX(toIndex - 1, 0);
+                        }
+                        else{
+                            toIndex = fromIndex + 1;
+                        }
+                    }
+                }
+                else if (scrollDirection == XLPagerTabStripDirectionRight) {
+                    if (virtualPage < 0){
+                        fromIndex = 0;
+                        toIndex = -1;
+                    }
+                    else{
+                        if (scrollPercentage > 0.5f){
+                            fromIndex = MIN(toIndex + 1, self.pagerTabStripChildViewControllers.count - 1);
+                        }
+                        else{
+                            toIndex = fromIndex - 1;
+                        }
+                    }
+                }
+                [self.delegate pagerTabStripViewController:self updateIndicatorFromIndex:fromIndex toIndex:toIndex withProgressPercentage:(self.isElasticIndicatorLimit ? scrollPercentage : ( toIndex < 0 || toIndex >= self.pagerTabStripChildViewControllers.count ? 0 : scrollPercentage ))];
+            }
+        }
+    }
+    else{
+        if ([self.delegate respondsToSelector:@selector(pagerTabStripViewController:updateIndicatorToViewController:fromViewController:)] && oldCurrentIndex != newCurrentIndex){
+            UIViewController * fromViewController = nil;
+            if (self.pagerTabStripChildViewControllers.count > oldCurrentIndex){
+                fromViewController = [self.pagerTabStripChildViewControllers objectAtIndex:oldCurrentIndex];
+            }
+            [self.delegate pagerTabStripViewController:self
+                       updateIndicatorToViewController:[self.pagerTabStripChildViewControllers
+                                                        objectAtIndex:newCurrentIndex]
+                                    fromViewController:fromViewController];
+        }
+    }
 }
 
 
@@ -264,6 +351,7 @@ -(void)reloadPagerTabStripView
         _pagerTabStripChildViewControllers = self.dataSource ? [self.dataSource childViewControllersForPagerTabStripViewController:self] : @[];
         self.containerView.contentSize = CGSizeMake(CGRectGetWidth(self.containerView.bounds) * _pagerTabStripChildViewControllers.count, self.containerView.contentSize.height);
         if (self.currentIndex >= _pagerTabStripChildViewControllers.count){
+            self.currentIndex = _pagerTabStripChildViewControllers.count;
             [self.containerView setContentOffset:CGPointMake([self pageOffsetForChildIndex:(_pagerTabStripChildViewControllers.count - 1)], 0)  animated:NO];
         }
         [self updateContent];
@@ -275,14 +363,6 @@ -(void)reloadPagerTabStripView
 -(void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
     if (self.containerView == scrollView){
-        //  pan direction
-        XLPagerTabStripDirection direction = XLPagerTabStripDirectionNone;
-        if (scrollView.contentOffset.x > _lastContentOffset){
-            direction = XLPagerTabStripDirectionLeft;
-        }
-        else if (scrollView.contentOffset.x < _lastContentOffset){
-            direction = XLPagerTabStripDirectionRight;
-        }
         [self updateContent];
     }
 }
@@ -312,28 +392,6 @@ -(void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
 }
 
 
-#pragma mark - Properties
-
-
--(NSUInteger)currentIndex
-{
-    return _currentIndex;
-}
-
--(void)setCurrentIndex:(NSUInteger)currentIndex
-{
-    if (self.pagerTabStripChildViewControllers.count > currentIndex){
-        UIViewController * fromViewController = nil;
-        if (self.pagerTabStripChildViewControllers.count > _currentIndex){
-            fromViewController = [self.pagerTabStripChildViewControllers objectAtIndex:_currentIndex];
-        }
-        
-        _currentIndex = currentIndex;
-        if ([self.delegate respondsToSelector:@selector(pagerTabStripViewController:updateIndicatorToViewController:fromViewController:)]){
-            [self.delegate pagerTabStripViewController:self updateIndicatorToViewController:[self.pagerTabStripChildViewControllers objectAtIndex:_currentIndex] fromViewController:fromViewController];
-        }
-    }
-}
 
 #pragma mark - Orientation
 
@@ -354,9 +412,9 @@ -(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInter
 
 -(void)viewDidLayoutSubviews
 {
-    //NSLog(@"%s", __PRETTY_FUNCTION__);
     [super viewDidLayoutSubviews];
     [self updateContent];
+    
 }
 
 
diff --git a/XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.m b/XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.m
index dec98673..38cdc4f3 100644
--- a/XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.m
@@ -73,7 +73,6 @@ -(void)reloadPagerTabStripView
     if ([self isViewLoaded]){
         [self reloadSegmentedControl];
     }
-    
 }
 
 
@@ -103,6 +102,7 @@ -(void)reloadSegmentedControl
         
     }];
     [self.segmentedControl setSelectedSegmentIndex:self.currentIndex];
+    [self.segmentedControl setTintColor:[[self.pagerTabStripChildViewControllers objectAtIndex:self.currentIndex]colorForPagerTabStripViewController:self]];
 }
 
 #pragma mark - Events
@@ -129,6 +129,22 @@ -(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStri
     }
 }
 
+-(void)pagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController
+          updateIndicatorFromIndex:(NSInteger)fromIndex
+                           toIndex:(NSInteger)toIndex
+            withProgressPercentage:(CGFloat)progressPercentage
+{
+    if (self.shouldUpdateSegmentedControl){
+        NSInteger currentIndex = (progressPercentage > 0.5) ? toIndex : fromIndex;
+        UIViewController<XLPagerTabStripChildItem> * childViewController = (UIViewController<XLPagerTabStripChildItem> *)[self.pagerTabStripChildViewControllers objectAtIndex:currentIndex];
+        if ([childViewController respondsToSelector:@selector(colorForPagerTabStripViewController:)]){
+            [self.segmentedControl setTintColor:[childViewController colorForPagerTabStripViewController:self]];
+        }
+        [self.segmentedControl setSelectedSegmentIndex:MIN(MAX(0, currentIndex), self.pagerTabStripChildViewControllers.count -1)];
+    }
+
+}
+
 
 #pragma mark - UIScrollViewDelegate
 
diff --git a/XLPagerTabStrip/XL/Views/XLBarView.h b/XLPagerTabStrip/XL/Views/XLBarView.h
index 5ab0ea9b..0ff6ca3f 100644
--- a/XLPagerTabStrip/XL/Views/XLBarView.h
+++ b/XLPagerTabStrip/XL/Views/XLBarView.h
@@ -32,6 +32,7 @@
 -(id)initWithFrame:(CGRect)frame optionsAmount:(NSUInteger)optionsAmount selectedOptionIndex:(NSUInteger)selectedOptionIndex;
 
 -(void)moveToIndex:(NSUInteger)index animated:(BOOL)animated;
+-(void)moveFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex withProgressPercentage:(CGFloat)progressPercentage;
 -(void)setOptionsAmount:(NSUInteger)optionsAmount animated:(BOOL)animated;
 
 @end
diff --git a/XLPagerTabStrip/XL/Views/XLBarView.m b/XLPagerTabStrip/XL/Views/XLBarView.m
index 9bc15578..2f6fd048 100644
--- a/XLPagerTabStrip/XL/Views/XLBarView.m
+++ b/XLPagerTabStrip/XL/Views/XLBarView.m
@@ -100,6 +100,21 @@ -(void)moveToIndex:(NSUInteger)index animated:(BOOL)animated
     [self updateSelectedBarPositionWithAnimation:animated];
 }
 
+-(void)moveFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex withProgressPercentage:(CGFloat)progressPercentage
+{
+    self.selectedOptionIndex = (progressPercentage > 0.5) ? toIndex : fromIndex;
+    
+    CGRect newFrame = self.selectedBar.frame;
+    newFrame.size.width = self.frame.size.width / self.optionsAmount;
+    CGRect fromFrame = newFrame;
+    fromFrame.origin.x = newFrame.size.width * fromIndex;
+    CGRect toFrame = newFrame;
+    toFrame.origin.x = toFrame.size.width * toIndex;
+    CGRect targetFrame = fromFrame;
+    targetFrame.origin.x += (toFrame.origin.x-targetFrame.origin.x)*progressPercentage;
+    self.selectedBar.frame = targetFrame;
+}
+
 
 -(void)setOptionsAmount:(NSUInteger)optionsAmount animated:(BOOL)animated
 {
diff --git a/XLPagerTabStrip/XL/Views/XLButtonBarView.h b/XLPagerTabStrip/XL/Views/XLButtonBarView.h
index f3ced0c9..27251bf3 100644
--- a/XLPagerTabStrip/XL/Views/XLButtonBarView.h
+++ b/XLPagerTabStrip/XL/Views/XLButtonBarView.h
@@ -36,6 +36,7 @@
 
 -(void)moveToIndex:(NSUInteger)index animated:(BOOL)animated swipeDirection:(XLPagerTabStripDirection)swipeDirection;
 
+-(void)moveFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex withProgressPercentage:(CGFloat)progressPercentage;
 
 
 
diff --git a/XLPagerTabStrip/XL/Views/XLButtonBarView.m b/XLPagerTabStrip/XL/Views/XLButtonBarView.m
index 01def851..2fede8f7 100644
--- a/XLPagerTabStrip/XL/Views/XLButtonBarView.m
+++ b/XLPagerTabStrip/XL/Views/XLButtonBarView.m
@@ -58,7 +58,9 @@ - (id)initWithFrame:(CGRect)frame
 -(void)initializeXLButtonBarView
 {
     _selectedOptionIndex = 0;
-    [self addSubview:self.selectedBar];
+    if ([self.selectedBar superview] == nil){
+        [self addSubview:self.selectedBar];
+    }
 }
 
 
@@ -68,28 +70,51 @@ -(void)moveToIndex:(NSUInteger)index animated:(BOOL)animated swipeDirection:(XLP
     [self updateSelectedBarPositionWithAnimation:animated swipeDirection:swipeDirection];
 }
 
+-(void)moveFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex withProgressPercentage:(CGFloat)progressPercentage
+{
+    self.selectedOptionIndex = (progressPercentage > 0.5 ) ? toIndex : fromIndex;
+    
+    UICollectionViewLayoutAttributes *attributes = [self layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForItem:fromIndex inSection:0]];
+    CGRect fromFrame = attributes.frame;
+    NSInteger numberOfItems = [self.dataSource collectionView:self numberOfItemsInSection:0];
+    CGRect toFrame;
+    if (toIndex < 0 || toIndex > [self.dataSource collectionView:self numberOfItemsInSection:0] - 1){
+        if (toIndex < 0) {
+            UICollectionViewLayoutAttributes * cellAtts = [self layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
+            toFrame = CGRectOffset(cellAtts.frame, -cellAtts.frame.size.width, 0);
+        }
+        else{
+            UICollectionViewLayoutAttributes * cellAtts = [self layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForItem:(numberOfItems - 1) inSection:0]];
+            toFrame = CGRectOffset(cellAtts.frame, cellAtts.frame.size.width, 0);
+        }
+    }
+    else{
+        toFrame = [self layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForItem:toIndex inSection:0]].frame;
+    }
+    CGRect targetFrame = fromFrame;
+    targetFrame.size.height = self.selectedBar.frame.size.height;
+    targetFrame.size.width += (toFrame.size.width - fromFrame.size.width) * progressPercentage;
+    targetFrame.origin.x += (toFrame.origin.x - fromFrame.origin.x) * progressPercentage;
+    NSUInteger offset = 35;
+    float xValue = 0;
+    if (self.contentSize.width > self.frame.size.width){
+        xValue = MIN(self.contentSize.width - self.frame.size.width, targetFrame.origin.x - offset <= 0 ? 0 : targetFrame.origin.x - offset);
+    }
+    //NSLog(@"X value: %@", @(xValue));
+    [self setContentOffset:CGPointMake(xValue, 0) animated:NO];
+    self.selectedBar.frame = CGRectMake(targetFrame.origin.x, self.selectedBar.frame.origin.y, targetFrame.size.width, self.selectedBar.frame.size.height);
+}
+
 
 -(void)updateSelectedBarPositionWithAnimation:(BOOL)animation swipeDirection:(XLPagerTabStripDirection)swipeDirection
 {
     CGRect frame = self.selectedBar.frame;
     UICollectionViewCell * cell = [self.dataSource collectionView:self cellForItemAtIndexPath:[NSIndexPath indexPathForItem:self.selectedOptionIndex inSection:0]];
-    if (cell){
-        if (swipeDirection != XLPagerTabStripDirectionNone){
-            if (swipeDirection == XLPagerTabStripDirectionLeft)
-            {
-                float xValue = MIN(self.contentSize.width - self.frame.size.width, cell.frame.origin.x <= 35 ? 0 : cell.frame.origin.x - 35);
-                [self  setContentOffset:CGPointMake(xValue, 0) animated:animation];
-            }
-            else if (swipeDirection == XLPagerTabStripDirectionRight){
-                float xValue = MAX(0, cell.frame.origin.x + cell.frame.size.width - self.frame.size.width + 35);
-                [self  setContentOffset:CGPointMake(xValue, 0) animated:animation];
-            }
-            
-        }
-    }
+    
+    [self updateContentOffset];
+    
     frame.size.width = cell.frame.size.width;
     frame.origin.x = cell.frame.origin.x;
-    frame.origin.y = cell.frame.size.height - frame.size.height;
     if (animation){
         [UIView animateWithDuration:0.3 animations:^{
             [self.selectedBar setFrame:frame];
@@ -101,6 +126,26 @@ -(void)updateSelectedBarPositionWithAnimation:(BOOL)animation swipeDirection:(XL
 }
 
 
+
+#pragma mark - Helpers
+
+-(void)updateContentOffset
+{
+    UICollectionViewCell * cell = [self.dataSource collectionView:self cellForItemAtIndexPath:[NSIndexPath indexPathForItem:self.selectedOptionIndex inSection:0]];
+    if (cell){
+        NSUInteger offset = 35;
+        float xValue = MIN(
+                           MAX(0,
+                               self.contentSize.width - self.frame.size.width), // dont scroll if we are at the end of scroll view, if content is smaller than container width we scroll 0
+                           MAX(((UICollectionViewFlowLayout *)self.collectionViewLayout).sectionInset.left - cell.frame.origin.x,
+                               cell.frame.origin.x - ((UICollectionViewFlowLayout *)self.collectionViewLayout).sectionInset.left -  offset)
+                           
+                           );
+        [self setContentOffset:CGPointMake(xValue, 0) animated:YES];
+    }
+}
+
+
 #pragma mark - Properties
 
 -(UIView *)selectedBar