more mild cleanup, but there are limits to how far you can go with this sort of thing

Author: mattneub

bk2ch04p130viewAnimation/bk2ch04p130viewAnimation/ViewController.swift

@@ -55,14 +55,14 @@ class ViewController: UIViewController {
             print(self.v.center.y)
             switch which {
             case 1:
-                UIView.animate(withDuration:0.4, animations: {
+                UIView.animate(withDuration:0.4) {
                     self.v.backgroundColor = UIColor.red()
-                })
+                }
             case 2:
-                UIView.animate(withDuration:0.4, animations: {
+                UIView.animate(withDuration:0.4) {
                     self.v.backgroundColor = UIColor.red()
                     self.v.center.y += 100
-                })
+                }
             case 3:
                 let v2 = UIView()
                 v2.backgroundColor = UIColor.black()
@@ -81,12 +81,12 @@ class ViewController: UIViewController {
                     _ in print(self.v.superview)
                 }
             case 5:
-                UIView.animate(withDuration:1, animations: {
+                UIView.animate(withDuration:1) {
                     self.v.backgroundColor = UIColor.red()
                     UIView.performWithoutAnimation {
                         self.v.center.y += 100
                     }
-                })
+                }
             case 6:
                 func report(_ ix:Int) {
                     let pres = (self.v.layer.presentationLayer() as! CALayer).position.y
@@ -129,13 +129,13 @@ class ViewController: UIViewController {
                         self.v.center.x = xorig
                 })
             case 11:
-                UIView.animate(withDuration:1, animations: {
+                UIView.animate(withDuration:1) {
                     self.v.center.x += 100
-                })
+                }
                 // let opts = UIViewAnimationOptions.beginFromCurrentState
-                UIView.animate(withDuration:1, animations: {
+                UIView.animate(withDuration:1) {
                         self.v.center.y += 100
-                })
+                }
             case 12:
                 UIView.animate(withDuration:2, animations: {
                     self.v.center.x += 100

bk2ch04p132viewAnimationFacade/bk2ch04p132viewAnimationFacade/ViewController.swift

@@ -8,9 +8,9 @@ class ViewController: UIViewController {
     // MyView presents a facade where its "swing" property is view-animatable
 
     @IBAction func doButton(_ sender: AnyObject) {
-        UIView.animate(withDuration:1, animations: {
+        UIView.animate(withDuration:1) {
             self.v.swing = !self.v.swing // "animatable" Bool property
-            })
+        }
     }
 
 
@@ -23,9 +23,9 @@ class MyView : UIView {
         p.x = self.swing ? p.x + 100 : p.x - 100
         // this is the trick: perform actual view animation with zero duration
         // zero duration means we inherit the surrounding duration
-        UIView.animate(withDuration:0, animations: {
+        UIView.animate(withDuration:0) {
             self.center = p
-            })
+        }
     }
     }
 }

bk2ch04p183animationAndAutolayout/ch17p507animationAndAutolayout/ViewController.swift

@@ -22,9 +22,9 @@ class ViewController : UIViewController {
 
         switch which {
         case 1:
-            UIView.animate(withDuration:1, animations:{
+            UIView.animate(withDuration:1) {
                 self.v.center.x += 100
-                }) // everything *looks* okay, but it isn't
+            } // everything *looks* okay, but it isn't
 
         case 2:
             UIView.animate(withDuration:1, animations:{
@@ -39,9 +39,9 @@ class ViewController : UIViewController {
         case 3:
             let con = self.v_horizontalPositionConstraint!
             con.constant += 100
-            UIView.animate(withDuration:1, animations:{
+            UIView.animate(withDuration:1) {
                 self.v.superview!.layoutIfNeeded()
-                })
+            }
 
         case 4:
             // this works fine in iOS 8! does not trigger spurious layout
@@ -83,9 +83,9 @@ class ViewController : UIViewController {
             snap.frame = self.v.frame
             self.v.superview!.addSubview(snap)
             self.v.isHidden = true
-            UIView.animate(withDuration:1, animations:{
+            UIView.animate(withDuration:1) {
                 snap.center.x += 100
-                })
+            }
 
         case 8:
             // don't try this one: it may appear to work but it causes a constraint conflict

bk2ch06p246showHideStatusBar/UnderlappingTest/ViewController.swift

@@ -16,10 +16,10 @@ class ViewController: UIViewController {
 
     @IBAction func doButton(_ sender: AnyObject) {
         self.hide = !self.hide
-        UIView.animate(withDuration:0.4, animations: {
+        UIView.animate(withDuration:0.4) {
             self.setNeedsStatusBarAppearanceUpdate()
             self.view.layoutIfNeeded()
-        })
+        }
     }
 }
 

bk2ch07p384dragInScrollView2/ch20p688dragInScrollView/ViewController.swift

@@ -51,11 +51,11 @@ class ViewController : UIViewController, UIGestureRecognizerDelegate {
         self.flag.frame.origin.x -= self.flag.bounds.size.width
         self.flag.isHidden = false
 
-        UIView.animate(withDuration:0.25, animations:{
+        UIView.animate(withDuration:0.25) {
             self.flag.frame.origin.x = p.x
             // thanks for the flag, now stop operating altogether
             g.isEnabled = false
-            })
+        }
     }
 
     @IBAction func dragging (_  p: UIPanGestureRecognizer) {

bk2ch09p490universalSplitViewControllerManual/SplitViewControllerManual/PrimaryViewController.swift

@@ -114,9 +114,9 @@ extension PrimaryViewController {
             switch svc.displayMode {
             case .primaryHidden:
                 // changing display mode is animatable!
-                UIView.animate(withDuration:0.2, animations: {
+                UIView.animate(withDuration:0.2) {
                     svc.preferredDisplayMode = .primaryOverlay
-                    })
+                }
             default:
                 svc.preferredDisplayMode = .automatic
             }
@@ -132,9 +132,9 @@ extension PrimaryViewController {
             self.verticalConstraints =
                 NSLayoutConstraint.constraints(withVisualFormat:"V:|-(minuscon)-[v]-(con)-|", metrics: ["con":con, "minuscon":-con], views: ["v":vc2.view])
             NSLayoutConstraint.activate(self.verticalConstraints!)
-            UIView.animate(withDuration:0.25, animations: {
+            UIView.animate(withDuration:0.25) {
                 self.view.layoutIfNeeded()
-                })
+            }
         }
     }
 }

bk2ch12p589segmentedControl/ch25p862segmentedControl/ViewController.swift

@@ -52,9 +52,9 @@ class ViewController: UIViewController {
 
         self.seg.layer.speed = 0.2
         delay(1) {
-            UIView.animate(withDuration:0.4, animations: {
+            UIView.animate(withDuration:0.4) {
                 self.seg.selectedSegmentIndex = 1
-            })
+            }
         }
 
 //        self.seg.tintColor = UIColor.red()