Added multithreading for network requests. Pull-down to refresh on the main table view.

vascoorey · vascoorey · commit 0741208e052d · 2013-02-27T12:31:58.000Z
diff --git a/Checklists/.DS_Store b/Checklists/.DS_Store
diff --git a/SPoT/SPoT.xcodeproj/project.pbxproj b/SPoT/SPoT.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
 		BC6F92F616DB8F9600DBEBCA /* RecentPhotosTVC.m in Sources */ = {isa = PBXBuildFile; fileRef = BC6F92F516DB8F9600DBEBCA /* RecentPhotosTVC.m */; };
 		BC6F92FA16DB939500DBEBCA /* StanfordPhotosTVC.m in Sources */ = {isa = PBXBuildFile; fileRef = BC6F92F916DB939500DBEBCA /* StanfordPhotosTVC.m */; };
 		BC8B459716DD2173008BE654 /* iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC8B459616DD2173008BE654 /* iPad.storyboard */; };
+		BCC2864716DE17CD00D50228 /* NetworkActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC2864616DE17CD00D50228 /* NetworkActivity.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -56,6 +57,8 @@
 		BC6F92F816DB939500DBEBCA /* StanfordPhotosTVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StanfordPhotosTVC.h; sourceTree = "<group>"; };
 		BC6F92F916DB939500DBEBCA /* StanfordPhotosTVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StanfordPhotosTVC.m; sourceTree = "<group>"; };
 		BC8B459616DD2173008BE654 /* iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPad.storyboard; sourceTree = "<group>"; };
+		BCC2864516DE17CD00D50228 /* NetworkActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkActivity.h; sourceTree = "<group>"; };
+		BCC2864616DE17CD00D50228 /* NetworkActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkActivity.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -113,6 +116,8 @@
 				BC6F92F516DB8F9600DBEBCA /* RecentPhotosTVC.m */,
 				BC6F92EF16DB8EEA00DBEBCA /* ImageViewController.h */,
 				BC6F92F016DB8EEA00DBEBCA /* ImageViewController.m */,
+				BCC2864516DE17CD00D50228 /* NetworkActivity.h */,
+				BCC2864616DE17CD00D50228 /* NetworkActivity.m */,
 				BC6F92DB16DB8D5E00DBEBCA /* iPhone.storyboard */,
 				BC8B459616DD2173008BE654 /* iPad.storyboard */,
 				BC6F92E916DB8EEA00DBEBCA /* FlickrFetcher */,
@@ -222,6 +227,7 @@
 				BC6F92F316DB8EEA00DBEBCA /* ImageViewController.m in Sources */,
 				BC6F92F616DB8F9600DBEBCA /* RecentPhotosTVC.m in Sources */,
 				BC6F92FA16DB939500DBEBCA /* StanfordPhotosTVC.m in Sources */,
