Permalink
Browse files

Removed EGOCache and EGOImageLoading classes and repalced with git su…

…bmodules. Restructured directory structure to avoid clutter. Refactored EGOPhotoController class to EGOPhotoViewController
  • Loading branch information...
shnhrrsn committed Jan 19, 2010
1 parent 2eb528f commit 7e35e048d7a02bc82dfa857ad75589fb6f5df38d
Showing with 156 additions and 881 deletions.
  1. +6 −0 .gitmodules
  2. 0 { → Demo}/Classes/EGOPhotoViewerAppDelegate.h
  3. 0 { → Demo}/Classes/EGOPhotoViewerAppDelegate.m
  4. 0 { → Demo}/Classes/RootViewController.h
  5. +3 −3 { → Demo}/Classes/RootViewController.m
  6. 0 { → Demo}/EGOPhotoViewer-Info.plist
  7. 0 { → Demo}/EGOPhotoViewer.xcodeproj/.dat5f71.d37
  8. +136 −97 { → Demo}/EGOPhotoViewer.xcodeproj/project.pbxproj
  9. 0 { → Demo}/EGOPhotoViewer_Prefix.pch
  10. 0 { → Demo}/MainWindow.xib
  11. 0 { → Demo}/RootViewController.xib
  12. 0 { → Demo}/main.m
  13. +0 −70 EGOCache.h
  14. +0 −295 EGOCache.m
  15. +0 −60 EGOImageLoadConnection.h
  16. +0 −96 EGOImageLoadConnection.m
  17. +0 −57 EGOImageLoader.h
  18. +0 −192 EGOImageLoader.m
  19. +1 −0 Library/EGOCache
  20. +1 −0 Library/EGOImageLoading
  21. 0 { → Library}/EGOPhoto.h
  22. 0 { → Library}/EGOPhoto.m
  23. 0 { → Library}/EGOPhotoCaptionView.h
  24. 0 { → Library}/EGOPhotoCaptionView.m
  25. 0 { → Library}/EGOPhotoImageView.h
  26. 0 { → Library}/EGOPhotoImageView.m
  27. 0 { → Library}/EGOPhotoScrollView.h
  28. 0 { → Library}/EGOPhotoScrollView.m
  29. 0 { → Library}/EGOPhotoSource.h
  30. 0 { → Library}/EGOPhotoSource.m
  31. +1 −1 Classes/EGOPhotoController.h → Library/EGOPhotoViewController.h
  32. +3 −3 Classes/EGOPhotoController.m → Library/EGOPhotoViewController.m
  33. +5 −7 Classes/EGOPhotoController.xib → Library/Resources/EGOPhotoViewController.xib
  34. BIN { → Library/Resources}/caption_bar_bg.png
  35. BIN { → Library/Resources}/error_placeholder.png
  36. BIN { → Library/Resources}/left.png
  37. BIN { → Library/Resources}/photo_placeholder.png
  38. BIN { → Library/Resources}/right.png
View
@@ -0,0 +1,6 @@
+[submodule "Library/EGOCache"]
+ path = Library/EGOCache
+ url = git@github.com:enormego/EGOCache.git
+[submodule "Library/EGOImageLoading"]
+ path = Library/EGOImageLoading
+ url = git@github.com:enormego/EGOImageLoading.git
File renamed without changes.
@@ -7,7 +7,7 @@
//
#import "RootViewController.h"
-#import "EGOPhotoController.h"
+#import "EGOPhotoViewController.h"
#import "EGOPhotoSource.h"
#import "EGOPhoto.h"
@@ -111,7 +111,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
EGOPhoto *photo4 = [[EGOPhoto alloc] initWithImageURL:[NSURL URLWithString:@"http://qkpic.com/13493"] name:@"title title title"];
EGOPhotoSource *source = [[EGOPhotoSource alloc] initWithEGOPhotos:[NSArray arrayWithObjects:photo, photo2, photo3, photo4, photo, photo2, photo3, photo4, nil]];
- EGOPhotoController *photoController = [[EGOPhotoController alloc] initWithPhotoSource:source];
+ EGOPhotoViewController *photoController = [[EGOPhotoViewController alloc] initWithPhotoSource:source];
[self.navigationController pushViewController:photoController animated:YES];
[photoController release];
[photo release];
@@ -124,7 +124,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
EGOPhoto *photo = [[EGOPhoto alloc] initWithImageURL:[NSURL URLWithString:@"https://s3.amazonaws.com/twitter_production/profile_images/425948730/DF-Star-Logo.png"]];
EGOPhotoSource *source = [[EGOPhotoSource alloc] initWithEGOPhotos:[NSArray arrayWithObjects:photo, nil]];
- EGOPhotoController *photoController = [[EGOPhotoController alloc] initWithPhotoSource:source];
+ EGOPhotoViewController *photoController = [[EGOPhotoViewController alloc] initWithPhotoSource:source];
[self.navigationController pushViewController:photoController animated:YES];
[photoController release];
[photo release];
File renamed without changes.

Large diffs are not rendered by default.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
View
@@ -1,70 +0,0 @@
-//
-// EGOCache.h
-// enormego
-//
-// Created by Shaun Harrison on 7/4/09.
-// Copyright (c) 2009-2010 enormego
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface EGOCache : NSObject {
-@private
- NSMutableDictionary* cacheDictionary;
- NSOperationQueue* diskOperationQueue;
- NSTimeInterval defaultTimeoutInterval;
-}
-
-+ (EGOCache*)currentCache;
-
-- (void)clearCache;
-- (void)removeCacheForKey:(NSString*)key;
-
-- (BOOL)hasCacheForKey:(NSString*)key;
-
-- (NSData*)dataForKey:(NSString*)key;
-- (void)setData:(NSData*)data forKey:(NSString*)key;
-- (void)setData:(NSData*)data forKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-
-- (NSString*)stringForKey:(NSString*)key;
-- (void)setString:(NSString*)aString forKey:(NSString*)key;
-- (void)setString:(NSString*)aString forKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-
-#if TARGET_OS_IPHONE
-- (UIImage*)imageForKey:(NSString*)key;
-- (void)setImage:(UIImage*)anImage forKey:(NSString*)key;
-- (void)setImage:(UIImage*)anImage forKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-#else
-- (NSImage*)imageForKey:(NSString*)key;
-- (void)setImage:(NSImage*)anImage forKey:(NSString*)key;
-- (void)setImage:(NSImage*)anImage forKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-#endif
-
-- (NSData*)plistForKey:(NSString*)key;
-- (void)setPlist:(id)plistObject forKey:(NSString*)key;
-- (void)setPlist:(id)plistObject forKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-
-- (void)copyFilePath:(NSString*)filePath asKey:(NSString*)key;
-- (void)copyFilePath:(NSString*)filePath asKey:(NSString*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-
-@property(nonatomic,assign) NSTimeInterval defaultTimeoutInterval; // Default is 1 day
-@end
Oops, something went wrong.

0 comments on commit 7e35e04

Please sign in to comment.