Refactor api， setup dataSources

JackTeam · Feb 23, 2014 · 80880ae · 80880ae
1 parent ee47018
commit 80880ae
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 10 deletions.
diff --git a/Project/InstagramThumbnail/AppDelegate.m b/Project/InstagramThumbnail/AppDelegate.m
@@ -18,8 +18,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     // Override point for customization after application launch.
     self.window.backgroundColor = [UIColor whiteColor];
-    InstagramCollectionViewController *instagramCollectionViewController = [InstagramPictureCollectionViewController sharedInstagramPictureCollectionViewController];
-    instagramCollectionViewController.showThumbnail = NO;
+    InstagramCollectionViewController *instagramCollectionViewController = [InstagramPictureCollectionViewController sharedInstagramCollectionViewController];
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:instagramCollectionViewController];
     [self.window makeKeyAndVisible];
     return YES;

diff --git a/Project/InstagramThumbnail/InstagramDataSource.plist b/Project/InstagramThumbnail/InstagramDataSource.plist
@@ -9,6 +9,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -17,6 +21,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -25,6 +33,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -33,6 +45,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -41,6 +57,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -49,6 +69,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -57,6 +81,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -65,6 +93,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -73,6 +105,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -81,6 +117,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -89,6 +129,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -97,6 +141,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -105,6 +153,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -113,6 +165,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -121,6 +177,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -129,6 +189,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -137,6 +201,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -145,6 +213,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -153,6 +225,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 	<dict>
 		<key>url</key>
@@ -161,6 +237,10 @@
 		<integer>150</integer>
 		<key>height</key>
 		<integer>150</integer>
+		<key>userName</key>
+		<string>xhzengAIB</string>
+		<key>caption</key>
+		<string>InstagramThumbnail is a display thumbnail grid view, based on Instagram App.</string>
 	</dict>
 </array>
 </plist>
diff --git a/Source/InstagramCell.m b/Source/InstagramCell.m
@@ -33,7 +33,7 @@ - (void)setEntity:(InstagramMediaModel *)entity andIndexPath:(NSIndexPath *)inde
         self.pictureCaptionLabel.text = self.entity.caption;
         [self.contentView addSubview:self.pictureCaptionLabel];
 
-        [self.userProfileImageView setImage:[UIImage imageNamed:@"InstagramLoading.png"]];
+        [self.userProfileImageView setImage:[UIImage imageNamed:@"placeholder"]];
         [self.contentView addSubview:self.userProfileImageView];
 
         [_entity downloadImageWithBlock:^(UIImage *image, NSError *error) {

diff --git a/Source/InstagramCollectionViewController.h b/Source/InstagramCollectionViewController.h
@@ -25,6 +25,8 @@ static NSString * const kXHInstagramCell = @"InstagramCell";
 @property (nonatomic, assign) BOOL hideFooter;
 @property (nonatomic, assign) BOOL showThumbnail;
 
++ (instancetype)sharedInstagramCollectionViewController;
+
 - (void)downloadDataSource;
 
 @end
diff --git a/Source/InstagramCollectionViewController.m b/Source/InstagramCollectionViewController.m
@@ -47,6 +47,10 @@ - (id)initWithCollectionViewLayout:(UICollectionViewLayout *)layout{
     return self;
 }
 
++ (instancetype)sharedInstagramCollectionViewController {
+    return nil;
+}
+
 - (id)init {
     self = [super init];
     if (self) {

diff --git a/Source/InstagramPictureCollectionViewController.h b/Source/InstagramPictureCollectionViewController.h
@@ -10,5 +10,5 @@
 #import "InstagramCollectionViewController.h"
 
 @interface InstagramPictureCollectionViewController : InstagramCollectionViewController
-+ (instancetype)sharedInstagramPictureCollectionViewController;
+
 @end
diff --git a/Source/InstagramPictureCollectionViewController.m b/Source/InstagramPictureCollectionViewController.m
@@ -20,8 +20,10 @@ - (void)_setup {
 
 }
 
-+ (instancetype)sharedInstagramPictureCollectionViewController {
-    return [[InstagramPictureCollectionViewController alloc]  initWithCollectionViewLayout:[UICollectionViewFlowLayout new]];
++ (instancetype)sharedInstagramCollectionViewController {
+    InstagramPictureCollectionViewController *instagramPictureCollectionViewController = [[InstagramPictureCollectionViewController alloc]  initWithCollectionViewLayout:[UICollectionViewFlowLayout new]];
+    instagramPictureCollectionViewController.showThumbnail = NO;
+    return instagramPictureCollectionViewController;
 }
 
 - (id)init {

diff --git a/Source/InstagramThumbnailCollectionViewController.h b/Source/InstagramThumbnailCollectionViewController.h
@@ -10,5 +10,5 @@
 #import "InstagramCollectionViewController.h"
 
 @interface InstagramThumbnailCollectionViewController : InstagramCollectionViewController
-+ (instancetype)sharedInstagramThumbnailCollectionViewController;
+
 @end
diff --git a/Source/InstagramThumbnailCollectionViewController.m b/Source/InstagramThumbnailCollectionViewController.m
@@ -20,8 +20,10 @@ - (void)_setup {
 
 }
 
-+ (instancetype)sharedInstagramThumbnailCollectionViewController {
-    return [[InstagramThumbnailCollectionViewController alloc]  initWithCollectionViewLayout:[UICollectionViewFlowLayout new]];
++ (instancetype)sharedInstagramCollectionViewController {
+    InstagramThumbnailCollectionViewController *instagramThumbnailCollectionViewController = [[InstagramThumbnailCollectionViewController alloc]  initWithCollectionViewLayout:[UICollectionViewFlowLayout new]];
+    instagramThumbnailCollectionViewController.showThumbnail = YES;
+    return instagramThumbnailCollectionViewController;
 }
 
 - (id)init {

diff --git a/Source/XHInstagramStoreManager.m b/Source/XHInstagramStoreManager.m
@@ -37,7 +37,7 @@ - (void)mediaWithPage:(NSInteger)page localDownloadDataSourceCompled:(DownloadDa
                 [mediaArray addObject:[InstagramMediaModel entityWithDictionary:mediaDictionary]];
             }
         }
-        NSLog(@"%@", mediaArray);
+
         dispatch_async(dispatch_get_main_queue(), ^{
             if (downloadDataSourceCompled) {
                 downloadDataSourceCompled(mediaArray, nil);