Merge pull request MengTo#20 from 0oneo-work/master

MengTo · MengTo · commit 0464f5562a2b · 2015-02-10T20:13:25.000+08:00
some fix
diff --git a/Spring/Misc.swift b/Spring/Misc.swift
@@ -157,7 +157,7 @@ public func timeAgoSinceDate(date:NSDate, numericDates:Bool) -> String {
     let unitFlags = NSCalendarUnit.CalendarUnitMinute | NSCalendarUnit.CalendarUnitHour | NSCalendarUnit.CalendarUnitDay | NSCalendarUnit.CalendarUnitWeekOfYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitSecond
     let now = NSDate()
     let earliest = now.earlierDate(date)
-    let latest = (earliest == now) ? date : now
+    let latest = now.laterDate(date)
     let components:NSDateComponents = calendar.components(unitFlags, fromDate: earliest, toDate: latest, options: nil)
     
     if (components.year >= 2) {
diff --git a/SpringApp.xcodeproj/project.pbxproj b/SpringApp.xcodeproj/project.pbxproj
@@ -245,7 +245,9 @@
 				1A4FDA431A6E44780099D309 /* SpringTests */,
 				9641173C1A5BE90A000E3A5A /* Products */,
 			);
+			indentWidth = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
 		};
 		9641173C1A5BE90A000E3A5A /* Products */ = {
 			isa = PBXGroup;
diff --git a/SpringApp/SpringViewController.swift b/SpringApp/SpringViewController.swift
@@ -166,38 +166,18 @@ class SpringViewController: UIViewController, UIPickerViewDelegate, UIPickerView
         animateView()
     }
     
-    var ballState = 0
+    var isBall = false
     func changeBall() {
-        switch ballState {
-        case 1:
-            let animation = CABasicAnimation()
-            animation.keyPath = "cornerRadius"
-            animation.fromValue = 50
-            animation.toValue = 10
-            animation.duration = 0.2
-            ballView.layer.cornerRadius = 10
-            ballView.layer.addAnimation(animation, forKey: "radius")
-            
-            ballState = 0
-        default:
-            let animation = CABasicAnimation()
-            animation.keyPath = "cornerRadius"
-            animation.fromValue = 10
-            animation.toValue = 50
-            animation.duration = 0.2
-            ballView.layer.cornerRadius = 50
-            ballView.layer.addAnimation(animation, forKey: "radius")
-            
-            ballState++
-        }
-        
+        isBall = !isBall
         let animation = CABasicAnimation()
-        animation.keyPath = "opacity"
-        animation.fromValue = 1
-        animation.toValue = 0
+        let halfWidth = ballView.frame.width / 2
+        let cornerRadius: CGFloat = isBall ? halfWidth : 10
+        animation.keyPath = "cornerRadius"
+        animation.fromValue = isBall ? 10 : halfWidth
+        animation.toValue = cornerRadius
         animation.duration = 0.2
-        animation.autoreverses = true
-        ballView.layer.addAnimation(animation, forKey: "fade")
+        ballView.layer.cornerRadius = cornerRadius
+        ballView.layer.addAnimation(animation, forKey: "radius")
     }
     
     @IBAction func shapeButtonPressed(sender: AnyObject) {
