update for 6.1

mattneub · mattneub · commit 01acee8edc67 · 2014-10-01T09:20:34.000-07:00
diff --git a/bk2ch01p038evenDistribution/EvenDistribution/Base.lproj/Main.storyboard b/bk2ch01p038evenDistribution/EvenDistribution/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6249" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6243"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
diff --git a/bk2ch01p039conditionalConstraints/bk2ch01p039/Main.storyboard b/bk2ch01p039conditionalConstraints/bk2ch01p039/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="VVW-Se-F96">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6249" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="VVW-Se-F96">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6243"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
diff --git a/bk2ch01p040sizeClasses/bk2ch01p040sizeClasses/MyView.swift b/bk2ch01p040sizeClasses/bk2ch01p040sizeClasses/MyView.swift
@@ -103,7 +103,7 @@ class MyView: UIView {
         super.updateConstraints()
     }
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         println("did change")
         self.setNeedsUpdateConstraints()
     }
diff --git a/bk2ch01p040sizeClasses/bk2ch01p040sizeClasses/ViewController.swift b/bk2ch01p040sizeClasses/bk2ch01p040sizeClasses/ViewController.swift
@@ -8,8 +8,7 @@ class ViewController: UIViewController {
     @IBOutlet weak var con2: NSLayoutConstraint!
 
     
-    
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         println("vc did change")
         let tc = self.traitCollection
         if tc.horizontalSizeClass == .Regular {
diff --git a/bk2ch01p041constraintSwapping2/ConstraintSwapping/ViewController.swift b/bk2ch01p041constraintSwapping2/ConstraintSwapping/ViewController.swift
@@ -64,9 +64,8 @@ class ViewController: UIViewController {
         }
     }
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
-        // foo because Apple has not marked previousTraitCollection as nil even though it can be
-        let prev : UITraitCollection? = previousTraitCollection
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
+        let prev = previousTraitCollection
         let tc = self.traitCollection
         if prev == nil && tc.verticalSizeClass == .Compact {
             self.doSwap()
diff --git a/bk2ch01p045constraintsOrderOfEvents/ch14p398constraintsOrderOfEvents/MyView.swift b/bk2ch01p045constraintsOrderOfEvents/ch14p398constraintsOrderOfEvents/MyView.swift
@@ -42,7 +42,7 @@ class MyView: UIView, Printable {
         println("\(self)\n\(__FUNCTION__)\n")
     }
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         // super.traitCollectionDidChange(previousTraitCollection)
         println("\(self)\n\(__FUNCTION__)\n")
 //        let prev : UITraitCollection? = previousTraitCollection
diff --git a/bk2ch02p051ImageAndTraitCollection/ImageAndTraitCollection/MyView.swift b/bk2ch02p051ImageAndTraitCollection/ImageAndTraitCollection/MyView.swift
@@ -6,7 +6,7 @@ class MyView: UIView {
     
     var image : UIImage!
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         if self.traitCollection != previousTraitCollection {
             self.setNeedsDisplay()
         }
diff --git a/bk2ch06p258launchIntoRotationEvents/bk2ch06p258launchIntoRotationEvents/ViewController.swift b/bk2ch06p258launchIntoRotationEvents/bk2ch06p258launchIntoRotationEvents/ViewController.swift
@@ -64,7 +64,7 @@ class ViewController: UIViewController, UINavigationControllerDelegate {
         super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
     }
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         println("trait collection did change")
     }
 
diff --git a/bk2ch06p332eventIncoherencies/LayoutEventTest/ViewControllers.swift b/bk2ch06p332eventIncoherencies/LayoutEventTest/ViewControllers.swift
@@ -43,7 +43,7 @@ class Base : UIViewController {
         super.willTransitionToTraitCollection(newCollection, withTransitionCoordinator: coordinator)
         println("\(self) \(__FUNCTION__)")
     }
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         println("\(self) \(__FUNCTION__)")
     }
 }
