inject some missing examples from chapter 10; correct Locale.current throughout; use #keyPath more

mattneub · mattneub · commit 692f73ddc559 · 2016-07-13T19:03:24.000-07:00
diff --git a/bk1ch10p428foundationClasses/bk1ch10p428foundationClasses/ViewController.swift b/bk1ch10p428foundationClasses/bk1ch10p428foundationClasses/ViewController.swift
@@ -32,8 +32,11 @@ class ViewController: UIViewController {
         }
         
         do {
-            let r = NSRange(Range<Int>(1...3))
+            // let rr = NSRange(1...3)
+            let r = NSRange(Range(1...3))
             print(r)
+            debugPrint(r) // that didn't help
+            print(NSStringFromRange(r))
             let r2 = r.toRange()
             print(r2)
             // let r3 = Range(r)
@@ -107,7 +110,7 @@ class ViewController: UIViewController {
             let d = comp.date // Optional wrapping Date
             if let d = d {
                 print(d)
-                print(d.description(with:Locale.current()))
+                print(d.description(with:Locale.current))
             }
 
         }
@@ -120,11 +123,23 @@ class ViewController: UIViewController {
             print("one month from now:", d2)
         }
         
+        do {
+            let greg = Calendar(calendarIdentifier:.gregorian)!
+            let d1 = DateComponents(calendar: greg,
+                                    year: 2016, month: 1, day: 1, hour: 0).date!
+            let d2 = DateComponents(calendar: greg,
+                                    year: 2016, month: 8, day: 10, hour: 15).date!
+            let di = DateInterval(start: d1, end: d2)
+            if di.contains(Date()) { // are we currently between those two dates?
+                print("yep")
+            }
+        }
+        
         do {
             let df = DateFormatter()
             let format = DateFormatter.dateFormat(
                 fromTemplate:"dMMMMyyyyhmmaz", options:0,
-                locale:Locale.current())
+                locale:Locale.current)
             df.dateFormat = format
             let s = df.string(from: Date()) // just now
             print(s)
@@ -187,6 +202,19 @@ class ViewController: UIViewController {
             ud.set(cdata, forKey: "myColor")
         }
         
+        do {
+            let m1 = Measurement(value:5, unit: UnitLength.miles)
+            let m2 = Measurement(value:6, unit: UnitLength.kilometers)
+            let total = m1 + m2
+            print(total)
+            let totalFeet = total.converted(to: .feet).value // 46084.9737532808
+            print(totalFeet)
+            let total2 = Measurement<Unit>(value:total.value, unit:total.unit)
+            let mf = MeasurementFormatter()
+            let s = mf.string(from:total2) // "8.728 mi"
+            print(s)
+        }
+        
         do {
             let n1 = NSNumber(value:1)
             let n2 = NSNumber(value:2)
@@ -211,10 +239,11 @@ class ViewController: UIViewController {
         }
         
         do {
-            let arr = ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"]
+            let arr = ["zero", "one", "two", "three", "four", "five",
+                       "six", "seven", "eight", "nine", "ten"]
             var ixs = IndexSet()
-            ixs.insert(integersIn: 1..<5)
-            ixs.insert(integersIn: 8..<11)
+            ixs.insert(integersIn: Range(1...4))
+            ixs.insert(integersIn: Range(8...10))
             let arr2 = (arr as NSArray).objects(at:ixs)
             print(arr2)
         }
@@ -230,7 +259,7 @@ class ViewController: UIViewController {
             // filed a bug: "ambiguous" without the []
             
             let ems = pep.objects(
-                at: pep.indexesOfObjects([]) {
+                at: pep.indexesOfObjects(options:[]) {
                     (obj, idx, stop) -> Bool in
                     return (obj as! NSString).range(
                         of: "m", options:.caseInsensitive
diff --git a/bk2ch04p134springing/ch17p486springing/ViewController.swift b/bk2ch04p134springing/ch17p486springing/ViewController.swift
@@ -19,7 +19,8 @@ class ViewController : UIViewController {
             // new in iOS 9, springing is exposed at layer level
             CATransaction.setDisableActions(true)
             self.v.layer.position.y += 100
-            let anim = CASpringAnimation(keyPath: "position")
+            // note to self, need to use #keyPath throughout
+            let anim = CASpringAnimation(keyPath: #keyPath(CALayer.position))
             anim.damping = 0.7
             anim.initialVelocity = 20
             anim.mass = 0.04
diff --git a/bk2ch10p507tabStops/TextTabTest/ViewController.swift b/bk2ch10p507tabStops/TextTabTest/ViewController.swift
@@ -44,7 +44,7 @@ class ViewController : UIViewController {
             NSFontAttributeName:UIFont(name:"GillSans", size:15)!,
             NSParagraphStyleAttributeName:lend {
                 (p:NSMutableParagraphStyle) in
-                let terms = NSTextTab.columnTerminators(for:Locale.current())
+                let terms = NSTextTab.columnTerminators(for:Locale.current)
                 let tab = NSTextTab(textAlignment:.right, location:170, options:[NSTabColumnTerminatorsAttributeName:terms])
                 var which : Int { return 2 }
                 switch which {
diff --git a/bk2ch11p552webkit/ch24p825webview/WebViewController.swift b/bk2ch11p552webkit/ch24p825webview/WebViewController.swift
@@ -171,9 +171,9 @@ class WebViewController: UIViewController, WKNavigationDelegate, WKScriptMessage
             act.centerYAnchor.constraint(equalTo:wv.centerYAnchor)
             ])
         // webkit uses KVO
-        wv.addObserver(self, forKeyPath: "loading", options: .new, context: nil)
+        wv.addObserver(self, forKeyPath: #keyPath(WKWebView.loading), options: .new, context: nil)
         // cool feature, show title
-        wv.addObserver(self, forKeyPath: "title", options: .new, context: nil)
+        wv.addObserver(self, forKeyPath: #keyPath(WKWebView.title), options: .new, context: nil)
         
     }
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
@@ -334,8 +334,8 @@ class WebViewController: UIViewController, WKNavigationDelegate, WKScriptMessage
     deinit {
         print("dealloc")
         // using KVO, always tear down, take no chances
-        self.wv.removeObserver(self, forKeyPath: "loading")
-        self.wv.removeObserver(self, forKeyPath: "title")
+        self.wv.removeObserver(self, forKeyPath: #keyPath(WKWebView.loading))
+        self.wv.removeObserver(self, forKeyPath: #keyPath(WKWebView.title))
         // with webkit, probably no need for this, but no harm done
         self.wv.stopLoading()
         // break all retains
diff --git a/bk2ch11p553webkit2/ch24p825webview/WebViewController.swift b/bk2ch11p553webkit2/ch24p825webview/WebViewController.swift
@@ -77,9 +77,9 @@ class WebViewController: UIViewController, UIViewControllerRestoration {
             act.centerYAnchor.constraint(equalTo:wv.centerYAnchor)
             ])
         // webkit uses KVO
-        wv.addObserver(self, forKeyPath: "loading", options: .new, context: nil)
+        wv.addObserver(self, forKeyPath: #keyPath(WKWebView.loading), options: .new, context: nil)
         // cool feature, show title
-        wv.addObserver(self, forKeyPath: "title", options: .new, context: nil)
+        wv.addObserver(self, forKeyPath: #keyPath(WKWebView.title), options: .new, context: nil)
         
         wv.navigationDelegate = self
         
@@ -126,8 +126,8 @@ class WebViewController: UIViewController, UIViewControllerRestoration {
     deinit {
         print("dealloc")
         // using KVO, always tear down, take no chances
-        self.wv.removeObserver(self, forKeyPath: "loading")
-        self.wv.removeObserver(self, forKeyPath: "title")
+        self.wv.removeObserver(self, forKeyPath: #keyPath(WKWebView.loading))
+        self.wv.removeObserver(self, forKeyPath: #keyPath(WKWebView.title))
         // with webkit, probably no need for this, but no harm done
         self.wv.stopLoading()
     }
diff --git a/bk2ch12p567observingNSProgress/ch25p840customThermometer/MyProgressView.swift b/bk2ch12p567observingNSProgress/ch25p840customThermometer/MyProgressView.swift
@@ -11,7 +11,7 @@ class MyProgressView: UIView {
         let ins : CGFloat = 2.0
         let r = self.bounds.insetBy(dx: ins, dy: ins)
         let radius : CGFloat = r.size.height / 2.0
-        let mpi = .pi
+        let mpi = CGFloat.pi
         let path = CGMutablePath()
         path.moveTo(nil, x: r.maxX - radius, y: ins)
         path.addArc(nil,
diff --git a/bk2ch12p567observingNSProgress/ch25p840customThermometer/ViewController.swift b/bk2ch12p567observingNSProgress/ch25p840customThermometer/ViewController.swift
@@ -76,7 +76,7 @@ class ViewController: UIViewController {
         // architecture 3: explicit KVO on an NSProgress, update progress view manually
         
         self.op3 = ProgressingOperation(units:10)
-        self.op3!.progress.addObserver(self, forKeyPath: "fractionCompleted", options: [.new], context: nil)
+        self.op3!.progress.addObserver(self, forKeyPath: #keyPath(Progress.fractionCompleted), options: [.new], context: nil)
         self.op3!.start()
 
     }
diff --git a/bk2ch15p660EmbeddedAVKit/EmbeddedAVKit/ViewController.swift b/bk2ch15p660EmbeddedAVKit/EmbeddedAVKit/ViewController.swift
@@ -104,7 +104,7 @@ class ViewController: UIViewController {
         }
         */
         
-        av.addObserver(self, forKeyPath: "readyForDisplay", options: .new, context:nil)
+        av.addObserver(self, forKeyPath: #keyPath(AVPlayerViewController.isReadyForDisplay), options: .new, context:nil)
         
         return; // just proving you can swap out the player
         delay(3) {
@@ -116,11 +116,17 @@ class ViewController: UIViewController {
     
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?,
         context: UnsafeMutablePointer<()>?) {
-            guard keyPath == "readyForDisplay" else {return}
-            guard let vc = object as? AVPlayerViewController else {return}
-            guard let ok = change?[NSKeyValueChangeKey.newKey] as? Bool else {return}
-            guard ok else {return}
-            vc.removeObserver(self, forKeyPath:"readyForDisplay")
+            guard keyPath == #keyPath(AVPlayerViewController.isReadyForDisplay)
+                else {return}
+            guard let vc = object as? AVPlayerViewController
+                else {return}
+            guard let ok = change?[NSKeyValueChangeKey.newKey] as? Bool
+                else {return}
+            guard ok
+                else {return}
+            vc.removeObserver(
+                self,
+                forKeyPath:#keyPath(AVPlayerViewController.isReadyForDisplay))
             
             DispatchQueue.main.async {
                 self.finishConstructingInterface(vc)
diff --git a/bk2ch15p661EmbeddedAVKit2/EmbeddedAVKit/ViewController.swift b/bk2ch15p661EmbeddedAVKit2/EmbeddedAVKit/ViewController.swift
@@ -89,15 +89,15 @@ class ViewController: UIViewController {
         self.view.addSubview(av.view)
         av.didMove(toParentViewController: self)
         av.addObserver(
-            self, forKeyPath: "readyForDisplay", options: .new, context: nil)
+            self, forKeyPath: #keyPath(AVPlayerViewController.isReadyForDisplay), options: .new, context: nil)
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
-            guard keyPath == "readyForDisplay" else {return}
+            guard keyPath == #keyPath(AVPlayerViewController.isReadyForDisplay) else {return}
             guard let vc = object as? AVPlayerViewController else {return}
             guard let ok = change?[NSKeyValueChangeKey.newKey] as? Bool else {return}
             guard ok else {return}
-            vc.removeObserver(self, forKeyPath:"readyForDisplay")
+            vc.removeObserver(self, forKeyPath:#keyPath(AVPlayerViewController.isReadyForDisplay))
             DispatchQueue.main.async {
                 self.finishConstructingInterface(vc)
             }
diff --git a/bk2ch15p672AVKitComposition/ch28p939playerLayer/ViewController.swift b/bk2ch15p672AVKitComposition/ch28p939playerLayer/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController {
         let asset = AVURLAsset(url:m)
         let item = AVPlayerItem(asset:asset)
         let p = AVPlayer(playerItem:item)
-        p.addObserver(self, forKeyPath:"status", context:nil)
+        p.addObserver(self, forKeyPath:#keyPath(AVPlayer.status), context:nil)
         let vc = AVPlayerViewController()
         vc.player = p
         vc.view.frame = CGRect(10,10,300,200)
@@ -50,7 +50,7 @@ class ViewController: UIViewController {
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
-        if keyPath == "status" {
+        if keyPath == #keyPath(AVPlayer.status) {
             DispatchQueue.main.async {
                 self.finishConstructingInterface()
             }
@@ -63,7 +63,7 @@ class ViewController: UIViewController {
         if p.status != .readyToPlay {
             return
         }
-        p.removeObserver(self, forKeyPath:"status")
+        p.removeObserver(self, forKeyPath:#keyPath(AVPlayer.status))
         vc.view.isHidden = false
         
         // absolutely no reason why we shouldn't have a synch layer if we want one
@@ -150,7 +150,7 @@ class ViewController: UIViewController {
         
         // note this cool trick! the status won't change, so to trigger a KVO notification,
         // ...we supply the .Initial option
-        p.addObserver(self, forKeyPath:"status", options:.initial, context:nil)
+        p.addObserver(self, forKeyPath:#keyPath(AVPlayer.status), options:.initial, context:nil)
         p.replaceCurrentItem(with: item)
         (sender as! UIControl).isEnabled = false
     }
diff --git a/bk2ch15p672playerLayer/ch28p939playerLayer/ViewController.swift b/bk2ch15p672playerLayer/ch28p939playerLayer/ViewController.swift
@@ -56,12 +56,12 @@ class ViewController: UIViewController {
             self.picButton.isHidden = true
         }
         
-        lay.addObserver(self, forKeyPath:"readyForDisplay", context:nil)
+        lay.addObserver(self, forKeyPath:#keyPath(AVPlayerLayer.isReadyForDisplay), context:nil)
         
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
-        if keyPath == "readyForDisplay" {
+        if keyPath == #keyPath(AVPlayerLayer.isReadyForDisplay) {
             DispatchQueue.main.async {
                 self.finishConstructingInterface()
             }
@@ -73,7 +73,7 @@ class ViewController: UIViewController {
             return
         }
         
-        self.playerLayer.removeObserver(self, forKeyPath:"readyForDisplay")
+        self.playerLayer.removeObserver(self, forKeyPath:#keyPath(AVPlayerLayer.isReadyForDisplay))
         
         if self.playerLayer.superlayer == nil {
             self.view.layer.addSublayer(self.playerLayer)
diff --git a/bk2ch16p687AVQueuePlayer/ch29p952AVQueuePlayer/ViewController.swift b/bk2ch16p687AVQueuePlayer/ch29p952AVQueuePlayer/ViewController.swift
@@ -159,7 +159,7 @@ class ViewController: UIViewController {
             let url = $0.assetURL!
             let asset = AVAsset(url:url)
             return AVPlayerItem(
-                asset: asset, automaticallyLoadedAssetKeys: ["duration"])
+                asset: asset, automaticallyLoadedAssetKeys: [#keyPath(AVAsset.duration)])
             // duration needed later; this way, queue player will load it for us up front
         }
         
@@ -175,7 +175,7 @@ class ViewController: UIViewController {
         self.items = Array(self.items.suffix(from:seed))
         
         // use .Initial option so that we get an observation for the first item
-        self.qp.addObserver(self, forKeyPath:"currentItem", options:.initial, context:nil)
+        self.qp.addObserver(self, forKeyPath:#keyPath(AVQueuePlayer.currentItem), options:.initial, context:nil)
         self.qp.play()
         self.curplayer = self.qp
         
@@ -186,7 +186,7 @@ class ViewController: UIViewController {
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
-        if keyPath == "currentItem" {
+        if keyPath == #keyPath(AVQueuePlayer.currentItem) {
             self.changed()
         }
     }
@@ -199,9 +199,10 @@ class ViewController: UIViewController {
             withKey:AVMetadataCommonKeyTitle,
             keySpace:AVMetadataKeySpaceCommon)
         let met = arr[0]
-        met.loadValuesAsynchronously(forKeys:["value"]) {
+        let valueKey = #keyPath(AVMetadataItem.value)
+        met.loadValuesAsynchronously(forKeys:[valueKey]) {
             // should always check for successful load of value
-            if met.statusOfValue(forKey:"value", error: nil) == .loaded {
+            if met.statusOfValue(forKey:valueKey, error: nil) == .loaded {
                 // can't be sure what thread we're on ...
                 // ...or whether we'll be called back synchronously or asynchronously
                 // so I like to step out to the main thread just in case
@@ -222,7 +223,7 @@ class ViewController: UIViewController {
     func timerFired(time:CMTime) {
         if let item = self.qp.currentItem {
             let asset = item.asset
-            if asset.statusOfValue(forKey:"duration", error: nil) == .loaded {
+            if asset.statusOfValue(forKey:#keyPath(AVAsset.duration), error: nil) == .loaded {
                 let dur = asset.duration
                 self.prog.setProgress(Float(time.seconds/dur.seconds), animated: false)
                 self.prog.isHidden = false

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class ViewController: UIViewController {`
`76`	`76`	`// architecture 3: explicit KVO on an NSProgress, update progress view manually`
`77`	`77`
`78`	`78`	`self.op3 = ProgressingOperation(units:10)`
`79`		`- self.op3!.progress.addObserver(self, forKeyPath: "fractionCompleted", options: [.new], context: nil)`
	`79`	`+ self.op3!.progress.addObserver(self, forKeyPath: #keyPath(Progress.fractionCompleted), options: [.new], context: nil)`
`80`	`80`	`self.op3!.start()`
`81`	`81`
`82`	`82`	`}`