added cornerRadius

owenv · May 10, 2014 · 4351b1d · 4351b1d
1 parent 88a74e3
commit 4351b1d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/pop-tests/POPAnimatablePropertyTests.mm b/pop-tests/POPAnimatablePropertyTests.mm
@@ -47,6 +47,7 @@ - (void)testProvidedExistence
                      kPOPLayerShadowOffset,
                      kPOPLayerShadowOpacity,
                      kPOPLayerShadowRadius,
+                     kPOPLayerCornerRadius,
                      kPOPShapeLayerStrokeStart,
                      kPOPShapeLayerStrokeEnd,
                      kPOPShapeLayerStrokeColor,

diff --git a/pop/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h
@@ -89,6 +89,7 @@
  */
 extern NSString * const kPOPLayerBackgroundColor;
 extern NSString * const kPOPLayerBounds;
+extern NSString * const kPOPLayerCornerRadius;
 extern NSString * const kPOPLayerOpacity;
 extern NSString * const kPOPLayerPosition;
 extern NSString * const kPOPLayerPositionX;

diff --git a/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm
@@ -27,12 +27,14 @@
 static CGFloat const kPOPThresholdOpacity = 0.01;
 static CGFloat const kPOPThresholdScale = 0.005;
 static CGFloat const kPOPThresholdRotation = 0.01;
+static CGFloat const kPOPThresholdRadius = 0.01;
 
 #pragma mark - Static
 
 // CALayer
 NSString * const kPOPLayerBackgroundColor = @"backgroundColor";
 NSString * const kPOPLayerBounds = @"bounds";
+NSString * const kPOPLayerCornerRadius = @"cornerRadius";
 NSString * const kPOPLayerOpacity = @"opacity";
 NSString * const kPOPLayerPosition = @"position";
 NSString * const kPOPLayerPositionX = @"positionX";
@@ -113,7 +115,7 @@
 static POPStaticAnimatablePropertyState _staticStates[] =
 {
   /* CALayer */
-  
+
   {kPOPLayerBackgroundColor,
     ^(CALayer *obj, CGFloat values[]) {
       POPCGColorGetRGBAComponents(obj.backgroundColor, values);
@@ -136,6 +138,16 @@
     kPOPThresholdPoint
   },
 
+  {kPOPLayerCornerRadius,
+    ^(CALayer *obj, CGFloat values[]) {
+        values[0] = [obj cornerRadius];
+    },
+    ^(CALayer *obj, const CGFloat values[]) {
+        [obj setCornerRadius:values[0]];
+    },
+    kPOPThresholdRadius
+  },
+
   {kPOPLayerPosition,
     ^(CALayer *obj, CGFloat values[]) {
       values_from_point(values, [(CALayer *)obj position]);
@@ -355,7 +367,7 @@
     },
     kPOPThresholdRotation
   },
-    
+
   {kPOPLayerShadowColor,
     ^(CALayer *obj, CGFloat values[]) {
         POPCGColorGetRGBAComponents(obj.shadowColor, values);
@@ -367,7 +379,7 @@
     },
     0.01
   },
-    
+
   {kPOPLayerShadowOffset,
     ^(CALayer *obj, CGFloat values[]) {
         values_from_size(values, [obj shadowOffset]);
@@ -378,7 +390,7 @@
     },
     0.01
   },
-    
+
   {kPOPLayerShadowOpacity,
     ^(CALayer *obj, CGFloat values[]) {
         values[0] = [obj shadowOpacity];
@@ -388,19 +400,19 @@
     },
     0.01
   },
-    
+
   {kPOPLayerShadowRadius,
     ^(CALayer *obj, CGFloat values[]) {
         values[0] = [obj shadowRadius];
     },
     ^(CALayer *obj, const CGFloat values[]) {
         [obj setShadowRadius:values[0]];
     },
-    0.01
+    kPOPThresholdRadius
   },
-  
+
   /* CAShapeLayer */
-  
+
   {kPOPShapeLayerStrokeStart,
     ^(CAShapeLayer *obj, CGFloat values[]) {
       values[0] = obj.strokeStart;
@@ -420,7 +432,7 @@
     },
     0.01
   },
-    
+
   {kPOPShapeLayerStrokeColor,
     ^(CAShapeLayer *obj, CGFloat values[]) {
         POPCGColorGetRGBAComponents(obj.strokeColor, values);
@@ -444,9 +456,9 @@
   },
 
 #if TARGET_OS_IPHONE
-  
+
   /* UIView */
-  
+
   {kPOPViewAlpha,
     ^(UIView *obj, CGFloat values[]) {
       values[0] = obj.alpha;
@@ -516,9 +528,9 @@
     },
     kPOPThresholdScale
   },
-  
+
   /* UIScrollView */
-  
+
   {kPOPScrollViewContentOffset,
     ^(UIScrollView *obj, CGFloat values[]) {
       values_from_point(values, obj.contentOffset);
@@ -538,9 +550,9 @@
     },
     kPOPThresholdPoint
   },
-  
+
   /* UINavigationBar */
-    
+
   {kPOPNavigationBarBarTintColor,
     ^(UINavigationBar *obj, CGFloat values[]) { 
       POPUIColorGetRGBAComponents(obj.barTintColor, values);
@@ -550,9 +562,9 @@
     },
     kPOPThresholdColor
   },
-  
+
   /* UILabel */
-  
+
   {kPOPLabelTextColor,
     ^(UILabel *obj, CGFloat values[]) {
       POPUIColorGetRGBAComponents(obj.textColor, values);