Xcode7 swift2.0

gaowanli · Oct 25, 2015 · 3343ab2 · 3343ab2
1 parent 27c3153
commit 3343ab2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...deproj/project.xcworkspace/xcuserdata/gaowanli.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/gaowanli.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/WaterfallFlow/Base.lproj/Main.storyboard b/WaterfallFlow/Base.lproj/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="t9k-PN-QK2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="t9k-PN-QK2">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -12,6 +13,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Boa-hP-YK0">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -29,6 +31,7 @@
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="agY-YL-nZR">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="mJI-uB-KYn" customClass="WaterfallFlowLayout" customModule="WaterfallFlow" customModuleProvider="target">
                             <size key="itemSize" width="168" height="197"/>
                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -37,14 +40,15 @@
                         </collectionViewFlowLayout>
                         <cells>
                             <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="waterfallflowCell" id="9bj-Mx-2Lh" customClass="Cell" customModule="WaterfallFlow" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                <rect key="frame" x="0.0" y="64" width="168" height="197"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                     <rect key="frame" x="0.0" y="0.0" width="168" height="197"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lDL-y1-ZBl">
                                             <rect key="frame" x="63" y="88" width="42" height="21"/>
+                                            <animations/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="20" id="iLg-BZ-sdm"/>
                                                 <constraint firstAttribute="height" constant="21" id="iyn-Vb-jwa"/>
@@ -54,8 +58,10 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
+                                    <animations/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
+                                <animations/>
                                 <constraints>
                                     <constraint firstAttribute="centerX" secondItem="lDL-y1-ZBl" secondAttribute="centerX" id="3Bc-W7-GRC"/>
                                     <constraint firstAttribute="centerY" secondItem="lDL-y1-ZBl" secondAttribute="centerY" id="XZE-8W-b6T"/>

diff --git a/WaterfallFlow/CollectionViewController.swift b/WaterfallFlow/CollectionViewController.swift
@@ -28,8 +28,6 @@ class CollectionViewController: UICollectionViewController {
 
         self.layout.dataSource = dataSource
         self.layout.rowItemNum = 3
-        self.collectionView?.contentSize = CGSizeMake(0, 10000)
-        self.collectionView?.reloadData()
     }
 
     // MARK: UICollectionViewDataSource