Move color processing to JS

Reviewed By: @vjeux

Differential Revision: D2346353

Examples/UIExplorer/BorderExample.js

@@ -26,12 +26,12 @@ var styles = StyleSheet.create({
   },
   border1: {
     borderWidth: 10,
-    borderColor: '#a52a2a',
+    borderColor: 'brown',
   },
   borderRadius: {
     borderWidth: 10,
     borderRadius: 10,
-    borderColor: '#00ffff',
+    borderColor: 'cyan',
   },
   border2: {
     borderWidth: 10,

Examples/UIExplorer/PanResponderExample.js

@@ -11,22 +11,22 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * @flow
+ * @flow-weak
  */
 'use strict';
 
 var React = require('react-native');
 var {
-  StyleSheet,
   PanResponder,
+  StyleSheet,
   View,
+  processColor,
 } = React;
 
 var CIRCLE_SIZE = 80;
 var CIRCLE_COLOR = 'blue';
 var CIRCLE_HIGHLIGHT_COLOR = 'green';
 
-
 var PanResponderExample = React.createClass({
 
   statics: {
@@ -78,13 +78,13 @@ var PanResponderExample = React.createClass({
 
   _highlight: function() {
     this.circle && this.circle.setNativeProps({
-      backgroundColor: CIRCLE_HIGHLIGHT_COLOR
+      backgroundColor: processColor(CIRCLE_HIGHLIGHT_COLOR)
     });
   },
 
   _unHighlight: function() {
     this.circle && this.circle.setNativeProps({
-      backgroundColor: CIRCLE_COLOR
+      backgroundColor: processColor(CIRCLE_COLOR)
     });
   },
 

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj

@@ -57,7 +57,6 @@
 		83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
 		8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
 		8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
-		83A936C81B7E0F08005B9C36 /* RCTConvert_UIColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A936C71B7E0F08005B9C36 /* RCTConvert_UIColorTests.m */; };
 		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
 /* End PBXBuildFile section */
 
@@ -231,7 +230,6 @@
 		8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderTests.m; sourceTree = "<group>"; };
 		8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderHelpers.m; sourceTree = "<group>"; };
 		8385CF051B8747A000C6273E /* RCTImageLoaderHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTImageLoaderHelpers.h; sourceTree = "<group>"; };
-		83A936C71B7E0F08005B9C36 /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = "<group>"; };
 		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -385,7 +383,6 @@
 				138D6A151B53CD440074A87E /* RCTCacheTests.m */,
 				1497CFA61B21F5E400C1F8F2 /* RCTContextExecutorTests.m */,
 				1497CFA71B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m */,
-				83A936C71B7E0F08005B9C36 /* RCTConvert_UIColorTests.m */,
 				1497CFA81B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m */,
 				1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */,
 				1300627E1B59179B0043FE5A /* RCTGzipTests.m */,
@@ -846,7 +843,6 @@
 				138D6A171B53CD440074A87E /* RCTCacheTests.m in Sources */,
 				13DB03481B5D2ED500C27245 /* RCTJSONTests.m in Sources */,
 				1497CFAC1B21F5E400C1F8F2 /* RCTAllocationTests.m in Sources */,
-				83A936C81B7E0F08005B9C36 /* RCTConvert_UIColorTests.m in Sources */,
 				13DF61B61B67A45000EDB188 /* RCTMethodArgumentTests.m in Sources */,
 				138D6A181B53CD440074A87E /* RCTShadowViewTests.m in Sources */,
 				8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */,

Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_UIColorTests.m

@@ -1,79 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <XCTest/XCTest.h>
-
-#import "RCTConvert.h"
-
-@interface RCTConvert_UIColorTests : XCTestCase
-
-@end
-
-@implementation RCTConvert_UIColorTests
-
-#define XCTAssertEqualColors(color1, color2) do { \
-  CGFloat r1, g1, b1, a1; \
-  CGFloat r2, g2, b2, a2; \
-  XCTAssertTrue([(color1) getRed:&r1 green:&g1 blue:&b1 alpha:&a1] && \
-    [(color2) getRed:&r2 green:&g2 blue:&b2 alpha:&a2] && \
-    r1 == r2 && g1 == g2 && b1 == b2 && a1 == a2, \
-    @"rgba(%d, %d, %d, %.3f) != rgba(%d, %d, %d, %.3f)", \
-    (int)(r1 * 255), (int)(g1 * 255), (int)(b1 * 255), a1, \
-    (int)(r2 * 255), (int)(g2 * 255), (int)(b2 * 255), a2 \
-  ); \
-} while (0)
-
-- (void)testHex3
-{
-  UIColor *color = [RCTConvert UIColor:@"#333"];
-  UIColor *expected = [UIColor colorWithWhite:0.2 alpha:1.0];
-  XCTAssertEqualColors(color, expected);
-}
-
-- (void)testHex6
-{
-  UIColor *color = [RCTConvert UIColor:@"#666"];
-  UIColor *expected = [UIColor colorWithWhite:0.4 alpha:1.0];
-  XCTAssertEqualColors(color, expected);
-}
-
-- (void)testRGB
-{
-  UIColor *color = [RCTConvert UIColor:@"rgb(51, 102, 153)"];
-  UIColor *expected = [UIColor colorWithRed:0.2 green:0.4 blue:0.6 alpha:1.0];
-  XCTAssertEqualColors(color, expected);
-}
-
-- (void)testRGBA
-{
-  UIColor *color = [RCTConvert UIColor:@"rgba(51, 102, 153, 0.5)"];
-  UIColor *expected = [UIColor colorWithRed:0.2 green:0.4 blue:0.6 alpha:0.5];
-  XCTAssertEqualColors(color, expected);
-}
-
-- (void)testHSL
-{
-  UIColor *color = [RCTConvert UIColor:@"hsl(30, 50%, 50%)"];
-  UIColor *expected = [UIColor colorWithHue:30.0 / 360.0 saturation:0.5 brightness:0.5 alpha:1.0];
-  XCTAssertEqualColors(color, expected);
-}
-
-- (void)testHSLA
-{
-  UIColor *color = [RCTConvert UIColor:@"hsla(30, 50%, 50%, 0.5)"];
-  UIColor *expected = [UIColor colorWithHue:30.0 / 360.0 saturation:0.5 brightness:0.5 alpha:0.5];
-  XCTAssertEqualColors(color, expected);
-}
-
-@end