+				BCC2864716DE17CD00D50228 /* NetworkActivity.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/SPoT/SPoT/FlickrFetcher/FlickrFetcher.m b/SPoT/SPoT/FlickrFetcher/FlickrFetcher.m
@@ -8,6 +8,7 @@
 
 #import "FlickrFetcher.h"
 #import "FlickrAPIKey.h"
+#import "NetworkActivity.h"
 
 #define FLICKR_PLACE_ID @"place_id"
 
@@ -18,7 +19,9 @@ + (NSDictionary *)executeFlickrFetch:(NSString *)query
     query = [NSString stringWithFormat:@"%@&format=json&nojsoncallback=1&api_key=%@", query, FlickrAPIKey];
     query = [query stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     if (NSLOG_FLICKR) NSLog(@"[%@ %@] sent %@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), query);
+    [NetworkActivity addRequest];
     NSData *jsonData = [[NSString stringWithContentsOfURL:[NSURL URLWithString:query] encoding:NSUTF8StringEncoding error:nil] dataUsingEncoding:NSUTF8StringEncoding];
+    [NetworkActivity removeRequest];
     NSError *error = nil;
     NSDictionary *results = jsonData ? [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers|NSJSONReadingMutableLeaves error:&error] : nil;
     if (error) NSLog(@"[%@ %@] JSON error: %@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), error.localizedDescription);
diff --git a/SPoT/SPoT/ImageViewController.m b/SPoT/SPoT/ImageViewController.m
@@ -8,9 +8,11 @@
 
 #import "ImageViewController.h"
 #import "Utils.h"
+#import "NetworkActivity.h"
 
 @interface ImageViewController () <UIScrollViewDelegate>
 @property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *spinner;
 @property (strong, nonatomic) UIImageView *imageView;
 @end
 
@@ -35,14 +37,30 @@ - (void)resetImage
         self.scrollView.contentSize = CGSizeZero;
         self.imageView.image = nil;
         
-        NSData *imageData = [[NSData alloc] initWithContentsOfURL:self.imageURL];
-        UIImage *image = [[UIImage alloc] initWithData:imageData];
-        if (image) {
-            self.scrollView.zoomScale = 1.0;
-            self.scrollView.contentSize = image.size;
-            self.imageView.image = image;
-            self.imageView.frame = CGRectMake(0, 0, image.size.width, image.size.height);
-        }
+        [self.spinner startAnimating];
+        NSLog(@"%d", self.spinner.isAnimating);
+        NSURL *imageURL = self.imageURL;
+        dispatch_queue_t imageFetchQ = dispatch_queue_create("Image Fetcher", NULL);
+        dispatch_async(imageFetchQ, ^{
+            [NetworkActivity addRequest];
+            NSData *imageData = [[NSData alloc] initWithContentsOfURL:self.imageURL];
+            [NetworkActivity removeRequest];
+            UIImage *image = [[UIImage alloc] initWithData:imageData];
+            if(imageURL == self.imageURL)
+            {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    // Can only do UIKit calls in the main thread.
+                    if (image) {
+                        self.scrollView.zoomScale = 1.0;
+                        self.scrollView.contentSize = image.size;
+                        self.imageView.image = image;
+                        self.imageView.frame = CGRectMake(0, 0, image.size.width, image.size.height);
+                    }
+                    [self.spinner stopAnimating];
+                    NSLog(@"%d", self.spinner.isAnimating);
+                });
+            }
+        });
     }
 }
 
diff --git a/SPoT/SPoT/NetworkActivity.h b/SPoT/SPoT/NetworkActivity.h
@@ -0,0 +1,16 @@
+//
+//  NetworkActivity.h
+//  SPoT
+//
+//  Created by Vasco Orey on 2/27/13.
+//  Copyright (c) 2013 Delta Dog Studios. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NetworkActivity : NSObject
+
++(void)addRequest;
++(void)removeRequest;
+
+@end
diff --git a/SPoT/SPoT/NetworkActivity.m b/SPoT/SPoT/NetworkActivity.m
@@ -0,0 +1,55 @@
+//
+//  NetworkActivity.m
+//  SPoT
+//
+//  Created by Vasco Orey on 2/27/13.
+//  Copyright (c) 2013 Delta Dog Studios. All rights reserved.
+//
+
+#import "NetworkActivity.h"
+
+static NetworkActivity *sharedActivity;
+
+@interface NetworkActivity ()
+@property (atomic) NSUInteger count;
+@end
+
+@implementation NetworkActivity
+
+-(void)setCount:(NSUInteger)count
+{
+    _count = count;
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = count > 0;
+}
+
+-(void)addRequest
+{
+    self.count ++;
+}
+
+-(void)removeRequest
+{
+    NSAssert(self.count > 0, @"Seems like you called removeRequest one too many times!");
+    self.count --;
+}
+
++(NetworkActivity *)sharedActivity
+{
+    if(!sharedActivity)
+    {
+        sharedActivity = [[NetworkActivity alloc] init];
+    }
+    return sharedActivity;
+}
+
++(void)addRequest
+{
+    [[self sharedActivity] addRequest];
+}
+
++(void)removeRequest
+{
+    [[self sharedActivity] removeRequest];
+}
+
+@end
diff --git a/SPoT/SPoT/StanfordTagsTVC.m b/SPoT/SPoT/StanfordTagsTVC.m
@@ -64,6 +64,8 @@ -(void)setPhotos:(NSArray *)photos
 
 -(void)getTagInfo
 {
+    self.tagOcurrences = nil;
+    self.tags = nil;
     for(NSDictionary *photo in self.photos)
     {
         NSArray *separatedTags = [photo[FLICKR_TAGS] componentsSeparatedByString:@" "];
@@ -91,7 +93,21 @@ -(void)getTagInfo
 -(void)viewDidLoad
 {
     [super viewDidLoad];
-    self.photos = [FlickrFetcher stanfordPhotos];
+    [self loadLatestPhotosFromFlickr];
+    [self.refreshControl addTarget:self action:@selector(loadLatestPhotosFromFlickr) forControlEvents:UIControlEventValueChanged];
+}
+
+-(void)loadLatestPhotosFromFlickr
+{
+    [self.refreshControl beginRefreshing];
+    dispatch_queue_t loadingQ = dispatch_queue_create("Loading Queue", NULL);
+    dispatch_async(loadingQ, ^{
+        NSArray *latestPhotos = [FlickrFetcher stanfordPhotos];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.photos = latestPhotos;
+            [self.refreshControl endRefreshing];
+        });
+    });
 }
 
 -(NSArray *)photosForTag:(NSString *)tag
diff --git a/SPoT/SPoT/en.lproj/iPhone.storyboard b/SPoT/SPoT/en.lproj/iPhone.storyboard
@@ -63,6 +63,9 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="SPoT" id="6ou-xq-r9q"/>
+                    <refreshControl key="refreshControl" opaque="NO" multipleTouchEnabled="YES" contentMode="center" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="Kcm-NS-TZK">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </refreshControl>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="sz1-x5-15H" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -108,10 +111,13 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" id="YMV-f1-sCA"/>
+                    <refreshControl key="refreshControl" opaque="NO" multipleTouchEnabled="YES" contentMode="center" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="Sik-Kf-MeV">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </refreshControl>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="TjZ-nB-Kwn" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1077" y="-355"/>
+            <point key="canvasLocation" x="1078" y="-355"/>
         </scene>
         <!--Navigation Controller - Highlights-->
         <scene sceneID="zQu-mw-OQV">
@@ -186,18 +192,22 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fQs-14-B4v"/>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="0H5-NO-MpK"/>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="fQs-14-B4v" firstAttribute="trailing" secondItem="dsi-cj-yAV" secondAttribute="trailing" type="default" id="6MS-gL-I4C"/>
+                            <constraint firstItem="fQs-14-B4v" firstAttribute="leading" secondItem="dsi-cj-yAV" secondAttribute="leading" type="default" id="1G4-Fz-PaW"/>
+                            <constraint firstItem="0H5-NO-MpK" firstAttribute="centerX" secondItem="fQs-14-B4v" secondAttribute="centerX" type="default" id="FlZ-jh-U1p"/>
                             <constraint firstItem="fQs-14-B4v" firstAttribute="bottom" secondItem="dsi-cj-yAV" secondAttribute="bottom" type="default" id="Gsv-KR-hWa"/>
-                            <constraint firstItem="fQs-14-B4v" firstAttribute="leading" secondItem="dsi-cj-yAV" secondAttribute="leading" type="default" id="RMb-vw-w5f"/>
+                            <constraint firstItem="fQs-14-B4v" firstAttribute="trailing" secondItem="dsi-cj-yAV" secondAttribute="trailing" type="default" id="YiM-BS-zk4"/>
+                            <constraint firstItem="0H5-NO-MpK" firstAttribute="centerY" secondItem="fQs-14-B4v" secondAttribute="centerY" type="default" id="acI-If-MPU"/>
                             <constraint firstItem="fQs-14-B4v" firstAttribute="top" secondItem="dsi-cj-yAV" secondAttribute="top" type="default" id="lFj-uN-tRI"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="tX1-4e-ird"/>
                     <connections>
                         <outlet property="scrollView" destination="fQs-14-B4v" id="RaS-VI-xjp"/>
+                        <outlet property="spinner" destination="0H5-NO-MpK" id="gWv-Co-FiZ"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="oAb-Qd-Smr" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -232,6 +242,7 @@
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ImageViewController.h"/>
             <relationships>
                 <relationship kind="outlet" name="scrollView" candidateClass="UIScrollView"/>
+                <relationship kind="outlet" name="spinner" candidateClass="UIActivityIndicatorView"/>
             </relationships>
         </class>
         <class className="NSLayoutConstraint" superclassName="NSObject">
@@ -246,13 +257,16 @@
         <class className="StanfordTagsTVC" superclassName="UITableViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/StanfordTagsTVC.h"/>
         </class>
+        <class className="UIRefreshControl" superclassName="UIControl">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/UIRefreshControl.h"/>
+        </class>
     </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="FGq-o6-8V5"/>
+        <segue reference="xiH-IF-OHl"/>
     </inferredMetricsTieBreakers>
 </document>
