update for Swift 1.2, Xcode 6.3

mattneub · mattneub · commit ce6e77485420 · 2015-04-09T16:32:18.000-07:00
diff --git a/bk2ch04p125imageViewAnimation/ch17p473imageViewAnimation/ViewController.swift b/bk2ch04p125imageViewAnimation/ch17p473imageViewAnimation/ViewController.swift
@@ -19,7 +19,7 @@ class ViewController : UIViewController {
     
     func animate () {
         
-        let which = 2
+        let which = 1
         switch which {
         case 1:
             let mars = UIImage(named: "Mars")!
@@ -54,7 +54,7 @@ class ViewController : UIViewController {
                 arr += [im]
             }
             let im = UIImage.animatedImageWithImages(arr, duration:0.5)
-            let b = UIButton.buttonWithType(.System) as UIButton
+            let b = UIButton.buttonWithType(.System) as! UIButton
             b.setTitle("Howdy", forState:.Normal)
             b.setImage(im, forState:.Normal)
             b.center = CGPointMake(100,200)
@@ -63,7 +63,7 @@ class ViewController : UIViewController {
 
         case 3:
             let im = UIImage.animatedImageNamed("pac", duration:1)
-            let b = UIButton.buttonWithType(.System) as UIButton
+            let b = UIButton.buttonWithType(.System) as! UIButton
             b.setImage(im, forState:.Normal)
             b.center = CGPointMake(100,200)
             b.sizeToFit()
diff --git a/bk2ch04p130viewAnimation/bk2ch04p130viewAnimation/ViewController.swift b/bk2ch04p130viewAnimation/bk2ch04p130viewAnimation/ViewController.swift
@@ -40,7 +40,7 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        let which = 8
+        let which = 1
         
         delay(3) {
             println(0)
diff --git a/bk2ch04p133cancelAnimation/ch17p484cancelAnimation/ViewController.swift b/bk2ch04p133cancelAnimation/ch17p484cancelAnimation/ViewController.swift
@@ -19,7 +19,7 @@ class ViewController : UIViewController {
     }
     
     func cancel() {
-        let which = 3
+        let which = 1
         switch which {
         case 1:
             // simplest possible solution: just kill it dead
diff --git a/bk2ch04p148layerAnimation/ch17p490layerAnimation/ViewController.swift b/bk2ch04p148layerAnimation/ch17p490layerAnimation/ViewController.swift
@@ -10,7 +10,7 @@ class ViewController : UIViewController {
         let c = self.compassView.layer as! CompassLayer
         let arrow = c.arrow!
         
-        let which = 10
+        let which = 1
         switch which {
         case 1:
             arrow.transform = CATransform3DRotate(
diff --git a/bk2ch04p151customAnimatableProperty/ch17p498customAnimatableProperty/ViewController.swift b/bk2ch04p151customAnimatableProperty/ch17p498customAnimatableProperty/ViewController.swift
@@ -6,7 +6,7 @@ class ViewController : UIViewController {
     @IBOutlet var v : UIView!
     
     @IBAction func doButton (sender:AnyObject) {
-        let lay = self.v.layer as MyLayer
+        let lay = self.v.layer as! MyLayer
         let cur = lay.thickness
         let val : CGFloat = cur == 10 ? 0 : 10
         lay.thickness = val
diff --git a/bk2ch04p157layerTransition/ch17p505layerTransition/ViewController.swift b/bk2ch04p157layerTransition/ch17p505layerTransition/ViewController.swift
@@ -21,7 +21,7 @@ class ViewController : UIViewController {
     }
     
     @IBAction func doButton(sender:AnyObject?) {
-        let lay = self.v.layer.sublayers[0] as CALayer
+        let lay = self.v.layer.sublayers[0] as! CALayer
         let t = CATransition()
         t.type = kCATransitionPush
         t.subtype = kCATransitionFromBottom
diff --git a/bk2ch04p160frozenAnimation/FrozenAnimationTest/ViewController.swift b/bk2ch04p160frozenAnimation/FrozenAnimationTest/ViewController.swift
@@ -34,7 +34,7 @@ class ViewController: UIViewController {
     }
     
     @IBAction func doSlider(sender: AnyObject) {
-        let slider = sender as UISlider
+        let slider = sender as! UISlider
         self.shape.timeOffset = Double(slider.value)
     }
 
diff --git a/bk2ch04p164actions/ch17p513actions/ViewController.swift b/bk2ch04p164actions/ch17p513actions/ViewController.swift
@@ -5,7 +5,7 @@ class MyAction : NSObject, CAAction {
         arguments dict: [NSObject : AnyObject]!) {
             let anim = CABasicAnimation(keyPath: event)
             anim.duration = 5
-            let lay = anObject as CALayer
+            let lay = anObject as! CALayer
             let newP : AnyObject? = lay.valueForKey(event)
             let oldP : AnyObject? = lay.presentationLayer()!.valueForKey(event)
             println("from \(oldP) to \(newP)")
@@ -16,9 +16,9 @@ class MyAction : NSObject, CAAction {
 class MyWagglePositionAction : NSObject, CAAction {
     func runActionForKey(event: String!, object anObject: AnyObject!,
         arguments dict: [NSObject : AnyObject]!) {
-            let lay = anObject as CALayer
-            let newP = (lay.valueForKey(event) as NSValue).CGPointValue()
-            let oldP = (lay.presentationLayer()!.valueForKey(event) as NSValue).CGPointValue()
+            let lay = anObject as! CALayer
+            let newP = (lay.valueForKey(event) as! NSValue).CGPointValue()
+            let oldP = (lay.presentationLayer()!.valueForKey(event) as! NSValue).CGPointValue()
 
             let d = sqrt(pow(oldP.x - newP.x, 2) + pow(oldP.y - newP.y, 2))
             let r = Double(d/3.0)
@@ -56,7 +56,7 @@ class ViewController : UIViewController {
     @IBAction func doButton(sender:AnyObject?) {
         let layer = self.layer
         
-        let which = 10
+        let which = 1
         switch which {
         case 1:
             layer.position = CGPointMake(100,100) // proving that it normally works
diff --git a/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/MyViewAndLayer.swift b/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/MyViewAndLayer.swift
@@ -41,7 +41,7 @@ public extension MyLayer {
             let ba = CABasicAnimation(keyPath: key)
             // stolen directly from Apple's sample code:
             // sorry, guys, but I would never have thought of this!
-            ba.fromValue = (self.presentationLayer() as CALayer).valueForKey(key)
+            ba.fromValue = (self.presentationLayer() as! CALayer).valueForKey(key)
             return ba
         }
         return super.actionForKey(key)
diff --git a/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/ViewController.swift b/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/ViewController.swift
@@ -6,7 +6,7 @@ class ViewController : UIViewController {
     @IBOutlet var v : UIView!
     
     @IBAction func doButton (sender:AnyObject) {
-        let lay = self.v.layer as MyLayer
+        let lay = self.v.layer as! MyLayer
         let cur = lay.thickness
         let val : CGFloat = cur == 10 ? 0 : 10
         CATransaction.setDisableActions(true)
@@ -17,7 +17,7 @@ class ViewController : UIViewController {
     }
     
     @IBAction func doButton2 (sender:AnyObject) {
-        let lay = self.v.layer as MyLayer
+        let lay = self.v.layer as! MyLayer
         let cur = lay.thickness
         let val : CGFloat = cur == 10 ? 0 : 10
         lay.thickness = val // implicit
diff --git a/bk2ch04p166emitThis/ch17p518emitThis/ViewController.swift b/bk2ch04p166emitThis/ch17p518emitThis/ViewController.swift
@@ -30,7 +30,7 @@ class ViewController : UIViewController {
         emit.emitterCells = [cell]
         self.view.layer.addSublayer(emit)
         
-        let which = 5
+        let which = 0
         switch which {
         case 0:
             break
diff --git a/bk2ch04p172CIFilterAnimation/ch17p519CIFilterAnimation/ViewController.swift b/bk2ch04p172CIFilterAnimation/ch17p519CIFilterAnimation/ViewController.swift
@@ -19,7 +19,7 @@ class ViewController : UIViewController {
         let col = CIFilter(name:"CIConstantColorGenerator")
         let cicol = CIColor(color:UIColor.redColor())
         col.setValue(cicol, forKey:"inputColor")
-        let colorimage = col.valueForKey("outputImage") as CIImage
+        let colorimage = col.valueForKey("outputImage") as! CIImage
         
         let tran = CIFilter(name:"CIFlashTransition")
         tran.setValue(colorimage, forKey:"inputImage")
diff --git a/bk2ch04p175dynamics/Dynamics/ViewController.swift b/bk2ch04p175dynamics/Dynamics/ViewController.swift
@@ -38,7 +38,7 @@ class ViewController : UIViewController {
     }
     
     @IBAction func doButton(sender:AnyObject?) {
-        (sender as UIButton).enabled = false
+        (sender as! UIButton).enabled = false
         
         let grav = MyGravityBehavior()
         
@@ -47,12 +47,12 @@ class ViewController : UIViewController {
         I demonstrate some alternatives...
         */
         
-        let which = 3
+        let which = 1
         switch which {
         case 1:
             // leak! neither the image view nor the gravity behavior is released
             grav.action = {
-                let items = self.anim.itemsInRect(self.view.bounds) as [UIView]
+                let items = self.anim.itemsInRect(self.view.bounds) as! [UIView]
                 let ix = find(items, self.iv)
                 if ix == nil {
                     self.anim.removeAllBehaviors()
@@ -62,7 +62,7 @@ class ViewController : UIViewController {
             }
         case 2:
             grav.action = {
-                let items = self.anim.itemsInRect(self.view.bounds) as [UIView]
+                let items = self.anim.itemsInRect(self.view.bounds) as! [UIView]
                 let ix = find(items, self.iv)
                 if ix == nil {
                     self.anim.removeAllBehaviors()
@@ -73,7 +73,7 @@ class ViewController : UIViewController {
             }
         case 3:
             grav.action = {
-                let items = self.anim.itemsInRect(self.view.bounds) as [UIView]
+                let items = self.anim.itemsInRect(self.view.bounds) as! [UIView]
                 let ix = find(items, self.iv)
                 if ix == nil {
                     delay(0) { // * both are released
@@ -86,7 +86,7 @@ class ViewController : UIViewController {
         case 4:
             grav.action = {
                 [weak grav] in // *
-                let items = self.anim.itemsInRect(self.view.bounds) as [UIView]
+                let items = self.anim.itemsInRect(self.view.bounds) as! [UIView]
                 let ix = find(items, self.iv)
                 if ix == nil {
                     self.anim.removeBehavior(grav) // * grav is released, iv is not!
@@ -149,7 +149,7 @@ extension ViewController : UIDynamicAnimatorDelegate, UICollisionBehaviorDelegat
         atPoint p: CGPoint) {
             println(p)
             // look for the dynamic item behavior
-            for b in self.anim.behaviors as [UIDynamicBehavior] {
+            for b in self.anim.behaviors as! [UIDynamicBehavior] {
                 if let bounce = b as? UIDynamicItemBehavior {
                     let v = bounce.angularVelocityForItem(self.iv)
                     println(v)
diff --git a/bk2ch04p183animationAndAutolayout/ch17p507animationAndAutolayout/ViewController.swift b/bk2ch04p183animationAndAutolayout/ch17p507animationAndAutolayout/ViewController.swift
@@ -9,7 +9,7 @@ class ViewController : UIViewController {
     
     @IBAction func doButton(sender:AnyObject?) {
     
-        let which = 7
+        let which = 1
         switch which {
         case 1:
             UIView.animateWithDuration(1, animations:{
@@ -53,7 +53,7 @@ class ViewController : UIViewController {
             
         case 6:
             // general solution to all such problems: animate a temporary snapshot instead!
-            let snap = self.v.snapshotViewAfterScreenUpdates(true)
+            let snap = self.v.snapshotViewAfterScreenUpdates(false)
             snap.frame = self.v.frame
             self.v.superview!.addSubview(snap)
             self.v.hidden = true
@@ -67,7 +67,7 @@ class ViewController : UIViewController {
                 })
 
         case 7:
-            let snap = self.v.snapshotViewAfterScreenUpdates(true)
+            let snap = self.v.snapshotViewAfterScreenUpdates(false)
             snap.frame = self.v.frame
             self.v.superview!.addSubview(snap)
             self.v.hidden = true
diff --git a/bk2ch04p183animationAndAutolayout3/AnimateAutolayoutTest/ViewController.swift b/bk2ch04p183animationAndAutolayout3/AnimateAutolayoutTest/ViewController.swift
@@ -5,13 +5,12 @@ class ViewController: UIViewController {
     
     @IBOutlet var oldConstraint: NSLayoutConstraint!
     
-    // not in the book but should have been:
     // show that you can animate more than a change of constant
     // here, I remove one constraint and replace it with another - and I can still animate layout!
     // (I am told you can also animate change of priority, but you can't change from 1000)
     
     @IBAction func doButton(sender: AnyObject) {
-        let v = sender as UIView
+        let v = sender as! UIView
         let c = self.oldConstraint.constant
         NSLayoutConstraint.deactivateConstraints([self.oldConstraint])
         let newConstraint = c > 0 ?

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class ViewController : UIViewController {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func cancel() {`
`22`		`- let which = 3`
	`22`	`+ let which = 1`
`23`	`23`	`switch which {`
`24`	`24`	`case 1:`
`25`	`25`	`// simplest possible solution: just kill it dead`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ViewController : UIViewController {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@IBAction func doButton(sender:AnyObject?) {`
`24`		`- let lay = self.v.layer.sublayers[0] as CALayer`
	`24`	`+ let lay = self.v.layer.sublayers[0] as! CALayer`
`25`	`25`	`let t = CATransition()`
`26`	`26`	`t.type = kCATransitionPush`
`27`	`27`	`t.subtype = kCATransitionFromBottom`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ViewController: UIViewController {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@IBAction func doSlider(sender: AnyObject) {`
`37`		`- let slider = sender as UISlider`
	`37`	`+ let slider = sender as! UISlider`
`38`	`38`	`self.shape.timeOffset = Double(slider.value)`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public extension MyLayer {`
`41`	`41`	`let ba = CABasicAnimation(keyPath: key)`
`42`	`42`	`// stolen directly from Apple's sample code:`
`43`	`43`	`// sorry, guys, but I would never have thought of this!`
`44`		`- ba.fromValue = (self.presentationLayer() as CALayer).valueForKey(key)`
	`44`	`+ ba.fromValue = (self.presentationLayer() as! CALayer).valueForKey(key)`
`45`	`45`	`return ba`
`46`	`46`	`}`
`47`	`47`	`return super.actionForKey(key)`