Update for Swift 1.2

MoZhouqi · Apr 17, 2015 · 8d33663 · 8d33663
1 parent 84a630c
commit 8d33663
Show file tree

Hide file tree

Showing 89 changed files with 5,131 additions and 692 deletions.
diff --git a/PhotoBrowser.xcodeproj/project.pbxproj b/PhotoBrowser.xcodeproj/project.pbxproj
diff --git a/PhotoBrowser.xcworkspace/contents.xcworkspacedata b/PhotoBrowser.xcworkspace/contents.xcworkspacedata
diff --git a/PhotoBrowser/Alamofire-master/Alamofire.xcodeproj/project.pbxproj b/PhotoBrowser/Alamofire-master/Alamofire.xcodeproj/project.pbxproj
diff --git a/...Browser/Alamofire-master/Alamofire.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...Browser/Alamofire-master/Alamofire.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/PhotoBrowser/AppDelegate.swift b/PhotoBrowser/AppDelegate.swift
@@ -9,6 +9,7 @@
 import UIKit
 import CoreData
 import Alamofire
+import FastImageCache
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, FICImageCacheDelegate {
@@ -20,8 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, FICImageCacheDelegate {
         // Override point for customization after application launch.
 
         FastImageCacheHelper.setUp(self)
-        let navController = window!.rootViewController as UINavigationController
-        let photoBrowserCollectionViewController = navController.topViewController as PhotoBrowserCollectionViewController
+        let navController = window!.rootViewController as! UINavigationController
+        let photoBrowserCollectionViewController = navController.topViewController as! PhotoBrowserCollectionViewController
         photoBrowserCollectionViewController.coreDataStack = coreDataStack
 
         return true
@@ -54,20 +55,23 @@ class AppDelegate: UIResponder, UIApplicationDelegate, FICImageCacheDelegate {
 
     //MARK: FICImageCacheDelegate
 
-    func imageCache(imageCache: FICImageCache!, wantsSourceImageForEntity entity: PhotoInfo!, withFormatName formatName: String!, completionBlock: FICImageRequestCompletionBlock!) {
-        let imageURL = entity.sourceImageURLWithFormatName(formatName)
-        let request = NSURLRequest(URL: imageURL)
-
-        entity.request = Alamofire.request(.GET, request).validate(contentType: ["image/*"]).responseImage() {
-            (_, _, image, error) in
-            if (error == nil) {
-                completionBlock(image)
+    func imageCache(imageCache: FICImageCache!, wantsSourceImageForEntity entity: FICEntity!, withFormatName formatName: String!, completionBlock: FICImageRequestCompletionBlock!) {
+        if let entity = entity as? PhotoInfo {
+            let imageURL = entity.sourceImageURLWithFormatName(formatName)
+            let request = NSURLRequest(URL: imageURL)
+
+            entity.request = Alamofire.request(.GET, request).validate(contentType: ["image/*"]).responseImage() {
+                (_, _, image, error) in
+                if (error == nil) {
+                    completionBlock(image)
+                }
             }
         }
     }
 
-    func imageCache(imageCache: FICImageCache!, cancelImageLoadingForEntity entity: PhotoInfo!, withFormatName formatName: String!) {
-        if let request = entity.request {
+    func imageCache(imageCache: FICImageCache!, cancelImageLoadingForEntity entity: FICEntity!, withFormatName formatName: String!) {
+
+        if let entity = entity as? PhotoInfo, request = entity.request {
             request.cancel()
             entity.request = nil
             //println("be canceled:\(entity.UUID)")

diff --git a/PhotoBrowser/CoreDataStack.swift b/PhotoBrowser/CoreDataStack.swift
@@ -61,7 +61,7 @@ class CoreDataStack {
     func applicationDocumentsDirectory() -> NSURL {
 
         let urls = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)
-        return urls[urls.count-1] as NSURL
+        return urls[urls.count-1] as! NSURL
     }
 
 }
diff --git a/PhotoBrowser/FastImageCacheHelper.swift b/PhotoBrowser/FastImageCacheHelper.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import UIKit
+import FastImageCache
 
 let KMPhotoImageFormatFamily = "KMPhotoImageFormatFamily"
 let KMSmallImageFormatName = "KMSmallImageFormatName"

diff --git a/PhotoBrowser/OauthLoginViewController.swift b/PhotoBrowser/OauthLoginViewController.swift
@@ -7,9 +7,11 @@
 //
 
 import UIKit
-import Alamofire
 import Foundation
 import CoreData
+import Alamofire
+import SwiftyJSON
+
 class OauthLoginViewController: UIViewController {
 
     @IBOutlet weak var webView: UIWebView!
@@ -38,7 +40,7 @@ class OauthLoginViewController: UIViewController {
 
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         if segue.identifier == "unwindToPhotoBrowser" && segue.destinationViewController.isKindOfClass(PhotoBrowserCollectionViewController.classForCoder()) {
-            let photoBrowserCollectionViewController = segue.destinationViewController as PhotoBrowserCollectionViewController
+            let photoBrowserCollectionViewController = segue.destinationViewController as! PhotoBrowserCollectionViewController
             if let user = sender?.valueForKey("user") as? User {
                 photoBrowserCollectionViewController.user = user
 
@@ -74,15 +76,12 @@ extension OauthLoginViewController: UIWebViewDelegate {
                     //println(jsonObject)
                     let json = JSON(jsonObject!)
 
-                    if let accessToken = json["access_token"].string{
-                        if let userID = json["user"]["id"].string {
-                            let user =
-                            NSEntityDescription.insertNewObjectForEntityForName("User", inManagedObjectContext: self.coreDataStack.context) as User
-                            user.userID = userID
-                            user.accessToken = accessToken
-                            self.coreDataStack.saveContext()
-                            self.performSegueWithIdentifier("unwindToPhotoBrowser", sender: ["user": user])
-                        }
+                    if let accessToken = json["access_token"].string, userID = json["user"]["id"].string {
+                        let user = NSEntityDescription.insertNewObjectForEntityForName("User", inManagedObjectContext: self.coreDataStack.context) as! User
+                        user.userID = userID
+                        user.accessToken = accessToken
+                        self.coreDataStack.saveContext()
+                        self.performSegueWithIdentifier("unwindToPhotoBrowser", sender: ["user": user])
                     }
                 }
 

diff --git a/PhotoBrowser/PhotoBrowserCollectionViewController.swift b/PhotoBrowser/PhotoBrowserCollectionViewController.swift
@@ -8,8 +8,10 @@
 
 import UIKit
 import Foundation
-import Alamofire
 import CoreData
+import Alamofire
+import FastImageCache
+import SwiftyJSON
 
 class PhotoBrowserCollectionViewController: UICollectionViewController, UICollectionViewDelegateFlowLayout {
 
@@ -48,7 +50,7 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
         var error: NSError?
         if let fetchRequest = coreDataStack.model.fetchRequestTemplateForName("UserFetchRequest") {
 
-            let results = coreDataStack.context.executeFetchRequest(fetchRequest,error: &error) as [User]
+            let results = coreDataStack.context.executeFetchRequest(fetchRequest,error: &error) as! [User]
             user = results.first
         }
 
@@ -78,7 +80,7 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
     }
 
     override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier(PhotoBrowserCellIdentifier, forIndexPath: indexPath) as PhotoBrowserCollectionViewCell
+        let cell = collectionView.dequeueReusableCellWithReuseIdentifier(PhotoBrowserCellIdentifier, forIndexPath: indexPath) as! PhotoBrowserCollectionViewCell
         let sharedImageCache = FICImageCache.sharedImageCache()
         cell.imageView.image = nil
 
@@ -92,7 +94,7 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
 
         sharedImageCache.retrieveImageForEntity(photo, withFormatName: formatName, completionBlock: {
             (photoInfo, _, image) -> Void in
-            if (photoInfo as PhotoInfo) == cell.photoInfo {
+            if (photoInfo as! PhotoInfo) == cell.photoInfo {
                 cell.imageView.image = image
             }
         })
@@ -101,7 +103,7 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
     }
 
     override func collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
-        let footerView = collectionView.dequeueReusableSupplementaryViewOfKind(kind, withReuseIdentifier: PhotoBrowserFooterViewIdentifier, forIndexPath: indexPath) as PhotoBrowserLoadingCollectionView
+        let footerView = collectionView.dequeueReusableSupplementaryViewOfKind(kind, withReuseIdentifier: PhotoBrowserFooterViewIdentifier, forIndexPath: indexPath) as! PhotoBrowserLoadingCollectionView
         if nextURLRequest == nil {
             footerView.spinner.stopAnimating()
         } else {
@@ -155,7 +157,7 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
             (_ , _, jsonObject, error) in
 
             if (error == nil) {
-                //  println(jsonObject)
+                //println(jsonObject)
                 let json = JSON(jsonObject!)
 
                 if (json["meta"]["code"].intValue  == 200) {
@@ -215,10 +217,10 @@ class PhotoBrowserCollectionViewController: UICollectionViewController, UICollec
     }
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         if segue.identifier == "show photo" && segue.destinationViewController.isKindOfClass(PhotoViewerViewController.classForCoder()) {
-            let photoViewerViewController = segue.destinationViewController as PhotoViewerViewController
+            let photoViewerViewController = segue.destinationViewController as! PhotoViewerViewController
             photoViewerViewController.photoInfo = sender?.valueForKey("photoInfo") as? PhotoInfo
         } else if segue.identifier == "login" && segue.destinationViewController.isKindOfClass(UINavigationController.classForCoder()) {
-            let navigationController = segue.destinationViewController as UINavigationController
+            let navigationController = segue.destinationViewController as! UINavigationController
             if let oauthLoginViewController = navigationController.topViewController as? OauthLoginViewController {
                 oauthLoginViewController.coreDataStack = coreDataStack
             }

diff --git a/PhotoBrowser/PhotoInfo.swift b/PhotoBrowser/PhotoInfo.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import Alamofire
+import FastImageCache
 
 class PhotoInfo: NSObject, FICEntity {
     var UUID: String {
@@ -29,7 +30,7 @@ class PhotoInfo: NSObject, FICEntity {
     }
 
     override func isEqual(object: AnyObject?) -> Bool {
-        return (object as PhotoInfo).UUID == self.UUID
+        return (object as! PhotoInfo).UUID == self.UUID
     }
 
     func sourceImageURLWithFormatName(formatName: String!) -> NSURL! {

diff --git a/PhotoBrowser/PhotoViewerViewController.swift b/PhotoBrowser/PhotoViewerViewController.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import FastImageCache
 
 class PhotoViewerViewController: UIViewController, UIScrollViewDelegate {
 
@@ -72,7 +73,7 @@ class PhotoViewerViewController: UIViewController, UIScrollViewDelegate {
 
     // MARK: ScrollView
 
-    func scrollViewDidZoom(scrollView: UIScrollView!) {
+    func scrollViewDidZoom(scrollView: UIScrollView) {
         self.centerScrollViewContents()
     }
 
@@ -95,7 +96,7 @@ class PhotoViewerViewController: UIViewController, UIScrollViewDelegate {
         self.imageView.frame = contentsFrame
     }
 
-    func viewForZoomingInScrollView(scrollView: UIScrollView!) -> UIView! {
+    func viewForZoomingInScrollView(scrollView: UIScrollView) -> UIView? {
         return self.imageView
     }
 

diff --git a/Podfile b/Podfile
@@ -0,0 +1,7 @@
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0' 
+use_frameworks!
+
+pod 'Alamofire', '~> 1.2'
+pod 'SwiftyJSON', '~> 2.2.0'
+pod 'FastImageCache', '~> 1.3', :inhibit_warnings => true
diff --git a/Podfile.lock b/Podfile.lock
@@ -0,0 +1,16 @@
+PODS:
+  - Alamofire (1.2.0)
+  - FastImageCache (1.3)
+  - SwiftyJSON (2.2.0)
+
+DEPENDENCIES:
+  - Alamofire (~> 1.2)
+  - FastImageCache (~> 1.3)
+  - SwiftyJSON (~> 2.2.0)
+
+SPEC CHECKSUMS:
+  Alamofire: d765c5c1713aa64106b0228aaa600a1e6851f68d
+  FastImageCache: 25f214fd46405daca3d1995d783fb83b9036c62e
+  SwiftyJSON: 0b3e6c07af17ff745e77e8e9984097b55c956e5c
+
+COCOAPODS: 0.36.4
diff --git a/Pods/Alamofire/LICENSE b/Pods/Alamofire/LICENSE