Merge branch 'swift-2.3'

klaus01 · klaus01 · commit 6b33250dd772 · 2016-10-08T22:31:31.000+08:00
diff --git a/Podfile b/Podfile
@@ -1,10 +1,10 @@
 use_frameworks!
 target 'ruby-china-ios' do
   pod 'Turbolinks', git: 'https://github.com/turbolinks/turbolinks-ios.git'
-  pod 'SideMenu'
-  pod 'SwiftyJSON'
-  pod 'Alamofire'
-  pod 'Heimdallr'
+  pod 'SideMenu', '~> 1.0'
+  pod 'SwiftyJSON', '~> 2.0'
+  pod 'Alamofire', '~> 3.0'
+  pod 'Heimdallr', '~> 3.0'
   pod 'Router'
   pod 'PKHUD'
   pod 'YYKeyboardManager'
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,24 +1,24 @@
 PODS:
-  - Alamofire (3.4.1)
-  - Heimdallr (3.3.1):
-    - Heimdallr/Core (= 3.3.1)
-  - Heimdallr/Core (3.3.1):
+  - Alamofire (3.5.0)
+  - Heimdallr (3.5.0):
+    - Heimdallr/Core (= 3.5.0)
+  - Heimdallr/Core (3.5.0):
     - Result (~> 2.0)
   - PKHUD (3.2.1)
   - Result (2.1.3)
   - Router (1.0.0)
-  - SideMenu (1.1.9)
-  - SwiftyJSON (2.3.2)
+  - SideMenu (1.2.1)
+  - SwiftyJSON (2.4.0)
   - Turbolinks (1.0.2)
   - YYKeyboardManager (1.0.1)
 
 DEPENDENCIES:
-  - Alamofire
-  - Heimdallr
+  - Alamofire (~> 3.0)
+  - Heimdallr (~> 3.0)
   - PKHUD
   - Router
-  - SideMenu
-  - SwiftyJSON
+  - SideMenu (~> 1.0)
+  - SwiftyJSON (~> 2.0)
   - Turbolinks (from `https://github.com/turbolinks/turbolinks-ios.git`)
   - YYKeyboardManager
 
@@ -28,20 +28,20 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   Turbolinks:
-    :commit: b8702ffd6e06748120a678949fdde6dfc3edd397
+    :commit: 27379cfdf0454636505d99251ca32f2b506547eb
     :git: https://github.com/turbolinks/turbolinks-ios.git
 
 SPEC CHECKSUMS:
-  Alamofire: 01a82e2f6c0f860ade35534c8dd88be61bdef40c
-  Heimdallr: db5f669f3666cb0dc5ad326538fee3f6f8044417
+  Alamofire: b70a7352335f8ea5babd0a923eb7e8eacc67b877
+  Heimdallr: 5451a68028a6dc02f009fb6b73923d7f88b702c7
   PKHUD: 001c11518f125a273ddf026bcc64918423744ea2
   Result: 18e1a7597fbcca5923c565b40a25a98afafdee02
   Router: 6088d6d321e097070d5ea4bd792cb015dfa0fbb4
-  SideMenu: e4ecb0f1061e19230e53079edb2b300081446f80
-  SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
+  SideMenu: d38e42ab18a5c0875a77cfec7e7cecea72a69518
+  SwiftyJSON: 96918c1bf505efa50c4f72957018dd3452090c9c
   Turbolinks: d8209bab43803adae8c06d434368e16479023407
   YYKeyboardManager: ff53d2e80d1808567a7f004028bd200d9469a89f
 
-PODFILE CHECKSUM: 60fa3209794e9fabd0cf6b737e3cf51c7fca9966
+PODFILE CHECKSUM: 928e24527cf5c8a8c48eec9f686eddff815a5b93
 
