Improve API

UIImage+ColorArt category for ease of use.

Author: fleitz

ColorArt.xcodeproj/project.pbxproj

@@ -25,6 +25,7 @@
 		B62026F416788B34004F3873 /* PCFadedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = B62026E516788B34004F3873 /* PCFadedImageView.m */; };
 		B63779DC16799D4200E79BFE /* SLColorArt.m in Sources */ = {isa = PBXBuildFile; fileRef = B63779DA16799D4200E79BFE /* SLColorArt.m */; };
 		B63779DF16799D7E00E79BFE /* LBGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = B63779DE16799D7E00E79BFE /* LBGradient.m */; };
+		B6934671167F215400B7590D /* UIImage+ColorArt.m in Sources */ = {isa = PBXBuildFile; fileRef = B6934670167F215400B7590D /* UIImage+ColorArt.m */; };
 		B6CDCAA5167D6F5700A8D642 /* UIImage+Scale.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CDCAA4167D6F5700A8D642 /* UIImage+Scale.m */; };
 /* End PBXBuildFile section */
 
@@ -55,6 +56,8 @@
 		B63779DA16799D4200E79BFE /* SLColorArt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SLColorArt.m; sourceTree = "<group>"; };
 		B63779DD16799D7E00E79BFE /* LBGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LBGradient.h; sourceTree = "<group>"; };
 		B63779DE16799D7E00E79BFE /* LBGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LBGradient.m; sourceTree = "<group>"; };
+		B693466F167F215400B7590D /* UIImage+ColorArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+ColorArt.h"; sourceTree = "<group>"; };
+		B6934670167F215400B7590D /* UIImage+ColorArt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+ColorArt.m"; sourceTree = "<group>"; };
 		B6CDCAA3167D6F5700A8D642 /* UIImage+Scale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Scale.h"; sourceTree = "<group>"; };
 		B6CDCAA4167D6F5700A8D642 /* UIImage+Scale.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Scale.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -144,6 +147,8 @@
 				B63779DA16799D4200E79BFE /* SLColorArt.m */,
 				B6CDCAA3167D6F5700A8D642 /* UIImage+Scale.h */,
 				B6CDCAA4167D6F5700A8D642 /* UIImage+Scale.m */,
+				B693466F167F215400B7590D /* UIImage+ColorArt.h */,
+				B6934670167F215400B7590D /* UIImage+ColorArt.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -225,6 +230,7 @@
 				B63779DC16799D4200E79BFE /* SLColorArt.m in Sources */,
 				B63779DF16799D7E00E79BFE /* LBGradient.m in Sources */,
 				B6CDCAA5167D6F5700A8D642 /* UIImage+Scale.m in Sources */,
+				B6934671167F215400B7590D /* UIImage+ColorArt.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ColorArt/CAViewController.m

@@ -9,6 +9,7 @@
 #import "CAViewController.h"
 #import "SLColorArt.h"  
 #import "UIImage+Scale.h"
+#import "UIImage+ColorArt.h"
 @interface CAViewController ()
 
 @end
@@ -27,11 +28,9 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 - (void)colorizeForImage:(UIImage *)image
 {
     image = [image scaledToSize:self.fadedImageView.frame.size];
-    SLColorArt *colorArt = [[SLColorArt alloc] initWithImage:image scaledSize: self.fadedImageView.frame.size];
-    CGRect f = self.fadedImageView.frame;
-    f.size = colorArt.scaledImage.size;
+    SLColorArt *colorArt = [image colorArt];
     self.fadedImageView.backgroundColor = colorArt.backgroundColor;
-    self.fadedImageView.image = colorArt.scaledImage;
+    self.fadedImageView.image = image;
     self.view.backgroundColor = colorArt.backgroundColor;
     self.headline.textColor = colorArt.primaryColor;
     self.subHeadline.textColor = colorArt.secondaryColor;

ColorArt/Classes/SLColorArt.h

@@ -22,7 +22,6 @@
 @property(strong, nonatomic, readonly) UIColor *primaryColor;
 @property(strong, nonatomic, readonly) UIColor *secondaryColor;
 @property(strong, nonatomic, readonly) UIColor *detailColor;
-@property(nonatomic, copy) UIImage *scaledImage;
 
-- (id)initWithImage:(UIImage*)image scaledSize:(CGSize)size;
+- (id)initWithImage:(UIImage*)image;
 @end

ColorArt/Classes/SLColorArt.m

@@ -46,7 +46,6 @@ - (id)initWithColor:(UIColor*)color count:(NSUInteger)count;
 
 @interface SLColorArt ()
 @property(nonatomic, copy) UIImage *image;
-@property CGSize scaledSize;
 @property(nonatomic,readwrite,strong) UIColor *backgroundColor;
 @property(nonatomic,readwrite,strong) UIColor *primaryColor;
 @property(nonatomic,readwrite,strong) UIColor *secondaryColor;
@@ -55,14 +54,13 @@ @interface SLColorArt ()
 
 @implementation SLColorArt
 
-- (id)initWithImage:(UIImage*)image scaledSize:(CGSize)size
+- (id)initWithImage:(UIImage*)image
 {
     self = [super init];
 
     if (self)
     {
         self.image = image;
-        self.scaledSize = size;
         [self _processImage];
     }
 
@@ -71,7 +69,7 @@ - (id)initWithImage:(UIImage*)image scaledSize:(CGSize)size
 
 - (void)_processImage
 {
-    UIImage *finalImage = [self _scaleImage:self.image size:self.scaledSize];
+    //UIImage *finalImage = [self _scaleImage:self.image size:self.scaledSize];
 
     NSDictionary *colors = [self _analyzeImage:self.image];
 
@@ -80,7 +78,7 @@ - (void)_processImage
     self.secondaryColor = [colors objectForKey:kAnalyzedSecondaryColor];
     self.detailColor = [colors objectForKey:kAnalyzedDetailColor];
 
-    self.scaledImage = finalImage;
+    //self.scaledImage = finalImage;
 }
 
 - (UIImage*)_scaleImage:(UIImage*)image size:(CGSize)scaledSize

ColorArt/Classes/UIImage+ColorArt.h

@@ -0,0 +1,17 @@
+//
+//  UIImage+ColorArt.h
+//  ColorArt
+//
+//  Created by Fred Leitz on 2012-12-17.
+//  Copyright (c) 2012 Fred Leitz. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "SLColorArt.h"
+
+@interface UIImage (ColorArt)
+
+- (SLColorArt*) colorArt;
+- (SLColorArt*) colorArt:(CGSize)scale;
+
+@end

ColorArt/Classes/UIImage+ColorArt.m

@@ -0,0 +1,21 @@
+//
+//  UIImage+ColorArt.m
+//  ColorArt
+//
+//  Created by Fred Leitz on 2012-12-17.
+//  Copyright (c) 2012 Fred Leitz. All rights reserved.
+//
+
+#import "UIImage+ColorArt.h"
+#import "UIImage+Scale.h"
+@implementation UIImage (ColorArt)
+
+- (SLColorArt *)colorArt:(CGSize)scale{
+    return [[SLColorArt alloc] initWithImage:[self scaledToSize: scale]];
+}
+
+- (SLColorArt *)colorArt{
+    return [self colorArt:CGSizeMake(512, 512)];
+}
+
+@end