works!

davinc · davinc · commit 02a1447b0b17 · 2011-06-26T14:13:21.000+05:30
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -23,6 +23,8 @@
 		4523F24F13B71DA100C883E5 /* VCResponseFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 4523F24713B71DA100C883E5 /* VCResponseFetcher.m */; };
 		4523F25013B71DA100C883E5 /* VCResponseFetchService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4523F24913B71DA100C883E5 /* VCResponseFetchService.m */; };
 		4523F25113B71DA100C883E5 /* VCResponseFetchServiceCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 4523F24B13B71DA100C883E5 /* VCResponseFetchServiceCache.m */; };
+		45B7620813B7258A005ACEA1 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45B7620713B7258A005ACEA1 /* RootViewController.m */; };
+		45B7622813B7280D005ACEA1 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 45B7622713B7280D005ACEA1 /* Icon.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -56,6 +58,9 @@
 		4523F24A13B71DA100C883E5 /* VCResponseFetchServiceCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VCResponseFetchServiceCache.h; sourceTree = "<group>"; };
 		4523F24B13B71DA100C883E5 /* VCResponseFetchServiceCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VCResponseFetchServiceCache.m; sourceTree = "<group>"; };
 		4523F24C13B71DA100C883E5 /* VCResponseFetchServiceDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VCResponseFetchServiceDelegate.h; sourceTree = "<group>"; };
+		45B7620613B7258A005ACEA1 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
+		45B7620713B7258A005ACEA1 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RootViewController.m; sourceTree = "<group>"; };
+		45B7622713B7280D005ACEA1 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -107,10 +112,13 @@
 				4523F24013B71DA100C883E5 /* VCResponseFetcher */,
 				4523F23913B7196700C883E5 /* VCImageView */,
 				4523F23313B7182600C883E5 /* VCThumbnailGridView */,
+				45B7620613B7258A005ACEA1 /* RootViewController.h */,
+				45B7620713B7258A005ACEA1 /* RootViewController.m */,
 				4523F22813B7181900C883E5 /* DemoAppDelegate.h */,
 				4523F22913B7181900C883E5 /* DemoAppDelegate.m */,
 				4523F22B13B7181900C883E5 /* MainWindow.xib */,
 				4523F22013B7181900C883E5 /* Supporting Files */,
+				45B7622613B7280D005ACEA1 /* Resources */,
 			);
 			path = Demo;
 			sourceTree = "<group>";
@@ -168,6 +176,14 @@
 			path = ../../VCResponseFetcher/VCResponseFetcher;
 			sourceTree = "<group>";
 		};