-COCOAPODS: 1.0.1
+COCOAPODS: 1.1.0.rc.2
diff --git a/ruby-china-ios.xcodeproj/project.pbxproj b/ruby-china-ios.xcodeproj/project.pbxproj
@@ -242,12 +242,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "ruby-china";
 				TargetAttributes = {
 					9670F18B1D4235D200128F8A = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = A38T799N53;
+						LastSwiftMigration = 0800;
 						SystemCapabilities = {
 							com.apple.Push = {
 								enabled = 1;
@@ -305,7 +306,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		A493C2F4C2D843A7EC1873C7 /* [CP] Embed Pods Frameworks */ = {
@@ -494,6 +495,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ruby-china.app";
 				PRODUCT_NAME = "Ruby China";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -509,6 +511,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ruby-china.app";
 				PRODUCT_NAME = "Ruby China";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
diff --git a/ruby-china-ios/Controllers/RootViewController.swift b/ruby-china-ios/Controllers/RootViewController.swift
@@ -46,7 +46,7 @@ class RootViewController: UITabBarController {
         viewControllers = [topicsController, pagesController, favoritesController, notificationsController]
         viewControllers?.forEach({ (viewController) in
             let oldImage = viewController.tabBarItem.image
-            viewController.tabBarItem.image = oldImage?.imageWithColor(BLACK_COLOR).imageWithRenderingMode(.AlwaysOriginal)
+            viewController.tabBarItem.image = oldImage?.imageWithColor(BLACK_COLOR)?.imageWithRenderingMode(.AlwaysOriginal)
         })
     }
     
diff --git a/ruby-china-ios/Controllers/SideMenuViewController.swift b/ruby-china-ios/Controllers/SideMenuViewController.swift
@@ -120,7 +120,9 @@ class SideMenuViewController: UITableViewController {
                 guard let `self` = self else {
                     return
                 }
-                let avatarImage = avatar.drawRectWithRoundedCorner(radius: 11, CGSizeMake(22, 22))
+                guard let avatarImage = avatar.drawRectWithRoundedCorner(radius: 11, CGSizeMake(22, 22)) else {
+                    return
+                }
                 self.menuItemIcons[0] = avatarImage
                 self.tableView.reloadData()
             })
diff --git a/ruby-china-ios/Controllers/SignInViewController.swift b/ruby-china-ios/Controllers/SignInViewController.swift
@@ -155,7 +155,7 @@ extension SignInViewController: OAuth2Delegate {
     }
     
     func oauth2DidLoginFailed(error: NSError) {
-        print("Login failed", error.localizedFailureReason)
+        print("Login failed", error)
         
         var errorMessage = ""
         if error.code == 3 {
diff --git a/ruby-china-ios/Controllers/WebViewController.swift b/ruby-china-ios/Controllers/WebViewController.swift
@@ -140,7 +140,7 @@ class WebViewController: VisitableViewController {
     }
     
     lazy var errorView: ErrorView = {
-        let view = NSBundle.mainBundle().loadNibNamed("ErrorView", owner: self, options: nil).first as! ErrorView
+        let view = NSBundle.mainBundle().loadNibNamed("ErrorView", owner: self, options: nil)!.first as! ErrorView
         view.translatesAutoresizingMaskIntoConstraints = false
         view.retryButton.addTarget(self, action: #selector(retry(_:)), forControlEvents: .TouchUpInside)
         return view
diff --git a/ruby-china-ios/Extensions/UIImage+Ext.swift b/ruby-china-ios/Extensions/UIImage+Ext.swift
@@ -17,10 +17,13 @@ extension UIImage {
      
      - returns: 图片
      */
-    static func fromColor(color: UIColor) -> UIImage {
+    static func fromColor(color: UIColor) -> UIImage? {
         let rect = CGRect(x: 0, y: 0, width: 1, height: 1)
         UIGraphicsBeginImageContext(rect.size)
-        let context = UIGraphicsGetCurrentContext()
+        guard let context = UIGraphicsGetCurrentContext() else {
+            UIGraphicsEndImageContext()
+            return nil
+        }
         CGContextSetFillColorWithColor(context, color.CGColor)
         CGContextFillRect(context, rect)
         let img = UIGraphicsGetImageFromCurrentImageContext()
@@ -36,17 +39,21 @@ extension UIImage {
      
      - returns: 圆角图片
      */
-    func drawRectWithRoundedCorner(radius radius: CGFloat, _ sizetoFit: CGSize) -> UIImage {
+    func drawRectWithRoundedCorner(radius radius: CGFloat, _ sizetoFit: CGSize) -> UIImage? {
         let rect = CGRect(origin: CGPoint(x: 0, y: 0), size: sizetoFit)
         
         UIGraphicsBeginImageContextWithOptions(rect.size, false, UIScreen.mainScreen().scale)
-        CGContextAddPath(UIGraphicsGetCurrentContext(),
-            UIBezierPath(roundedRect: rect, byRoundingCorners: UIRectCorner.AllCorners,
-                cornerRadii: CGSize(width: radius, height: radius)).CGPath)
-        CGContextClip(UIGraphicsGetCurrentContext())
+        guard let context = UIGraphicsGetCurrentContext() else {
+            UIGraphicsEndImageContext()
+            return nil
+        }
+        
+        let path = UIBezierPath(roundedRect: rect, byRoundingCorners: .AllCorners, cornerRadii: CGSize(width: radius, height: radius))
+        CGContextAddPath(context, path.CGPath)
+        CGContextClip(context)
         
         self.drawInRect(rect)
-        CGContextDrawPath(UIGraphicsGetCurrentContext(), .FillStroke)
+        CGContextDrawPath(context, .FillStroke)
         let output = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()
         
@@ -60,17 +67,26 @@ extension UIImage {
      
      - returns: 新图片
      */
-    func imageWithColor(color: UIColor) -> UIImage {
+    func imageWithColor(color: UIColor) -> UIImage? {
+        guard let cgimage = CGImage else {
+            return nil
+        }
+        
         UIGraphicsBeginImageContextWithOptions(size, false, scale)
-        let context = UIGraphicsGetCurrentContext()
+        guard let context = UIGraphicsGetCurrentContext() else {
+            UIGraphicsEndImageContext()
+            return nil
+        }
+        
         CGContextTranslateCTM(context, 0, size.height)
         CGContextScaleCTM(context, 1.0, -1.0)
         CGContextSetBlendMode(context, .Normal)
         let rect = CGRectMake(0, 0, size.width, size.height)
-        CGContextClipToMask(context, rect, CGImage)
+        CGContextClipToMask(context, rect, cgimage)
         color.setFill()
         CGContextFillRect(context, rect)
         let newImage = UIGraphicsGetImageFromCurrentImageContext()
+        
         UIGraphicsEndImageContext()
         return newImage
     }
diff --git a/ruby-china-ios/Info.plist b/ruby-china-ios/Info.plist
@@ -31,6 +31,10 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>上传照片</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>上传照片</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/ruby-china-ios/Libraries/OAuth2.swift b/ruby-china-ios/Libraries/OAuth2.swift
@@ -50,14 +50,20 @@ class OAuth2 {
         heimdallr.requestAccessToken(username: username, password: password) { result in
             switch result {
             case .Success:
-                self.accessToken = self.accessTokenStore.retrieveAccessToken()?.accessToken
-                print("accessToken", self.accessToken)
+                guard let accessToken = self.accessTokenStore.retrieveAccessToken()?.accessToken else {
+                    print("Login is successful but the access_Token is missing")
+                    let err = NSError(domain: "customize", code: -1, userInfo: [NSLocalizedDescriptionKey: "get accessToken failed".localized])
+                    dispatch_async(dispatch_get_main_queue(), {
+                        self.delegate?.oauth2DidLoginFailed(err)
+                    })
+                    return
+                }
+                print("Login successed. accessToken=\(accessToken)")
+                self.accessToken = accessToken
                 self.submitDeviceToken()
-                
                 self.reloadCurrentUser()
-                print("Login successed.")
                 dispatch_async(dispatch_get_main_queue(), {
-                    self.delegate?.oauth2DidLoginSuccessed(self.accessToken!)
+                    self.delegate?.oauth2DidLoginSuccessed(accessToken)
                 })
             case .Failure(let err):
                 dispatch_async(dispatch_get_main_queue(), {
diff --git a/ruby-china-ios/Libraries/TurbolinksSessionLib.swift b/ruby-china-ios/Libraries/TurbolinksSessionLib.swift
@@ -224,6 +224,15 @@ extension TurbolinksSessionLib: WKNavigationDelegate {
             return
         }
         
+        // kelei 2016-10-08
+        // 帖子中有 Youtube 视频时，会触发此方法。
+        // po navigationAction 返回 <WKNavigationAction: 0x7fd0f9422eb0; navigationType = -1; syntheticClickType = 0; request = <NSMutableURLRequest: 0x61800001e700> { URL: https://www.youtube.com/embed/xMFs9DTympQ }; sourceFrame = (null); targetFrame = <WKFrameInfo: 0x7fd0f9401030; isMainFrame = NO; request = (null)>>
+        // 所有这里判断一下 navigationType 值来修复进入帖子自动打开 Youtube 网页的问题
+        if navigationAction.navigationType.rawValue < 0 {
+            decisionHandler(.Allow)
+            return
+        }
+        
         if let url = navigationAction.request.URL {
             if let host = url.host where host != NSURL(string: ROOT_URL)!.host! {
                 // 外部网站, open in SafariView
diff --git a/ruby-china-ios/Views/RBTextField.swift b/ruby-china-ios/Views/RBTextField.swift
@@ -22,14 +22,11 @@ class RBTextField: UITextField {
     }
     
     func setupView() {
-        
         self.borderStyle = UITextBorderStyle.None
         let border = CALayer()
         let borderWidth: CGFloat = 1
-        border.borderColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).CGColor
-        border.frame = CGRectMake(0, self.frame.size.height - borderWidth, self.frame.size.width, self.frame.size.height)
-        border.borderWidth = borderWidth
+        border.backgroundColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).CGColor
+        border.frame = CGRectMake(0, self.frame.size.height - borderWidth, self.frame.size.width, borderWidth)
         self.layer.addSublayer(border)
-        
     }
 }
diff --git a/ruby-china-ios/en.lproj/Localizable.strings b/ruby-china-ios/en.lproj/Localizable.strings
@@ -36,3 +36,4 @@
 "share" = "Share";
 "cancel" = "Cancel";
 "close" = "Close";
+"get accessToken failed" = "Get accessToken failed, Please try again!";
diff --git a/ruby-china-ios/zh-Hans.lproj/Localizable.strings b/ruby-china-ios/zh-Hans.lproj/Localizable.strings
@@ -36,3 +36,4 @@
 "share" = "分享";
 "cancel" = "取消";
 "close" = "关闭";
+"get accessToken failed" = "获取 accessToken 失败，请重试！";

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class RootViewController: UITabBarController {`
`46`	`46`	`viewControllers = [topicsController, pagesController, favoritesController, notificationsController]`
`47`	`47`	`viewControllers?.forEach({ (viewController) in`
`48`	`48`	`let oldImage = viewController.tabBarItem.image`
`49`		`- viewController.tabBarItem.image = oldImage?.imageWithColor(BLACK_COLOR).imageWithRenderingMode(.AlwaysOriginal)`
	`49`	`+ viewController.tabBarItem.image = oldImage?.imageWithColor(BLACK_COLOR)?.imageWithRenderingMode(.AlwaysOriginal)`
`50`	`50`	`})`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ extension SignInViewController: OAuth2Delegate {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`func oauth2DidLoginFailed(error: NSError) {`
`158`		`- print("Login failed", error.localizedFailureReason)`
	`158`	`+ print("Login failed", error)`
`159`	`159`
`160`	`160`	`var errorMessage = ""`
`161`	`161`	`if error.code == 3 {`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class WebViewController: VisitableViewController {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`lazy var errorView: ErrorView = {`
`143`		`- let view = NSBundle.mainBundle().loadNibNamed("ErrorView", owner: self, options: nil).first as! ErrorView`
	`143`	`+ let view = NSBundle.mainBundle().loadNibNamed("ErrorView", owner: self, options: nil)!.first as! ErrorView`
`144`	`144`	`view.translatesAutoresizingMaskIntoConstraints = false`
`145`	`145`	`view.retryButton.addTarget(self, action: #selector(retry(_:)), forControlEvents: .TouchUpInside)`
`146`	`146`	`return view`