Merge pull request IFTTT#1704 from IFTTT/scroll-offsets

Add offsets to keepView methods

Author: lauraskelton

JazzHands/IFTTTAnimatedPagingScrollViewController.h

@@ -30,11 +30,12 @@
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages atTimes:(NSArray *)times;
 - (void)keepView:(UIView *)view onPage:(CGFloat)page withAttribute:(IFTTTHorizontalPositionAttribute)attribute;
+- (void)keepView:(UIView *)view onPage:(CGFloat)page withAttribute:(IFTTTHorizontalPositionAttribute)attribute offset:(CGFloat)offset;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages withAttribute:(IFTTTHorizontalPositionAttribute)attribute;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages atTimes:(NSArray *)times withAttribute:(IFTTTHorizontalPositionAttribute)attribute;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages withAttribute:(IFTTTHorizontalPositionAttribute)attribute offset:(CGFloat)offset;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages atTimes:(NSArray *)times withAttribute:(IFTTTHorizontalPositionAttribute)attribute offset:(CGFloat)offset;
-- (void)keepView:(UIView *)view onPages:(NSArray *)pages withOffsets:(NSArray *)offsets withAttribute:(IFTTTHorizontalPositionAttribute)attribute;
+- (void)keepView:(UIView *)view onPages:(NSArray *)pages withAttribute:(IFTTTHorizontalPositionAttribute)attribute offsets:(NSArray *)offsets;
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages atTimes:(NSArray *)times withOffsets:(NSArray *)offsets withAttribute:(IFTTTHorizontalPositionAttribute)attribute;
 
 @end

JazzHands/IFTTTAnimatedPagingScrollViewController.m

@@ -179,6 +179,11 @@ - (void)keepView:(UIView *)view onPage:(CGFloat)page
 }
 
 - (void)keepView:(UIView *)view onPage:(CGFloat)page withAttribute:(IFTTTHorizontalPositionAttribute)attribute
+{
+    [self keepView:view onPage:page withAttribute:attribute offset:0.f];
+}
+
+- (void)keepView:(UIView *)view onPage:(CGFloat)page withAttribute:(IFTTTHorizontalPositionAttribute)attribute offset:(CGFloat)offset
 {
     view.translatesAutoresizingMaskIntoConstraints = NO;
     [self.contentView addConstraint:[NSLayoutConstraint constraintWithItem:view
@@ -187,7 +192,7 @@ - (void)keepView:(UIView *)view onPage:(CGFloat)page withAttribute:(IFTTTHorizon
                                                                     toItem:self.contentView
                                                                  attribute:NSLayoutAttributeCenterX
                                                                 multiplier:[self multiplierForPage:page withAttribute:attribute]
-                                                                  constant:0.f]];
+                                                                  constant:offset]];
 }
 
 - (void)keepView:(UIView *)view onPages:(NSArray *)pages
@@ -244,7 +249,7 @@ - (void)keepView:(UIView *)view onPages:(NSArray *)pages atTimes:(NSArray *)time
     [self.scrollViewPageConstraintAnimations addObject:xPositionAnimation];
 }
 
-- (void)keepView:(UIView *)view onPages:(NSArray *)pages withOffsets:(NSArray *)offsets withAttribute:(IFTTTHorizontalPositionAttribute)attribute
+- (void)keepView:(UIView *)view onPages:(NSArray *)pages withAttribute:(IFTTTHorizontalPositionAttribute)attribute offsets:(NSArray *)offsets
 {
     [self keepView:view onPages:pages atTimes:pages withOffsets:offsets withAttribute:attribute];
 }