Merge pull request #1497

IFTTT · Mar 8, 2015 · 418bb68 · 418bb68
2 parents d3f87ee + fdf1163
commit 418bb68
Show file tree

Hide file tree

Showing 11 changed files with 936 additions and 843 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 osx_image: xcode611
 language: objective-c
 before_install: gem install cocoapods xcpretty obcd slather -N
-cache: cocoapods
 podfile: Example/Podfile
 env:
 - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8

diff --git a/Example/JazzHandsDemo.xcodeproj/project.pbxproj b/Example/JazzHandsDemo.xcodeproj/project.pbxproj
@@ -396,6 +396,8 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",

diff --git a/Example/Pods/Headers/Public/JazzHands/IFTTTCornerRadiusAnimation.h b/Example/Pods/Headers/Public/JazzHands/IFTTTCornerRadiusAnimation.h
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/JazzHands/IFTTTAnimationFrame.h b/JazzHands/IFTTTAnimationFrame.h
@@ -13,6 +13,7 @@
 
 @property (nonatomic, assign) CGRect frame;
 @property (nonatomic, assign) CGFloat alpha;
+@property (nonatomic, assign) CGFloat cornerRadius;
 @property (nonatomic, assign) BOOL hidden;
 @property (nonatomic, copy) UIColor *color;
 @property (nonatomic, assign) CGFloat angle;

diff --git a/JazzHands/IFTTTAnimationKeyFrame.h b/JazzHands/IFTTTAnimationKeyFrame.h
@@ -20,6 +20,7 @@
 // values into keyframe objects.
 //
 + (NSArray *)keyFramesWithTimesAndAlphas:(NSInteger)pairCount,...;
++ (NSArray *)keyFramesWithTimesAndCornerRadius:(NSInteger)pairCount,...;
 + (NSArray *)keyFramesWithTimesAndFrames:(NSInteger)pairCount,...;
 + (NSArray *)keyFramesWithTimesAndHiddens:(NSInteger)pairCount,...;
 + (NSArray *)keyFramesWithTimesAndColors:(NSInteger)pairCount,...;
@@ -29,6 +30,7 @@
 + (NSArray *)keyFramesWithTimesAndConstraint:(NSInteger)pairCount,...;
 
 + (instancetype)keyFrameWithTime:(NSInteger)time andAlpha:(CGFloat)alpha;
++ (instancetype)keyFrameWithTime:(NSInteger)time andCornerRadius:(CGFloat)cornerRadius;
 + (instancetype)keyFrameWithTime:(NSInteger)time andFrame:(CGRect)frame;
 + (instancetype)keyFrameWithTime:(NSInteger)time andHidden:(BOOL)hidden;
 + (instancetype)keyFrameWithTime:(NSInteger)time andColor:(UIColor*)color;
@@ -38,6 +40,7 @@
 + (instancetype)keyFrameWithTime:(NSInteger)time andConstraint:(CGFloat)constraint;
 
 - (id)initWithTime:(NSInteger)time andAlpha:(CGFloat)alpha;
+- (id)initWithTime:(NSInteger)time andCornerRadius:(CGFloat)cornerRadius;
 - (id)initWithTime:(NSInteger)time andFrame:(CGRect)frame;
 - (id)initWithTime:(NSInteger)time andHidden:(BOOL)hidden;
 - (id)initWithTime:(NSInteger)time andColor:(UIColor*)color;

diff --git a/JazzHands/IFTTTAnimationKeyFrame.m b/JazzHands/IFTTTAnimationKeyFrame.m
@@ -37,6 +37,33 @@ + (NSArray *)keyFramesWithTimesAndAlphas:(NSInteger)pairCount,...
     }
 }
 
++ (NSArray *)keyFramesWithTimesAndCornerRadius:(NSInteger)pairCount,...
+{
+    va_list argumentList;
+    NSInteger time;
+    CGFloat cornerRadius;
+    if (pairCount > 0) {
+        NSMutableArray *keyFrames = [NSMutableArray arrayWithCapacity:(NSUInteger)pairCount];
+
+        va_start(argumentList, pairCount);
+
+        for (int i=0; i<pairCount; i++) {
+            time = va_arg(argumentList, NSInteger);
+            cornerRadius = (CGFloat)va_arg(argumentList, double);   // use double to suppress a va_arg conversion warning
+            IFTTTAnimationKeyFrame *keyFrame = [IFTTTAnimationKeyFrame keyFrameWithTime:time
+                                                                        andCornerRadius:cornerRadius];
+            [keyFrames addObject:keyFrame];
+        }
+
+        va_end(argumentList);
+
+        return [NSArray arrayWithArray:keyFrames];
+    }
+    else {
+        return nil;
+    }
+}
+
 + (NSArray *)keyFramesWithTimesAndFrames:(NSInteger)pairCount,...
 {
     va_list argumentList;
@@ -226,6 +253,13 @@ + (instancetype)keyFrameWithTime:(NSInteger)time andAlpha:(CGFloat)alpha
     return keyFrame;
 }
 