+		45B7622613B7280D005ACEA1 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				45B7622713B7280D005ACEA1 /* Icon.png */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -220,6 +236,7 @@
 			files = (
 				4523F22413B7181900C883E5 /* InfoPlist.strings in Resources */,
 				4523F22D13B7181900C883E5 /* MainWindow.xib in Resources */,
+				45B7622813B7280D005ACEA1 /* Icon.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -240,6 +257,7 @@
 				4523F24F13B71DA100C883E5 /* VCResponseFetcher.m in Sources */,
 				4523F25013B71DA100C883E5 /* VCResponseFetchService.m in Sources */,
 				4523F25113B71DA100C883E5 /* VCResponseFetchServiceCache.m in Sources */,
+				45B7620813B7258A005ACEA1 /* RootViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -344,6 +362,7 @@
 				4523F23213B7181900C883E5 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/Demo/Demo/DemoAppDelegate.h b/Demo/Demo/DemoAppDelegate.h
@@ -13,5 +13,6 @@
 }
 
 @property (nonatomic, retain) IBOutlet UIWindow *window;
+@property (nonatomic, retain) UINavigationController *navigationController;
 
 @end
diff --git a/Demo/Demo/DemoAppDelegate.m b/Demo/Demo/DemoAppDelegate.m
@@ -8,14 +8,20 @@
 
 #import "DemoAppDelegate.h"
 
+#import "RootViewController.h"
+
 @implementation DemoAppDelegate
 
 
-@synthesize window=_window;
+@synthesize window=_window, navigationController=_navigationController;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+	RootViewController *rootVC = [[[RootViewController alloc] init] autorelease];
+	self.navigationController = [[[UINavigationController alloc] initWithRootViewController:rootVC] autorelease];
+	
 	// Override point for customization after application launch.
+	[self.window addSubview:self.navigationController.view];
 	[self.window makeKeyAndVisible];
     return YES;
 }
@@ -61,6 +67,7 @@ - (void)applicationWillTerminate:(UIApplication *)application
 
 - (void)dealloc
 {
+	[_navigationController release];
 	[_window release];
     [super dealloc];
 }
diff --git a/Demo/Demo/Resources/Icon.png b/Demo/Demo/Resources/Icon.png
diff --git a/Demo/Demo/RootViewController.h b/Demo/Demo/RootViewController.h
@@ -0,0 +1,17 @@
+//
+//  RootViewController.h
+//  Demo
+//
+//  Created by Vinay Chavan on 26/06/11.
+//  Copyright 2011 Vinay Chavan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import "VCThumbnailGridView.h"
+
+@interface RootViewController : UIViewController <VCThumbnailGridViewDataSource, VCThumbnailGridViewDelegate> {
+	VCThumbnailGridView *_gridView;
+}
+
+@end
diff --git a/Demo/Demo/RootViewController.m b/Demo/Demo/RootViewController.m
@@ -0,0 +1,99 @@
+//
+//  RootViewController.m
+//  Demo
+//
+//  Created by Vinay Chavan on 26/06/11.
+//  Copyright 2011 Vinay Chavan. All rights reserved.
+//
+
+#import "RootViewController.h"
+
+
+@implementation RootViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+	[_gridView release];
+    [super dealloc];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    // Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+    
+    // Release any cached data, images, etc that aren't in use.
+}
+
+#pragma mark - View lifecycle
+
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView
+{
+	[super loadView];
+	self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	self.view.backgroundColor = [UIColor blackColor];
+	
+	_gridView = [[VCThumbnailGridView alloc] initWithFrame:CGRectMake(0, 0, 320, self.view.bounds.size.height)];
+	_gridView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	_gridView.backgroundColor = [UIColor whiteColor];
+	_gridView.gridDelegate = self;
+	_gridView.gridDataSource = self;
+	_gridView.rowHeight = 150;
+	_gridView.scrollsToTop = YES;
+	[self.view addSubview:_gridView];
+}
+
+
+/*
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+}
+*/
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    // Return YES for supported orientations
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+
+
+#pragma mark - VCThumbnailGridViewDataSource
+
+- (NSInteger)numberOfThumbnailsInThumbnailGridView:(VCThumbnailGridView*)thumbnailGridView {
+	return 20;
+}
+- (NSInteger)numberOfThumbnailsInRowInThumbnailGridView:(VCThumbnailGridView*)thumbnailGridView {
+	return 4;
+}
+- (UIImage*)thumbnailGridView:(VCThumbnailGridView*)thumbnailGridView imageAtIndex:(NSInteger)index {
+	return [UIImage imageNamed:@"Icon.png"];
+}
+
+#pragma mark - VCThumbnailGridViewDelegate
+
+- (void)thumbnailGridView:(VCThumbnailGridView*)thumbnailGridView didSelectThumbnailAtIndex:(NSInteger)index {
+	
+}
+
+@end
diff --git a/VCImageView/VCImageView.h b/VCImageView/VCImageView.h
@@ -8,7 +8,9 @@
 
 #import <UIKit/UIKit.h>
 
-@interface VCImageView : UIImageView {
+#import "VCResponseFetcher.h"
+
+@interface VCImageView : UIImageView <VCResponseFetchServiceDelegate> {
 	UIActivityIndicatorView *activityIndicator;
 	BOOL shouldShowActivityIndicator;
 	BOOL shouldAutoRotateToFit;
diff --git a/VCImageView/VCImageView.m b/VCImageView/VCImageView.m
@@ -61,7 +61,10 @@ - (void)didTapSelf:(id)sender {
 
 #pragma mark - Public Methods
 
-- (void)setRemoteImageUrl:(NSString*)url {
+- (void)setImageUrl:(NSString*)url {
+	[[VCResponseFetcher sharedInstance] addObserver:self
+												url:url
+									responseOfClass:[VCImageResponseProcessor class]];
 	
 	if (shouldShowActivityIndicator) {
 		if (!activityIndicator) {
@@ -89,5 +92,18 @@ - (void)addTarget:(id)target withSelector:(SEL)selector {
 }
 
 
+#pragma mark - VCResponseFetchServiceDelegate Methods
+
+-(void)didSucceedReceiveResponse:(NSObject<VCDataProcessorDelegate> *)response {
+	if ([response isKindOfClass:[VCImageResponseProcessor class]]) {
+		UIImage *image = [(VCImageResponseProcessor*)response image];
+		self.image = image;
+	}
+}
+
+-(void)didFailReceiveResponse:(NSObject<VCDataProcessorDelegate> *)response {
+	
+}
+
 
 @end
diff --git a/VCThumbnailGridView/VCThumbnailGridView.m b/VCThumbnailGridView/VCThumbnailGridView.m
@@ -194,7 +194,7 @@ - (void)createGrid {
 			imageView.image = image;
 		}
 		if (imageUrl) {
-			[imageView setRemoteImageUrl:imageUrl];
+			[imageView setImageUrl:imageUrl];
 		}
 
 		[imageView release], imageView = nil;
@@ -246,7 +246,7 @@ - (void)createStripe {
 			imageView.image = [self.gridDataSource thumbnailGridView:self imageAtIndex:counter];
 		}
 		if ([self.gridDataSource respondsToSelector:@selector(thumbnailGridView:imageUrlAtIndex:)]) {
-			[imageView setRemoteImageUrl:[self.gridDataSource thumbnailGridView:self imageUrlAtIndex:counter]];
+			[imageView setImageUrl:[self.gridDataSource thumbnailGridView:self imageUrlAtIndex:counter]];
 		}
 		// add to the view
 		[_thumbnails addObject:imageView];

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@property (nonatomic, retain) IBOutlet UIWindow *window;`
	`16`	`+@property (nonatomic, retain) UINavigationController *navigationController;`
`16`	`17`
`17`	`18`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,20 @@`
`8`	`8`
`9`	`9`	`#import "DemoAppDelegate.h"`
`10`	`10`
	`11`	`+#import "RootViewController.h"`
	`12`	`+`
`11`	`13`	`@implementation DemoAppDelegate`
`12`	`14`
`13`	`15`
`14`		`-@synthesize window=_window;`
	`16`	`+@synthesize window=_window, navigationController=_navigationController;`
`15`	`17`
`16`	`18`	`- (BOOL)application:(UIApplication )application didFinishLaunchingWithOptions:(NSDictionary )launchOptions`
`17`	`19`	`{`
	`20`	`+ RootViewController *rootVC = [[[RootViewController alloc] init] autorelease];`
	`21`	`+ self.navigationController = [[[UINavigationController alloc] initWithRootViewController:rootVC] autorelease];`
	`22`	`+`
`18`	`23`	`// Override point for customization after application launch.`
	`24`	`+ [self.window addSubview:self.navigationController.view];`
`19`	`25`	`[self.window makeKeyAndVisible];`
`20`	`26`	`return YES;`
`21`	`27`	`}`
`@@ -61,6 +67,7 @@ - (void)applicationWillTerminate:(UIApplication *)application`
`61`	`67`
`62`	`68`	`- (void)dealloc`
`63`	`69`	`{`
	`70`	`+ [_navigationController release];`
`64`	`71`	`[_window release];`
`65`	`72`	`[super dealloc];`
`66`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ - (void)createGrid {`
`194`	`194`	`imageView.image = image;`
`195`	`195`	`}`
`196`	`196`	`if (imageUrl) {`
`197`		`- [imageView setRemoteImageUrl:imageUrl];`
	`197`	`+ [imageView setImageUrl:imageUrl];`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`[imageView release], imageView = nil;`
`@@ -246,7 +246,7 @@ - (void)createStripe {`
`246`	`246`	`imageView.image = [self.gridDataSource thumbnailGridView:self imageAtIndex:counter];`
`247`	`247`	`}`
`248`	`248`	`if ([self.gridDataSource respondsToSelector:@selector(thumbnailGridView:imageUrlAtIndex:)]) {`
`249`		`- [imageView setRemoteImageUrl:[self.gridDataSource thumbnailGridView:self imageUrlAtIndex:counter]];`
	`249`	`+ [imageView setImageUrl:[self.gridDataSource thumbnailGridView:self imageUrlAtIndex:counter]];`
`250`	`250`	`}`
`251`	`251`	`// add to the view`
`252`	`252`	`[_thumbnails addObject:imageView];`