Merge pull request facebookarchive#53 from waltflanagan/master

Adding ability to animate UILabel.textColor.
owenv · May 6, 2014 · 23b7248 · 23b7248
2 parents 8678237 + 6a80ea4
commit 23b7248
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/pop-tests/POPAnimatablePropertyTests.mm b/pop-tests/POPAnimatablePropertyTests.mm
@@ -54,7 +54,8 @@ - (void)testProvidedExistence
                      kPOPViewBounds,
                      kPOPViewSize,
                      kPOPTableViewContentSize,
-                     kPOPTableViewContentOffset
+                     kPOPTableViewContentOffset,
+                     kPOPLabelTextColor
 #endif
                      ];
 

diff --git a/pop/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h
@@ -167,4 +167,9 @@ extern NSString * const kPOPToolbarBarTintColor;
  */
 extern NSString * const kPOPTabBarBarTintColor;
 
+/**
+ Common UILabel property names.
+ */
+extern NSString * const kPOPLabelTextColor;
+
 #endif
diff --git a/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm
@@ -91,6 +91,9 @@
 // UITabBar
 NSString * const kPOPTabBarBarTintColor = kPOPNavigationBarBarTintColor;
 
+//UILabel
+NSString * const kPOPLabelTextColor = @"label.textColor";
+
 /**
  State structure internal to static animatable property.
  */
@@ -500,6 +503,18 @@
     },
     kPOPThresholdColor
   },
+
+  /* UILabel */
+
+  {kPOPLabelTextColor,
+    ^(UILabel *obj, CGFloat values[]) {
+      POPUIColorGetRGBAComponents(obj.textColor, values);
+    },
+    ^(UILabel *obj, const CGFloat values[]) {
+      obj.textColor = POPUIColorRGBACreate(values);
+    },
+    kPOPThresholdColor
+  },
 
 #endif