Add overriding class method(layerClass) example.

kishikawakatsumi · kishikawakatsumi · commit 02d42f7df4e3 · 2014-02-05T06:28:53.000+09:00
diff --git a/Classes/iOS/FrameworkSupport/UIKit/JSBUIColor.h b/Classes/iOS/FrameworkSupport/UIKit/JSBUIColor.h
@@ -22,7 +22,7 @@
 + (UIColor *)colorWithWhite:(CGFloat)white alpha:(CGFloat)alpha;
 + (UIColor *)colorWithHue:(CGFloat)hue saturation:(CGFloat)saturation brightness:(CGFloat)brightness alpha:(CGFloat)alpha;
 + (UIColor *)colorWithRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha;
-+ (UIColor *)colorWithCGColor:(CGColorRef)cgColor;
++ (UIColor *)colorWithCGColor:(id)cgColor;
 + (UIColor *)colorWithPatternImage:(UIImage *)image;
 + (UIColor *)colorWithCIColor:(CIColor *)ciColor;
 + (UIColor *)blackColor;
@@ -44,7 +44,7 @@
 - (UIColor *)initWithWhite:(CGFloat)white alpha:(CGFloat)alpha;
 - (UIColor *)initWithHue:(CGFloat)hue saturation:(CGFloat)saturation brightness:(CGFloat)brightness alpha:(CGFloat)alpha;
 - (UIColor *)initWithRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha;
-- (UIColor *)initWithCGColor:(CGColorRef)cgColor;
+- (UIColor *)initWithCGColor:(id)cgColor;
 - (UIColor *)initWithPatternImage:(UIImage *)image;
 - (UIColor *)initWithCIColor:(CIColor *)ciColor;
 - (void)set;
@@ -54,7 +54,7 @@
 - (BOOL)getHue:(CGFloat *)hue saturation:(CGFloat *)saturation brightness:(CGFloat *)brightness alpha:(CGFloat *)alpha;
 - (BOOL)getRed:(CGFloat *)red green:(CGFloat *)green blue:(CGFloat *)blue alpha:(CGFloat *)alpha;
 - (UIColor *)colorWithAlphaComponent:(CGFloat)alpha;
-- (CGColorRef)CGColor;
+- (id)CGColor;
 
 #pragma clang diagnostic pop
 
diff --git a/Examples/UICatalog/UICatalog.xcodeproj/project.pbxproj b/Examples/UICatalog/UICatalog.xcodeproj/project.pbxproj
@@ -71,6 +71,7 @@
 		14B5CD301875C3740019A135 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B5CD2F1875C3740019A135 /* AppDelegate.m */; };
 		14B5CD321875C3740019A135 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14B5CD311875C3740019A135 /* Images.xcassets */; };
 		14D6C30C18793F12005C7018 /* collectionViewController.js in Resources */ = {isa = PBXBuildFile; fileRef = 14D6C30B18793F12005C7018 /* collectionViewController.js */; };
+		14F55CFB18A1882E008B798E /* gradientViewController.js in Resources */ = {isa = PBXBuildFile; fileRef = 14F55CFA18A1882E008B798E /* gradientViewController.js */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -803,6 +804,7 @@
 		14B5CD311875C3740019A135 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		14B5CD381875C3750019A135 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		14D6C30B18793F12005C7018 /* collectionViewController.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = collectionViewController.js; path = js/collectionViewController.js; sourceTree = "<group>"; };
+		14F55CFA18A1882E008B798E /* gradientViewController.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = gradientViewController.js; path = js/gradientViewController.js; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1782,6 +1784,7 @@
 				14A045011877E7B1004831E8 /* webViewController.js */,
 				14A0450D1877E870004831E8 /* mapViewController.js */,
 				149ED65018A148230078236E /* gestureViewController.js */,
+				14F55CFA18A1882E008B798E /* gradientViewController.js */,
 			);
 			name = js;
 			sourceTree = "<group>";
@@ -1937,6 +1940,7 @@
 				14A0450E1877E870004831E8 /* mapViewController.js in Resources */,
 				149ED65218A1483D0078236E /* gestureViewController.js in Resources */,
 				14B5CD2A1875C3740019A135 /* InfoPlist.strings in Resources */,
+				14F55CFB18A1882E008B798E /* gradientViewController.js in Resources */,
 				14B5CD321875C3740019A135 /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Examples/UICatalog/UICatalog/js/gradientViewController.js b/Examples/UICatalog/UICatalog/js/gradientViewController.js
@@ -0,0 +1,31 @@
+var GradientView = JSB.defineClass('GradientView : UIView', {
+  initWithFrame: function(frame) {
+    var layer = self.layer;
+    layer.startPoint = {x: 0.0, y: 0.5};
+    layer.endPoint = {x: 1.0, y: 0.5};
+
+    var colors = [];
+    for (var deg = 0; deg <= 360; deg += 5) {
+      var color = UIColor.colorWithHueSaturationBrightnessAlpha(1.0 * deg / 360.0, 1.0, 1.0, 1.0);
+      colors.push(color.CGColor());
+    }
+    layer.colors = colors;
+
+    return self;
+  }
+}, {
+  layerClass: function() {
+    return CAGradientLayer;
+  }
+});
+
+var GradientViewController = JSB.defineClass('GradientViewController : UIViewController', {
+  viewDidLoad: function() {
+    self.navigationItem.title = 'Gradient Layer';
+
+    var gradientView = GradientView.alloc().initWithFrame(self.view.bounds);
+    self.view.addSubview(gradientView);
+  }
+});
+
+JSB.exports = GradientViewController;
diff --git a/Examples/UICatalog/UICatalog/js/mainViewController.js b/Examples/UICatalog/UICatalog/js/mainViewController.js
@@ -5,6 +5,7 @@ var CollectionViewController = JSB.require('collectionViewController');
 var WebViewController = JSB.require('webViewController');
 var MapViewController = JSB.require('mapViewController');
 var GestureViewController = JSB.require('gestureViewController');
+var GradientViewController = JSB.require('gradientViewController');
 
 var MainViewController = JSB.defineClass('MainViewController : UITableViewController', {
   viewDidLoad: function() {
@@ -44,6 +45,11 @@ var MainViewController = JSB.defineClass('MainViewController : UITableViewContro
       title: 'Gesture',
       explanation: 'Use of UIGestureRecognizer',
       viewController: GestureViewController.alloc().init()
+    },
+    {
+      title: 'Gradient Layer',
+      explanation: 'Use of CAGradientLayer',
+      viewController: GradientViewController.alloc().init()
     }]
   },
   tableViewNumberOfRowsInSection: function(tableView, section) {