++ (instancetype)keyFrameWithTime:(NSInteger)time andCornerRadius:(CGFloat)cornerRadius
+{
+    IFTTTAnimationKeyFrame *keyFrame = [[self alloc] initWithTime:time
+                                                         andCornerRadius:cornerRadius];
+    return keyFrame;
+}
+
 + (instancetype)keyFrameWithTime:(NSInteger)time andFrame:(CGRect)frame
 {
     IFTTTAnimationKeyFrame *keyFrame = [[self alloc] initWithTime:time
@@ -279,10 +313,8 @@ + (instancetype)keyFrameWithTime:(NSInteger)time andConstraint:(CGFloat)constrai
 }
 
 - (id)initWithTime:(NSInteger)time
-{
-    self = [super init];
-
-    if (self) {
+{    
+    if ((self = [self init])) {
         self.time = time;
         self.easingFunction = IFTTTEasingFunctionLinear;
     }
@@ -292,20 +324,25 @@ - (id)initWithTime:(NSInteger)time
 
 - (id)initWithTime:(NSInteger)time andAlpha:(CGFloat)alpha
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.alpha = alpha;
     }
 
     return self;
 }
 
+- (id)initWithTime:(NSInteger)time andCornerRadius:(CGFloat)cornerRadius
+{
+    if ((self = [self initWithTime:time])) {
+        self.cornerRadius = cornerRadius;
+    }
+
+    return self;
+}
+
 - (id)initWithTime:(NSInteger)time andFrame:(CGRect)frame
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.frame = frame;
     }
 
@@ -314,9 +351,7 @@ - (id)initWithTime:(NSInteger)time andFrame:(CGRect)frame
 
 - (id)initWithTime:(NSInteger)time andHidden:(BOOL)hidden
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.hidden = hidden;
     }
 
@@ -325,9 +360,7 @@ - (id)initWithTime:(NSInteger)time andHidden:(BOOL)hidden
 
 - (id)initWithTime:(NSInteger)time andColor:(UIColor*)color
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.color = color;
     }
 
@@ -336,9 +369,7 @@ - (id)initWithTime:(NSInteger)time andColor:(UIColor*)color
 
 - (id)initWithTime:(NSInteger)time andAngle:(CGFloat)angle
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.angle = angle;
     }
 
@@ -347,29 +378,23 @@ - (id)initWithTime:(NSInteger)time andAngle:(CGFloat)angle
 
 - (id)initWithTime:(NSInteger)time andTransform3D:(IFTTTTransform3D *)transform
 {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.transform = transform;
     }
 
     return self;
 }
 
 - (id)initWithTime:(NSInteger)time andScale:(CGFloat)scale {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.scale = scale;
     }
 
     return self;
 }
 
 - (id)initWithTime:(NSInteger)time andConstraint:(CGFloat)constraint {
-    self = [self initWithTime:time];
-
-    if (self) {
+    if ((self = [self initWithTime:time])) {
         self.constraintConstant = constraint;
     }
 

diff --git a/JazzHands/IFTTTCornerRadiusAnimation.h b/JazzHands/IFTTTCornerRadiusAnimation.h
@@ -0,0 +1,13 @@
+//
+//  IFTTTCornerRadiusAnimation.h
+//  JazzHands
+//
+//  Created by Nuno Gonçalves on 3/8/15.
+//  Copyright (c) 2015 IFTTT Inc. All rights reserved.
+//
+
+#import "IFTTTAnimation.h"
+
+@interface IFTTTCornerRadiusAnimation : IFTTTAnimation
+
+@end
diff --git a/JazzHands/IFTTTCornerRadiusAnimation.m b/JazzHands/IFTTTCornerRadiusAnimation.m
@@ -0,0 +1,35 @@
+//
+//  IFTTTCornerRadiusAnimation.m
+//  JazzHands
+//
+//  Created by Nuno Gonçalves on 3/8/13.
+//  Copyright (c) 2015 IFTTT Inc. All rights reserved.
+//
+
+#import "IFTTTJazzHands.h"
+
+@implementation IFTTTCornerRadiusAnimation
+
+- (void)animate:(NSInteger)time
+{
+    if (self.keyFrames.count <= 1) return;
+
+    IFTTTAnimationFrame *animationFrame = [self animationFrameForTime:time];
+    self.view.layer.cornerRadius = animationFrame.cornerRadius;
+}
+
+- (IFTTTAnimationFrame *)frameForTime:(NSInteger)time
+                        startKeyFrame:(IFTTTAnimationKeyFrame *)startKeyFrame
+                          endKeyFrame:(IFTTTAnimationKeyFrame *)endKeyFrame
+{
+    IFTTTAnimationFrame *animationFrame = [IFTTTAnimationFrame new];
+    animationFrame.cornerRadius = [self tweenValueForStartTime:startKeyFrame.time
+                                                       endTime:endKeyFrame.time
+                                                    startValue:startKeyFrame.cornerRadius
+                                                      endValue:endKeyFrame.cornerRadius
+                                                        atTime:time];
+
+    return animationFrame;
+}
+
+@end
diff --git a/JazzHands/IFTTTJazzHands.h b/JazzHands/IFTTTJazzHands.h
@@ -18,6 +18,7 @@
 #import "IFTTTAnimatedScrollViewController.h"
 
 #import "IFTTTAlphaAnimation.h"
+#import "IFTTTCornerRadiusAnimation.h"
 #import "IFTTTFrameAnimation.h"
 #import "IFTTTHideAnimation.h"
 #import "IFTTTColorAnimation.h"

diff --git a/README.md b/README.md
@@ -74,6 +74,7 @@ Jazz Hands supports several types of animations:
 
 + **IFTTTFrameAnimation** moves and sizes views.
 + **IFTTTAlphaAnimation** creates fade effects.
++ **IFTTTCornerRadiusAnimation** animates the `layer.cornerRadius` of a view.
 + **IFTTTHideAnimation** hides and shows views.
 + **IFTTTAngleAnimation** for rotation effects.
 + **IFTTTTransform3DAnimation** for 3D transforms.