Merge branch 'nicopasso-master'

owenv · May 1, 2014 · 046da74 · 046da74
2 parents 3127156 + cb386ff
commit 046da74
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/pop/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h
@@ -151,5 +151,9 @@ extern NSString * const kPOPScrollViewContentSize;
 extern NSString * const kPOPTableViewContentOffset;
 extern NSString * const kPOPTableViewContentSize;
 
+/**
+ Common UINavigationBar property names.
+ */
+extern NSString * const kPOPNavigationBarBarTintColor;
 
 #endif
diff --git a/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm
@@ -16,8 +16,7 @@
 #import <POP/POPLayerExtras.h>
 
 #if TARGET_OS_IPHONE
-#import <UIKit/UIView.h>
-#import <UIKit/UIScrollView.h>
+#import <UIKit/UIKit.h>
 #else
 #import <AppKit/NSLayoutConstraint.h>
 #endif
@@ -70,6 +69,8 @@
 NSString * const kPOPTableViewContentOffset = kPOPScrollViewContentOffset;
 NSString * const kPOPTableViewContentSize = kPOPScrollViewContentSize;
 
+NSString * const kPOPNavigationBarBarTintColor = @"barTintColor";
+
 /**
  State structure internal to static animatable property.
  */
@@ -453,6 +454,18 @@
     },
     1.0
   },
+
+  /* UINavigationBar */
+
+  {kPOPNavigationBarBarTintColor,
+    ^(UINavigationBar *obj, CGFloat values[]) { 
+      POPUIColorGetRGBAComponents(obj.barTintColor, values);
+    },
+    ^(UINavigationBar *obj, const CGFloat values[]) {
+      obj.barTintColor = POPUIColorRGBACreate(values);
+    },
+    1.0
+  }
 
 #endif