mild chapter 10 tweaks

Author: mattneub

bk2ch10p498fontDescriptor/ch23p670font1dynamicType/ViewController.swift

@@ -38,6 +38,7 @@ class ViewController : UIViewController {
         let emphasis = body.withSymbolicTraits(.traitItalic)!
         var fbody = UIFont(descriptor: body, size: 0)
         // work around lack of dynamism; this should not be necessary
+        // bug still there in beta 6
         fbody = UIFontMetrics(forTextStyle: .body).scaledFont(for: fbody)
         var femphasis = UIFont(descriptor: emphasis, size: 0)
         // work around lack of dynamism; this should not be necessary

bk2ch10p508AttributedTextAsSecretMarking/AttributedTextAsSecretMarking/ViewController.swift

@@ -2,7 +2,7 @@
 import UIKit
 
 extension NSAttributedString.Key {
-    static let myDate = NSAttributedString.Key("myDate")
+    static let date = NSAttributedString.Key("date")
 }
 
 class ViewController: UIViewController {
@@ -18,12 +18,11 @@ class ViewController: UIViewController {
         let mas = NSMutableAttributedString(attributedString:self.lab.attributedText!)
         let r = (mas.string as NSString).range(of:"^0")
         if r.length > 0 {
-            mas.addAttribute(.myDate, value: 1, range: r)
+            mas.addAttribute(.date, value: 1, range: r)
             mas.replaceCharacters(in:r, with: Date().description)
         } else {
-            mas.enumerateAttribute(.myDate, in: NSMakeRange(0, mas.length)) {
-                value, r, stop in
-                if let value = value as? Int, value == 1 {
+            mas.enumerateAttribute(.date, in: NSMakeRange(0, mas.length)) { val, r, stop in
+                if val as? Int == 1 {
                     mas.replaceCharacters(in:r, with: Date().description)
                     stop.pointee = true
                 }

bk2ch10p519TextFieldLeftViewTest/TextFieldLeftViewTest/ViewController.swift

@@ -37,7 +37,7 @@ class ViewController: UIViewController {
 
         tf.borderStyle = .none
         // tf.borderStyle = .bezel
-        // tf.borderStyle = .line
+         tf.borderStyle = .line
         // tf.borderStyle = .roundedRect
         tf.background = UIImage(named:"yellowsilk4")
 

bk2ch10p532textViewAndKeyboard/ch23p811selfSizingTextField/ViewController.swift

@@ -9,12 +9,13 @@ func lend<T> (closure:(T)->()) -> T where T:NSObject {
 
 class ViewController: UIViewController, UITextViewDelegate {
     @IBOutlet var tv : UITextView!
-    var scrollView : UIScrollView! {
+    var sv : UIScrollView! {
         return self.tv
     }
     var oldContentInset = UIEdgeInsets.zero
     var oldIndicatorInset = UIEdgeInsets.zero
     var oldOffset = CGPoint.zero
+    var prevr = CGRect.zero
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -72,42 +73,48 @@ class ViewController: UIViewController, UITextViewDelegate {
                 ks = .exiting
             }
         }
+        print(ks == .entering ? "entering" : ks == .exiting ? "exiting" : "unknown")
         return (ks, newRect)
     }
-    
-    #error("needs updating")
+
     @objc func keyboardShow(_ n:Notification) {
+        print("show")
+        guard self.traitCollection.userInterfaceIdiom == .phone else {return}
         let d = n.userInfo!
-        let (state, rnew) = keyboardState(for:d, in:self.scrollView)
+        let (state, rnew) = keyboardState(for:d, in:self.sv)
         if state == .entering {
             print("really showing")
-            self.oldContentInset = self.scrollView.contentInset
-            self.oldIndicatorInset = self.scrollView.scrollIndicatorInsets
-            self.oldOffset = self.scrollView.contentOffset
+            self.oldContentInset = self.sv.contentInset
+            self.oldIndicatorInset = self.sv.verticalScrollIndicatorInsets
+            self.oldOffset = self.sv.contentOffset
         }
-        print("show")
         // no need to scroll, as the scroll view will do it for us
         // so all we have to do is adjust the inset
-        if let rnew = rnew {
-            let h = rnew.intersection(self.scrollView.bounds).height
-            self.scrollView.contentInset.bottom = h
-            self.scrollView.scrollIndicatorInsets.bottom = h
+        if let rnew = rnew, rnew != self.prevr {
+            print("adjusting")
+            self.prevr = rnew
+            let h = rnew.intersection(self.sv.bounds).height + 6 // ?
+            self.sv.contentInset.bottom = h
+            self.sv.verticalScrollIndicatorInsets.bottom = h
         }
     }
 
     @objc func keyboardHide(_ n:Notification) {
+        print("hide")
+        guard self.traitCollection.userInterfaceIdiom == .phone else {return}
         let d = n.userInfo!
-        let (state, _) = keyboardState(for:d, in:self.scrollView)
+        let (state, _) = keyboardState(for:d, in:self.sv)
         if state == .exiting {
             print("really hiding")
             // restore original setup
-            // we _don't_ do this; let the text view position itself
-            // self.scrollView.contentOffset = self.oldOffset
-            self.scrollView.scrollIndicatorInsets = self.oldIndicatorInset
-            self.scrollView.contentInset = self.oldContentInset
+            self.sv.contentOffset = self.oldOffset
+            self.sv.verticalScrollIndicatorInsets = self.oldIndicatorInset
+            self.sv.contentInset = self.oldContentInset
+            self.prevr = .zero
         }
     }
 
+
 
 
     @objc func doDone(_ sender: Any) {