Merge pull request facebookarchive#44 from RuiAAPeres/master

Added strokeColor Property & fixed a small typo
owenv · May 2, 2014 · 9d2b04c · 9d2b04c
2 parents 3be2d77 + 8a12d5e
commit 9d2b04c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/pop-tests/POPAnimatablePropertyTests.mm b/pop-tests/POPAnimatablePropertyTests.mm
@@ -45,6 +45,7 @@ - (void)testProvidedExistence
                      kPOPLayerRotationX,
                      kPOPShapeLayerStrokeStart,
                      kPOPShapeLayerStrokeEnd,
+                     kPOPShapeLayerStrokeColor,
 #if TARGET_OS_IPHONE
                      kPOPViewAlpha,
                      kPOPViewBackgroundColor,

diff --git a/pop/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h
@@ -116,6 +116,7 @@ extern NSString * const kPOPLayerZPosition;
  */
 extern NSString * const kPOPShapeLayerStrokeStart;
 extern NSString * const kPOPShapeLayerStrokeEnd;
+extern NSString * const kPOPShapeLayerStrokeColor;
 
 /**
  Common NSLayoutConstraint property names.

diff --git a/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm
@@ -48,7 +48,8 @@
 NSString * const kPOPLayerZPosition = @"zPosition";
 
 NSString * const kPOPShapeLayerStrokeStart = @"shapeLayer.strokeStart";
-NSString * const kPOPShapeLayerStrokeEnd = @"shaperLayer.strokeEnd";
+NSString * const kPOPShapeLayerStrokeEnd = @"shapeLayer.strokeEnd";
+NSString * const kPOPShapeLayerStrokeColor = @"shapeLayer.strokeColor";
 
 NSString * const kPOPLayoutConstraintConstant = @"layoutConstraint.constant";
 
@@ -348,6 +349,18 @@
     },
     0.01
   },
+
+  {kPOPShapeLayerStrokeColor,
+    ^(CAShapeLayer *obj, CGFloat values[]) {
+        POPCGColorGetRGBAComponents(obj.strokeColor, values);
+    },
+    ^(CAShapeLayer *obj, const CGFloat values[]) {
+        CGColorRef color = POPCGColorRGBACreate(values);
+        [obj setStrokeColor:color];
+        CGColorRelease(color);
+    },
+    0.01
+  },
 
   {kPOPLayoutConstraintConstant,
     ^(NSLayoutConstraint *obj, CGFloat values[]) {