diff --git a/bk2ch08p403addCellSubviewsInCode/ch21p702overrideCellLayout/RootViewController.swift b/bk2ch08p403addCellSubviewsInCode/ch21p702overrideCellLayout/RootViewController.swift
@@ -78,6 +78,9 @@ class RootViewController : UITableViewController {
         iv.image = im2
         iv.contentMode = .Center
         
+//        let s = NSStringFromUIEdgeInsets(cell.separatorInset)
+//        println(s)
+        
         return cell
     }
     
diff --git a/bk2ch08p403addCellSubviewsInCode/ch21p704addCellSubviewsInCode.xcodeproj/project.pbxproj b/bk2ch08p403addCellSubviewsInCode/ch21p704addCellSubviewsInCode.xcodeproj/project.pbxproj
@@ -248,6 +248,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "ch21p702overrideCellLayout/ch21p704addCellSubviewsInCode-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = ch21p704addCellSubviewsInCode;
@@ -266,6 +267,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "ch21p702overrideCellLayout/ch21p704addCellSubviewsInCode-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = ch21p704addCellSubviewsInCode;
diff --git a/bk2ch08p412SimplestDataSource/SimplestDataSource/Base.lproj/Main.storyboard b/bk2ch08p412SimplestDataSource/SimplestDataSource/Base.lproj/Main.storyboard
@@ -7,25 +7,26 @@
         <!--Root View Controller-->
         <scene sceneID="plh-fV-Twr">
             <objects>
-                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="sDu-Wi-YWc" customClass="RootViewController" customModule="SimplestDataSource" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="sDu-Wi-YWc" customClass="RootViewController" customModule="Refresh" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="flq-Sh-39t">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="536"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="ZSD-FC-hYa" style="IBUITableViewCellStyleDefault" id="C6D-tj-8Du">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="Uit-kA-Iss" style="IBUITableViewCellStyleDefault" id="C6D-tj-8Du">
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C6D-tj-8Du" id="vvz-yg-TL7">
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZSD-FC-hYa">
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Uit-kA-Iss">
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                 </tableViewCellContentView>
+                                <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                             </tableViewCell>
                         </prototypes>
                         <connections>
