THContactBubble: added THBubbleColor instead tree colors

added initWithName:color:borderColor method

It is more comfortable to have one color property instead of three.

ContactPicker.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		29A71C151644834B005286F1 /* THContactPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A71C141644834B005286F1 /* THContactPickerView.m */; };
 		29A71C1816448473005286F1 /* THContactBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A71C1716448473005286F1 /* THContactBubble.m */; };
 		6AE31FCC1644DB2C00505230 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AE31FCB1644DB2C00505230 /* QuartzCore.framework */; };
+		84F796481670C79500A8965D /* THBubbleColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F796471670C79500A8965D /* THBubbleColor.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -45,6 +46,8 @@
 		29A71C1616448473005286F1 /* THContactBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THContactBubble.h; sourceTree = "<group>"; };
 		29A71C1716448473005286F1 /* THContactBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THContactBubble.m; sourceTree = "<group>"; };
 		6AE31FCB1644DB2C00505230 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		84F796461670C79500A8965D /* THBubbleColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THBubbleColor.h; sourceTree = "<group>"; };
+		84F796471670C79500A8965D /* THBubbleColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THBubbleColor.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +106,8 @@
 				29A71C0E164482BB005286F1 /* THContactPickerViewController.h */,
 				29A71C0F164482BB005286F1 /* THContactPickerViewController.m */,
 				29A71C10164482BB005286F1 /* THContactPickerViewController.xib */,
+				84F796461670C79500A8965D /* THBubbleColor.h */,
+				84F796471670C79500A8965D /* THBubbleColor.m */,
 			);
 			path = ContactPicker;
 			sourceTree = "<group>";
@@ -192,6 +197,7 @@
 				29A71C11164482BB005286F1 /* THContactPickerViewController.m in Sources */,
 				29A71C151644834B005286F1 /* THContactPickerView.m in Sources */,
 				29A71C1816448473005286F1 /* THContactBubble.m in Sources */,
+				84F796481670C79500A8965D /* THBubbleColor.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ContactPicker/THBubbleColor.h

@@ -0,0 +1,21 @@
+//
+//  THBubbleColor.h
+//  ContactPicker
+//
+//  Created by Dmitry Vorobjov on 12/6/12.
+//  Copyright (c) 2012 Tristan Himmelman. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface THBubbleColor : NSObject
+
+@property (nonatomic, strong) UIColor *gradientTop;
+@property (nonatomic, strong) UIColor *gradientBottom;
+@property (nonatomic, strong) UIColor *border;
+
+- (id)initWithGradientTop:(UIColor *)gradientTop
+           gradientBottom:(UIColor *)gradientBottom
+                   border:(UIColor *)border;
+
+@end

ContactPicker/THBubbleColor.m

@@ -0,0 +1,24 @@
+//
+//  THBubbleColor.m
+//  ContactPicker
+//
+//  Created by Dmitry Vorobjov on 12/6/12.
+//  Copyright (c) 2012 Tristan Himmelman. All rights reserved.
+//
+
+#import "THBubbleColor.h"
+
+@implementation THBubbleColor
+
+- (id)initWithGradientTop:(UIColor *)gradientTop
+           gradientBottom:(UIColor *)gradientBottom
+                   border:(UIColor *)border {
+    if (self = [super init]) {
+        self.gradientTop = gradientTop;
+        self.gradientBottom = gradientBottom;
+        self.border = border;
+    }
+    return self;
+}
+
+@end

ContactPicker/THContactBubble.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import <QuartzCore/QuartzCore.h>
+#import "THBubbleColor.h"
 
 @class THContactBubble;
 
@@ -27,15 +28,14 @@
 @property (nonatomic, assign) id <THContactBubbleDelegate>delegate;
 @property (nonatomic, strong) CAGradientLayer *gradientLayer;
 
-@property (nonatomic, strong) UIColor *colorGradientTop;
-@property (nonatomic, strong) UIColor *colorGradientBottom;
-@property (nonatomic, strong) UIColor *colorBorder;
-
-@property (nonatomic, strong) UIColor *colorSelectedGradientTop;
-@property (nonatomic, strong) UIColor *colorSelectedGradientBottom;
-@property (nonatomic, strong) UIColor *colorSelectedBorder;
+@property (nonatomic, strong) THBubbleColor *color;
+@property (nonatomic, strong) THBubbleColor *selectedColor;
 
 - (id)initWithName:(NSString *)name;
+- (id)initWithName:(NSString *)name
+             color:(THBubbleColor *)color
+     selectedColor:(THBubbleColor *)selectedColor;
+
 - (void)select;
 - (void)unSelect;
 - (void)setFont:(UIFont *)font;

ContactPicker/THContactBubble.m

@@ -22,19 +22,33 @@ @implementation THContactBubble
 #define kColorSelectedBorder [UIColor colorWithRed:56.0/255.0 green:0/255.0 blue:233.0/255.0 alpha:1.0]
 
 - (id)initWithName:(NSString *)name {
+    if ([self initWithName:name color:nil selectedColor:nil]) {
+
+    }
+    return self;
+}
+
+- (id)initWithName:(NSString *)name
+             color:(THBubbleColor *)color
+     selectedColor:(THBubbleColor *)selectedColor {
     self = [super init];
     if (self){
         self.name = name;
         self.isSelected = NO;
+
+        if (! color)
+            color = [[THBubbleColor alloc] initWithGradientTop:kColorGradientTop
+                                                gradientBottom:kColorGradientBottom
+                                                        border:kColorBorder];
+
+        if (! selectedColor)
+            color = [[THBubbleColor alloc] initWithGradientTop:kColorSelectedGradientTop
+                                                gradientBottom:kColorSelectedGradientBottom
+                                                        border:kColorSelectedBorder];
 
-        // set colors to defaults
-        self.colorGradientTop = kColorGradientTop;
-        self.colorGradientBottom = kColorGradientBottom;
-        self.colorBorder = kColorBorder;
-
-        self.colorSelectedGradientTop = kColorSelectedGradientTop;
-        self.colorSelectedGradientBottom = kColorSelectedGradientBottom;
-        self.colorSelectedBorder = kColorSelectedBorder;
+        self.color = color;
+        self.selectedColor = selectedColor;
+
 
         [self setupView];
     }
@@ -101,9 +115,9 @@ - (void)select {
     }
 
     CALayer *viewLayer = [self layer];
-    viewLayer.borderColor = self.colorSelectedBorder.CGColor;
+    viewLayer.borderColor = self.selectedColor.border.CGColor;
 
-    self.gradientLayer.colors = [NSArray arrayWithObjects:(id)[self.colorSelectedGradientTop CGColor], (id)[self.colorSelectedGradientBottom CGColor], nil];
+    self.gradientLayer.colors = [NSArray arrayWithObjects:(id)[self.selectedColor.gradientTop CGColor], (id)[self.selectedColor.gradientBottom CGColor], nil];
 
     self.label.textColor = [UIColor whiteColor];
 
@@ -114,9 +128,9 @@ - (void)select {
 
 - (void)unSelect {
     CALayer *viewLayer = [self layer];
-    viewLayer.borderColor = self.colorBorder.CGColor;
+    viewLayer.borderColor = self.color.border.CGColor;
 
-    self.gradientLayer.colors = [NSArray arrayWithObjects:(id)[self.colorGradientTop CGColor], (id)[self.colorGradientBottom CGColor], nil];
+    self.gradientLayer.colors = [NSArray arrayWithObjects:(id)[self.color.gradientTop CGColor], (id)[self.color.gradientBottom CGColor], nil];
 
     self.label.textColor = [UIColor blackColor];