minor formatting

mattneub · Aug 19, 2015 · 14289e9 · 14289e9
1 parent db8a01a
commit 14289e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/bk2ch07p360scrollViewInCode/ch20p570scrollViewInCode/Base.lproj/Main.storyboard b/bk2ch07p360scrollViewInCode/ch20p570scrollViewInCode/Base.lproj/Main.storyboard
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6185.7" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8173.3" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6181.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8142"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="ufC-wZ-h7g">
             <objects>
                 <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="ch20p670scrollViewInCode" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="3OY-Nv-yQA"/>
+                        <viewControllerLayoutGuide type="bottom" id="Xob-Ey-UwB"/>
+                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -18,12 +22,4 @@
             </objects>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4">
-            <size key="portraitSize" width="320" height="568"/>
-            <size key="landscapeSize" width="568" height="320"/>
-        </simulatedScreenMetrics>
-    </simulatedMetricsContainer>
 </document>
diff --git a/bk2ch07p363scrollViewInCode3/ch20p670scrollViewInCode3/ViewController.swift b/bk2ch07p363scrollViewInCode3/ch20p670scrollViewInCode3/ViewController.swift
@@ -126,16 +126,15 @@ class ViewController : UIViewController {
                     views:["lab":previousLab!]))
 
 
-            // set content view width and frame-to-superview constraints
-            // (height comes from subview constraints)
+            // pin content view to scroll view, sized by its subview constraints
             // content size is calculated for us
             v.translatesAutoresizingMaskIntoConstraints = false
             con.extend(
                 NSLayoutConstraint.constraintsWithVisualFormat("V:|[v]|",
                     options:[], metrics:nil, views:["v":v])) // *
             con.extend(
                 NSLayoutConstraint.constraintsWithVisualFormat("H:|[v]|",
-                    options:[], metrics:nil, views:["v":v]))
+                    options:[], metrics:nil, views:["v":v])) // *
             NSLayoutConstraint.activateConstraints(con)
 
 

diff --git a/bk2ch07p384dragInScrollView2/ch20p688dragInScrollView/ViewController.swift b/bk2ch07p384dragInScrollView2/ch20p688dragInScrollView/ViewController.swift
@@ -56,7 +56,6 @@ class ViewController : UIViewController, UIGestureRecognizerDelegate {
             // thanks for the flag, now stop operating altogether
             g.enabled = false
             })
-
     }
 
     @IBAction func dragging (p : UIPanGestureRecognizer) {