Updated project, code style.

RedMadRobot · Mar 16, 2016 · 967c98d · 967c98d
1 parent d3b0530
commit 967c98d
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 265 deletions.
diff --git a/RMRColorTools.xcodeproj/project.pbxproj b/RMRColorTools.xcodeproj/project.pbxproj
@@ -135,7 +135,9 @@
 				83D118011AB9D40000D3C7B9 /* Products */,
 				73759BFC0E0AC409E9F99B58 /* Frameworks */,
 			);
+			indentWidth = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
 		};
 		83D118011AB9D40000D3C7B9 /* Products */ = {
 			isa = PBXGroup;
@@ -243,7 +245,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = RMR;
-				LastUpgradeCheck = 0620;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = RedMadRobot;
 				TargetAttributes = {
 					83C30F261ABC427D00C425DD = {
@@ -326,6 +328,7 @@
 				INFOPLIST_FILE = RMRRefreshColorPanelPlugin/Info.plist;
 				INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "redmadrobot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xcplugin;
 			};
@@ -340,6 +343,7 @@
 				INFOPLIST_FILE = RMRRefreshColorPanelPlugin/Info.plist;
 				INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "redmadrobot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xcplugin;
 			};
@@ -364,6 +368,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;

diff --git a/RMRHexColorGen/Classes/Helper/NSColor+Hexadecimal.m b/RMRHexColorGen/Classes/Helper/NSColor+Hexadecimal.m
@@ -14,57 +14,49 @@ @implementation NSColor (Hexadecimal)
 
 + (NSColor *)colorWithHexString:(NSString *)hexString
 {
-  NSString *colorString =
-      [[hexString stringByReplacingOccurrencesOfString:@"#"
-                                            withString:@""] uppercaseString];
-  colorString =
-      [colorString stringByTrimmingCharactersInSet:
-                       [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    NSString *colorString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""].uppercaseString;
+    colorString = [colorString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
 
-  CGFloat alpha, red, blue, green;
+    CGFloat alpha, red, blue, green;
 
-  switch ([colorString length]) {
-      case 3: // #RGB
-        alpha = 1.0f;
-        red   = [self colorComponentFrom:colorString start:0 length:1];
-        green = [self colorComponentFrom:colorString start:1 length:1];
-        blue  = [self colorComponentFrom:colorString start:2 length:1];
-        break;
-      case 4: // #ARGB
-        alpha = [self colorComponentFrom:colorString start:0 length:1];
-        red   = [self colorComponentFrom:colorString start:1 length:1];
-        green = [self colorComponentFrom:colorString start:2 length:1];
-        blue  = [self colorComponentFrom:colorString start:3 length:1];
-        break;
-      case 6: // #RRGGBB
-        alpha = 1.0f;
-        red   = [self colorComponentFrom:colorString start:0 length:2];
-        green = [self colorComponentFrom:colorString start:2 length:2];
-        blue  = [self colorComponentFrom:colorString start:4 length:2];
-        break;
-      case 8: // #AARRGGBB
-        alpha = [self colorComponentFrom:colorString start:0 length:2];
-        red   = [self colorComponentFrom:colorString start:2 length:2];
-        green = [self colorComponentFrom:colorString start:4 length:2];
-        blue  = [self colorComponentFrom:colorString start:6 length:2];
-        break;
-      default:
-        [NSException raise:@"Invalid color value"
-                    format:@"Color value %@ is invalid.  It should be a hex value "
-                           @"of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", hexString];
-  }
+    switch ([colorString length]) {
+        case 3: // #RGB
+            alpha = 1.0f;
+            red = [self colorComponentFrom:colorString start:0 length:1];
+            green = [self colorComponentFrom:colorString start:1 length:1];
+            blue = [self colorComponentFrom:colorString start:2 length:1];
+            break;
+        case 4: // #ARGB
+            alpha = [self colorComponentFrom:colorString start:0 length:1];
+            red = [self colorComponentFrom:colorString start:1 length:1];
+            green = [self colorComponentFrom:colorString start:2 length:1];
+            blue = [self colorComponentFrom:colorString start:3 length:1];
+            break;
+        case 6: // #RRGGBB
+            alpha = 1.0f;
+            red = [self colorComponentFrom:colorString start:0 length:2];
+            green = [self colorComponentFrom:colorString start:2 length:2];
+            blue = [self colorComponentFrom:colorString start:4 length:2];
+            break;
+        case 8: // #AARRGGBB
+            alpha = [self colorComponentFrom:colorString start:0 length:2];
+            red = [self colorComponentFrom:colorString start:2 length:2];
+            green = [self colorComponentFrom:colorString start:4 length:2];
+            blue = [self colorComponentFrom:colorString start:6 length:2];
+            break;
+        default:
+            [NSException raise:@"Invalid color value"
+                        format:@"Color value %@ is invalid.  It should be a hex value "
+                               @"of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", hexString];
+    }
 
     return [NSColor colorWithDeviceRed:red green:green blue:blue alpha:alpha];
 }
 
-+ (CGFloat)colorComponentFrom:(NSString *)string
-                        start:(NSUInteger)start
-                       length:(NSUInteger)length
++ (CGFloat)colorComponentFrom:(NSString *)string start:(NSUInteger)start length:(NSUInteger)length
 {
-  NSString *substring = [string substringWithRange:NSMakeRange(start, length)];
-
-    NSString *fullHex =
-      length == 2 ? substring : [substring stringByAppendingString:substring];
+    NSString *substring = [string substringWithRange:NSMakeRange(start, length)];
+    NSString *fullHex = length == 2 ? substring : [substring stringByAppendingString:substring];
 
     unsigned hexComponent;
 

diff --git a/RMRHexColorGen/Classes/Helper/NSColorList+RMRHexColor.h b/RMRHexColorGen/Classes/Helper/NSColorList+RMRHexColor.h
@@ -11,7 +11,6 @@
 
 @interface NSColorList (RMRHexColor)
 
-- (void)fillWithHexColors:(NSArray *)hexColorList
-                   prefix:(NSString *)prefix;
+- (void)fillWithHexColors:(NSArray *)hexColorList prefix:(NSString *)prefix;
 
 @end
diff --git a/RMRHexColorGen/Classes/Helper/NSColorList+RMRHexColor.m b/RMRHexColorGen/Classes/Helper/NSColorList+RMRHexColor.m
@@ -18,24 +18,19 @@
 
 @implementation NSColorList (RMRHexColor)
 
-- (void)fillWithHexColors:(NSArray *)hexColorList
-                   prefix:(NSString *)prefix
+- (void)fillWithHexColors:(NSArray *)hexColorList prefix:(NSString *)prefix
 {
     prefix = [prefix uppercaseString];
 
     for (RMRHexColor *hexColor in hexColorList) {
         NSColor *color = [NSColor colorWithHexString:hexColor.colorValue];
-        NSString *colorName =
-            [prefix stringByAppendingString:[hexColor.colorTitle RMR_uppercaseFisrtSymbol]];
-
+        NSString *colorName = [prefix stringByAppendingString:[hexColor.colorTitle RMR_uppercaseFirstSymbol]];
+
         CGFloat red = [color redComponent];
         CGFloat green = [color greenComponent];
         CGFloat blue = [color blueComponent];
         CGFloat alpha = [color alphaComponent];
-        color = [NSColor colorWithCalibratedRed:red
-                                          green:green
-                                           blue:blue
-                                          alpha:alpha];
+        color = [NSColor colorWithCalibratedRed:red green:green blue:blue alpha:alpha];
 
         [self setColor:color forKey:colorName];
     }

diff --git a/RMRHexColorGen/Classes/Helper/NSString+RMRHelpers.h b/RMRHexColorGen/Classes/Helper/NSString+RMRHelpers.h
@@ -11,8 +11,8 @@
 
 @interface NSString (RMRHelpers)
 
-- (NSString *)RMR_uppercaseFisrtSymbol;
-- (NSString *)RMR_lowercaseFisrtSymbol;
+- (NSString *)RMR_uppercaseFirstSymbol;
+- (NSString *)RMR_lowercaseFirstSymbol;
 - (NSString *)RMR_removeLastCharacter;
 
 @end
diff --git a/RMRHexColorGen/Classes/Helper/NSString+RMRHelpers.m b/RMRHexColorGen/Classes/Helper/NSString+RMRHelpers.m
@@ -11,14 +11,14 @@
 
 @implementation NSString (RMRHelpers)
 
-- (NSString *)RMR_uppercaseFisrtSymbol
+- (NSString *)RMR_uppercaseFirstSymbol
 {
-    return [[[self substringToIndex:1] uppercaseString] stringByAppendingString:[self substringFromIndex:1]];
+    return [[self substringToIndex:1].uppercaseString stringByAppendingString:[self substringFromIndex:1]];
 }
 
-- (NSString *)RMR_lowercaseFisrtSymbol
+- (NSString *)RMR_lowercaseFirstSymbol
 {
-    return [[[self substringToIndex:1] lowercaseString] stringByAppendingString:[self substringFromIndex:1]];
+    return [[self substringToIndex:1].lowercaseString stringByAppendingString:[self substringFromIndex:1]];
 }
 
 - (NSString *)RMR_removeLastCharacter