From 619c26f3be560ba9d873e3cb0f23684294c0a751 Mon Sep 17 00:00:00 2001 From: Sam Soffes Date: Wed, 24 Jul 2013 00:06:54 -0400 Subject: [PATCH] Version 0.3.0 --- SAMCategories.podspec | 2 +- SAMCategories/UIKit/UIColor+SAMAdditions.m | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/SAMCategories.podspec b/SAMCategories.podspec index 5f3dabd..f5919db 100644 --- a/SAMCategories.podspec +++ b/SAMCategories.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'SAMCategories' - spec.version = '0.2.0' + spec.version = '0.3.0' spec.authors = { 'Sam Soffes' => 'sam@soff.es' } spec.homepage = 'https://github.com/soffes/SAMCategories' spec.summary = 'Foundation and UIKit categories.' diff --git a/SAMCategories/UIKit/UIColor+SAMAdditions.m b/SAMCategories/UIKit/UIColor+SAMAdditions.m index 75d3979..9c9cd72 100644 --- a/SAMCategories/UIKit/UIColor+SAMAdditions.m +++ b/SAMCategories/UIKit/UIColor+SAMAdditions.m @@ -31,11 +31,6 @@ + (instancetype)sam_colorWithHue:(CGFloat)hue saturation:(CGFloat)saturation lig + (instancetype)sam_colorWithCSS:(NSString *)css { - // Transparent - if ([css isEqualToString:@"transparent"]) { - return [self clearColor]; - } - // RGB if ([css hasPrefix:@"rgb"]) { return [self sam_colorWithRGB:css]; @@ -57,6 +52,13 @@ + (instancetype)sam_colorWithCSS:(NSString *)css { + (instancetype)sam_colorWithCSSName:(NSString *)name { + name = [name lowercaseString]; + + // Transparent + if ([name isEqualToString:@"transparent"]) { + return [self clearColor]; + } + static NSDictionary *namedColors = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -230,7 +232,7 @@ + (instancetype)sam_colorWithCSSName:(NSString *)name { }; }); - NSString *rgb = namedColors[name.lowercaseString]; + NSString *rgb = namedColors[name]; if (rgb) { return [self sam_colorWithRGB:rgb]; }