diff --git a/bk2ch08p467collectionViewLayoutFromScratchSwift/ch21p748collectionViewFlowLayout2/MyLayout.swift b/bk2ch08p467collectionViewLayoutFromScratchSwift/ch21p748collectionViewFlowLayout2/MyLayout.swift
@@ -9,13 +9,13 @@ class MyLayout : UICollectionViewLayout {
     // absolute rock-bottom layout from scratch, shows minimal responsibilities
     
     override func prepareLayout() {
-//        println("prepare")
+        //        println("prepare")
         let sections = self.collectionView!.numberOfSections()
         
         // how many items are there in total?
         let total = Array(0 ..< sections).map {
             self.collectionView!.numberOfItemsInSection($0)
-        }.reduce(0, combine:+)
+            }.reduce(0, combine:+)
         
         // work out cell size based on bounds size
         let sz = self.collectionView!.bounds.size
@@ -30,13 +30,12 @@ class MyLayout : UICollectionViewLayout {
         for i in 0 ..< sections {
             let jj = self.collectionView!.numberOfItemsInSection(i)
             for j in 0 ..< jj {
-                let att =
-                UICollectionViewLayoutAttributes(forCellWithIndexPath:
-                        NSIndexPath(forItem:j,
-                        inSection:i))
+                let att = UICollectionViewLayoutAttributes(
+                    forCellWithIndexPath:
+                    NSIndexPath(forItem:j, inSection:i))
                 att.frame = CGRectMake(CGFloat(x)*cellside,CGFloat(y)*cellside,cellside,cellside)
                 atts += [att]
-                x++;
+                x++
                 if CGFloat(x) >= shortside {
                     x = 0
                     y++
@@ -49,18 +48,18 @@ class MyLayout : UICollectionViewLayout {
     }
     
     override func collectionViewContentSize() -> CGSize {
-//        println("size")
+        //        println("size")
         return self.sz
     }
     
     override func shouldInvalidateLayoutForBoundsChange(newBounds: CGRect) -> Bool {
         let ok = newBounds.size.width != self.sz.width
-//        println("should \(ok)")
+        //        println("should \(ok)")
         return ok
     }
     
     override func layoutAttributesForItemAtIndexPath(indexPath: NSIndexPath) -> UICollectionViewLayoutAttributes! {
-//        println("atts")
+        //        println("atts")
         for att in self.atts {
             if att.indexPath == indexPath {
                 return att
@@ -69,8 +68,8 @@ class MyLayout : UICollectionViewLayout {
         return nil // shouldn't happen
     }
     
-    override func layoutAttributesForElementsInRect(rect: CGRect) -> [AnyObject] {
-//        println("rect")
+    override func layoutAttributesForElementsInRect(rect: CGRect) -> [AnyObject]? {
+        //        println("rect")
         return self.atts
     }
 }
diff --git a/bk2ch10p513selfSizingLabel2/ch23p775selfSizingLabel2/MyLabel.swift b/bk2ch10p513selfSizingLabel2/ch23p775selfSizingLabel2/MyLabel.swift
@@ -23,7 +23,7 @@ class MyLabel : UILabel {
     // where rotation does not change traits,
     // and it wouldn't work if our size changed for some other reason
     
-    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
         println("trait")
         delay(0.0) {
             self.preferredMaxLayoutWidth = self.bounds.width

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ class MyView: UIView {`
`103`	`103`	`super.updateConstraints()`
`104`	`104`	`}`
`105`	`105`
`106`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
	`106`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
`107`	`107`	`println("did change")`
`108`	`108`	`self.setNeedsUpdateConstraints()`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,8 @@ class ViewController: UIViewController {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
`68`		`- // foo because Apple has not marked previousTraitCollection as nil even though it can be`
`69`		`- let prev : UITraitCollection? = previousTraitCollection`
	`67`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
	`68`	`+ let prev = previousTraitCollection`
`70`	`69`	`let tc = self.traitCollection`
`71`	`70`	`if prev == nil && tc.verticalSizeClass == .Compact {`
`72`	`71`	`self.doSwap()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class MyView: UIView, Printable {`
`42`	`42`	`println("\(self)\n\(__FUNCTION__)\n")`
`43`	`43`	`}`
`44`	`44`
`45`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
	`45`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
`46`	`46`	`// super.traitCollectionDidChange(previousTraitCollection)`
`47`	`47`	`println("\(self)\n\(__FUNCTION__)\n")`
`48`	`48`	`// let prev : UITraitCollection? = previousTraitCollection`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class MyView: UIView {`
`6`	`6`
`7`	`7`	`var image : UIImage!`
`8`	`8`
`9`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
	`9`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
`10`	`10`	`if self.traitCollection != previousTraitCollection {`
`11`	`11`	`self.setNeedsDisplay()`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class ViewController: UIViewController, UINavigationControllerDelegate {`
`64`	`64`	`super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)`
`65`	`65`	`}`
`66`	`66`
`67`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
	`67`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
`68`	`68`	`println("trait collection did change")`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class Base : UIViewController {`
`43`	`43`	`super.willTransitionToTraitCollection(newCollection, withTransitionCoordinator: coordinator)`
`44`	`44`	`println("\(self) \(__FUNCTION__)")`
`45`	`45`	`}`
`46`		`- override func traitCollectionDidChange(previousTraitCollection: UITraitCollection) {`
	`46`	`+ override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {`
`47`	`47`	`println("\(self) \(__FUNCTION__)")`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ class RootViewController : UITableViewController {`
`78`	`78`	`iv.image = im2`
`79`	`79`	`iv.contentMode = .Center`
`80`	`80`
	`81`	`+// let s = NSStringFromUIEdgeInsets(cell.separatorInset)`
	`82`	`+// println(s)`
	`83`	`+`
`81`	`84`	`return cell`
`82`	`85`	`}`
`83`	`86`