From e996c2b1888c429557b159f82866c5c34cb73e27 Mon Sep 17 00:00:00 2001
From: David Caunt <dcaunt@gmail.com>
Date: Wed, 27 Jul 2016 01:25:33 +0100
Subject: [PATCH 1/3] Add example with mixed cell types (#58). close #57

* Add example with mixed cell types
---
 Example/Example.xcodeproj/project.pbxproj     |  16 +++
 Example/Sources/Base.lproj/Main.storyboard    |  77 ++++++++++---
 Example/Sources/ComposedCellViewFactory.swift |  58 ++++++++++
 Example/Sources/FancyCollectionViewCell.swift |  31 ++++++
 Example/Sources/FancyCollectionViewCell.xib   |  40 +++++++
 Example/Sources/Helpers.swift                 |   2 +-
 .../MixedCollectionViewController.swift       | 101 ++++++++++++++++++
 7 files changed, 308 insertions(+), 17 deletions(-)
 create mode 100644 Example/Sources/ComposedCellViewFactory.swift
 create mode 100644 Example/Sources/FancyCollectionViewCell.swift
 create mode 100644 Example/Sources/FancyCollectionViewCell.xib
 create mode 100644 Example/Sources/MixedCollectionViewController.swift

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index 181f0ba..e80ff65 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -29,6 +29,10 @@
 		88AD28A71D1F97BC000492FC /* ExampleModel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88AD28A31D1F97A3000492FC /* ExampleModel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		88DCAD911CB87E6700C018AF /* JSQDataSourcesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88DCAD8E1CB87DD900C018AF /* JSQDataSourcesKit.framework */; };
 		88DCAD921CB87E6700C018AF /* JSQDataSourcesKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88DCAD8E1CB87DD900C018AF /* JSQDataSourcesKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BF21124D1D46663600F1840A /* ComposedCellViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */; };
+		BF5C03641D3FED6700CA3EA3 /* FancyCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */; };
+		BF5C03691D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */; };
+		BF6AEBD11D3E91A40048AE97 /* MixedCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -139,6 +143,10 @@
 		88AD289D1D1F97A3000492FC /* ExampleModel.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ExampleModel.xcodeproj; path = ExampleModel/ExampleModel.xcodeproj; sourceTree = "<group>"; };
 		88DB89C11A86D1A900DED153 /* DataSources.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DataSources.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		88DCAD881CB87DD900C018AF /* JSQDataSourcesKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = JSQDataSourcesKit.xcodeproj; path = ../JSQDataSourcesKit.xcodeproj; sourceTree = "<group>"; };
+		BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposedCellViewFactory.swift; sourceTree = "<group>"; };
+		BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FancyCollectionViewCell.xib; sourceTree = "<group>"; };
+		BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FancyCollectionViewCell.swift; sourceTree = "<group>"; };
+		BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MixedCollectionViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -195,8 +203,11 @@
 				886EC79F1CFF2E5E00BDE6FA /* CollectionViewCell.swift */,
 				886EC7A01CFF2E5E00BDE6FA /* CollectionViewCell.xib */,
 				886EC7A11CFF2E5E00BDE6FA /* CollectionViewController.swift */,
+				BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */,
 				886EC7A21CFF2E5E00BDE6FA /* ComposedSupplementaryViewFactory.swift */,
 				886EC7A41CFF2E5E00BDE6FA /* Extensions.swift */,
+				BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */,
+				BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */,
 				886EC7A51CFF2E5E00BDE6FA /* FetchedCollectionViewController.swift */,
 				886EC7A61CFF2E5E00BDE6FA /* FetchedTableViewController.swift */,
 				886EC7A71CFF2E5E00BDE6FA /* Helpers.swift */,
@@ -204,6 +215,7 @@
 				886EC7A91CFF2E5F00BDE6FA /* Info.plist */,
 				886EC79B1CFF2E5E00BDE6FA /* LaunchScreen.xib */,
 				886EC79D1CFF2E5E00BDE6FA /* Main.storyboard */,
+				BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */,
 				886EC7AC1CFF2E5F00BDE6FA /* TableViewController.swift */,
 				886EC7AE1CFF2E5F00BDE6FA /* ViewController.swift */,
 			);
@@ -424,6 +436,7 @@
 				886EC7BB1CFF2E5F00BDE6FA /* Images.xcassets in Resources */,
 				886EC7B11CFF2E5F00BDE6FA /* Main.storyboard in Resources */,
 				886EC7B31CFF2E5F00BDE6FA /* CollectionViewCell.xib in Resources */,
+				BF5C03641D3FED6700CA3EA3 /* FancyCollectionViewCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -457,9 +470,12 @@
 				886EC7B41CFF2E5F00BDE6FA /* CollectionViewController.swift in Sources */,
 				886EC7BA1CFF2E5F00BDE6FA /* Helpers.swift in Sources */,
 				886EC7B81CFF2E5F00BDE6FA /* FetchedCollectionViewController.swift in Sources */,
+				BF21124D1D46663600F1840A /* ComposedCellViewFactory.swift in Sources */,
 				886EC7BE1CFF2E5F00BDE6FA /* TableViewController.swift in Sources */,
 				886EC7C01CFF2E5F00BDE6FA /* ViewController.swift in Sources */,
 				886EC7B21CFF2E5F00BDE6FA /* CollectionViewCell.swift in Sources */,
+				BF5C03691D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift in Sources */,
+				BF6AEBD11D3E91A40048AE97 /* MixedCollectionViewController.swift in Sources */,
 				886EC7AF1CFF2E5F00BDE6FA /* AppDelegate.swift in Sources */,
 				886EC7B51CFF2E5F00BDE6FA /* ComposedSupplementaryViewFactory.swift in Sources */,
 			);
diff --git a/Example/Sources/Base.lproj/Main.storyboard b/Example/Sources/Base.lproj/Main.storyboard
index 303e083..57ab965 100644
--- a/Example/Sources/Base.lproj/Main.storyboard
+++ b/Example/Sources/Base.lproj/Main.storyboard
@@ -65,11 +65,11 @@
                                         <rect key="frame" x="0.0" y="114" width="600" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ksE-8j-kdf" id="joG-ci-GPc">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Table view" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1hM-aR-DRM">
-                                                    <rect key="frame" x="15" y="0.0" width="550" height="59"/>
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="59.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -85,11 +85,11 @@
                                         <rect key="frame" x="0.0" y="174" width="600" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="crB-1p-rsR" id="vmX-bL-Q2r">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Collection view" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v7i-Ph-E7i">
-                                                    <rect key="frame" x="15" y="0.0" width="550" height="59"/>
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="59.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -101,19 +101,39 @@
                                             <segue destination="eDa-Mk-VnF" kind="show" id="fRF-YS-hnA"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="IsS-JI-jZ3" style="IBUITableViewCellStyleDefault" id="laO-RW-ftc">
+                                        <rect key="frame" x="0.0" y="234" width="600" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="laO-RW-ftc" id="9av-Zw-oUI">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Collection view mixed cells" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IsS-JI-jZ3">
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="59.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="IAl-6j-j6Y" kind="show" id="MzD-25-KUh"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                             <tableViewSection headerTitle="Fetched results controller" footerTitle="" id="vME-8p-ZPm">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="bWd-M3-quA" style="IBUITableViewCellStyleDefault" id="30a-ER-GLa">
-                                        <rect key="frame" x="0.0" y="277" width="600" height="60"/>
+                                        <rect key="frame" x="0.0" y="336" width="600" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="30a-ER-GLa" id="9gZ-GX-qBH">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Table view" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bWd-M3-quA">
-                                                    <rect key="frame" x="15" y="0.0" width="550" height="59"/>
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="59.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -126,14 +146,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="gBA-dK-E3a" style="IBUITableViewCellStyleDefault" id="dtY-I9-rWw">
-                                        <rect key="frame" x="0.0" y="337" width="600" height="60"/>
+                                        <rect key="frame" x="0.0" y="396" width="600" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dtY-I9-rWw" id="jtg-em-vKg">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Collection view" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gBA-dK-E3a">
-                                                    <rect key="frame" x="15" y="0.0" width="550" height="59"/>
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="59.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -189,18 +209,18 @@
                                 <rect key="frame" x="0.0" y="114" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RES-Fj-gri" id="Qwy-lK-Xej">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="O66-du-Sj3">
-                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
+                                            <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JNc-Jt-86h">
-                                            <rect key="frame" x="543" y="12" width="42" height="20"/>
+                                            <rect key="frame" x="543.5" y="12" width="41.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
@@ -233,18 +253,18 @@
                                 <rect key="frame" x="0.0" y="114" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="303-8L-lrN" id="SXI-ai-O48">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rby-O5-pxX">
-                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
+                                            <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vxU-8c-7oY">
-                                            <rect key="frame" x="543" y="12" width="42" height="20"/>
+                                            <rect key="frame" x="543.5" y="12" width="41.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -307,5 +327,30 @@
             </objects>
             <point key="canvasLocation" x="1958" y="987"/>
         </scene>
+        <!--Static collection view mixed cells-->
+        <scene sceneID="k6U-ni-zlW">
+            <objects>
+                <collectionViewController title="Static collection view mixed cells" hidesBottomBarWhenPushed="YES" id="IAl-6j-j6Y" customClass="MixedCollectionViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" id="kzJ-rT-iyf">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="JhW-SI-Rdi">
+                            <size key="itemSize" width="100" height="100"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                        <cells/>
+                        <connections>
+                            <outlet property="dataSource" destination="IAl-6j-j6Y" id="i3w-e4-inF"/>
+                            <outlet property="delegate" destination="IAl-6j-j6Y" id="y5K-RV-Usq"/>
+                        </connections>
+                    </collectionView>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="JUn-1T-0mD" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1958" y="-470"/>
+        </scene>
     </scenes>
 </document>
diff --git a/Example/Sources/ComposedCellViewFactory.swift b/Example/Sources/ComposedCellViewFactory.swift
new file mode 100644
index 0000000..712d471
--- /dev/null
+++ b/Example/Sources/ComposedCellViewFactory.swift
@@ -0,0 +1,58 @@
+//
+//  Created by Jesse Squires
+//  http://www.jessesquires.com
+//
+//
+//  Documentation
+//  http://jessesquires.com/JSQDataSourcesKit
+//
+//
+//  GitHub
+//  https://github.com/jessesquires/JSQDataSourcesKit
+//
+//
+//  License
+//  Copyright © 2015 Jesse Squires
+//  Released under an MIT license: http://opensource.org/licenses/MIT
+//
+
+import UIKit
+import JSQDataSourcesKit
+
+/*
+ Example of a composed factory for collection view cells.
+ Used for headers and footers in `MixedCollectionViewController` in the demo
+ */
+struct ComposedCellViewFactory: ReusableViewFactoryProtocol  {
+
+    let standardCellFactory: ViewFactory<CellViewModel, CollectionViewCell>
+
+    let fancyCellFactory: ViewFactory<FancyViewModel, FancyCollectionViewCell>
+
+    init(standardCellFactory: ViewFactory<CellViewModel, CollectionViewCell>,
+            fancyCellFactory: ViewFactory<FancyViewModel, FancyCollectionViewCell>) {
+        self.standardCellFactory = standardCellFactory
+        self.fancyCellFactory = fancyCellFactory
+    }
+
+    func reuseIdentiferFor(item item: MixedItem?, type: ReusableViewType, indexPath: NSIndexPath) -> String {
+        return item!.reuseIdentifier
+    }
+
+    func configure(view view: UICollectionViewCell, item: MixedItem?, type: ReusableViewType, parentView: UICollectionView, indexPath: NSIndexPath) -> UICollectionViewCell {
+        view.accessibilityIdentifier = "\(indexPath.section), \(indexPath.item)"
+
+        guard let model = item else {
+            return view
+        }
+
+        switch model {
+        case let .Standard(standardModel):
+            let cell = view as! CollectionViewCell
+            return standardCellFactory.configure(view: cell, item: standardModel, type: type, parentView: parentView, indexPath: indexPath)
+        case let .Fancy(fancyModel):
+            let cell = view as! FancyCollectionViewCell
+            return fancyCellFactory.configure(view: cell, item: fancyModel, type: type, parentView: parentView, indexPath: indexPath)
+        }
+    }
+}
diff --git a/Example/Sources/FancyCollectionViewCell.swift b/Example/Sources/FancyCollectionViewCell.swift
new file mode 100644
index 0000000..2dc6230
--- /dev/null
+++ b/Example/Sources/FancyCollectionViewCell.swift
@@ -0,0 +1,31 @@
+//
+//  Created by Jesse Squires
+//  http://www.jessesquires.com
+//
+//
+//  Documentation
+//  http://jessesquires.com/JSQDataSourcesKit
+//
+//
+//  GitHub
+//  https://github.com/jessesquires/JSQDataSourcesKit
+//
+//
+//  License
+//  Copyright © 2015 Jesse Squires
+//  Released under an MIT license: http://opensource.org/licenses/MIT
+//
+
+import UIKit
+
+class FancyCollectionViewCell: UICollectionViewCell {
+
+    @IBOutlet weak var label: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        selectedBackgroundView = UIView()
+        selectedBackgroundView?.backgroundColor = .orangeColor()
+        backgroundColor = .greenColor()
+    }
+}
diff --git a/Example/Sources/FancyCollectionViewCell.xib b/Example/Sources/FancyCollectionViewCell.xib
new file mode 100644
index 0000000..b52e6b5
--- /dev/null
+++ b/Example/Sources/FancyCollectionViewCell.xib
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="fancyCell" id="umB-Vc-z0Z" customClass="FancyCollectionViewCell" customModule="Example" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="125" height="125"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="125" height="125"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="neB-XB-c37">
+                        <rect key="frame" x="8" y="8" width="109" height="109"/>
+                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            </view>
+            <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="neB-XB-c37" secondAttribute="trailing" constant="8" id="1QN-JF-PsA"/>
+                <constraint firstAttribute="bottom" secondItem="neB-XB-c37" secondAttribute="bottom" constant="8" id="8Kr-4A-rpC"/>
+                <constraint firstItem="neB-XB-c37" firstAttribute="top" secondItem="umB-Vc-z0Z" secondAttribute="top" constant="8" id="eNC-J0-Gpe"/>
+                <constraint firstItem="neB-XB-c37" firstAttribute="leading" secondItem="umB-Vc-z0Z" secondAttribute="leading" constant="8" id="jEJ-fT-gTl"/>
+            </constraints>
+            <size key="customSize" width="123" height="126"/>
+            <connections>
+                <outlet property="label" destination="neB-XB-c37" id="QEJ-zj-NPB"/>
+            </connections>
+            <point key="canvasLocation" x="654.5" y="457.5"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/Example/Sources/Helpers.swift b/Example/Sources/Helpers.swift
index f9af292..72b8666 100644
--- a/Example/Sources/Helpers.swift
+++ b/Example/Sources/Helpers.swift
@@ -24,7 +24,7 @@ import JSQDataSourcesKit
 
 
 let CellId = "cell"
-
+let FancyCellId = "fancyCell"
 
 struct CellViewModel {
     let text = "My Title"
diff --git a/Example/Sources/MixedCollectionViewController.swift b/Example/Sources/MixedCollectionViewController.swift
new file mode 100644
index 0000000..0eab877
--- /dev/null
+++ b/Example/Sources/MixedCollectionViewController.swift
@@ -0,0 +1,101 @@
+//
+//  Created by Jesse Squires
+//  http://www.jessesquires.com
+//
+//
+//  Documentation
+//  http://jessesquires.com/JSQDataSourcesKit
+//
+//
+//  GitHub
+//  https://github.com/jessesquires/JSQDataSourcesKit
+//
+//
+//  License
+//  Copyright © 2015 Jesse Squires
+//  Released under an MIT license: http://opensource.org/licenses/MIT
+//
+
+import UIKit
+import JSQDataSourcesKit
+
+
+struct FancyViewModel {
+    let text: String = "Fancy Text"
+    let cornerRadius: CGFloat = 5
+}
+
+enum MixedItem {
+    case Standard(CellViewModel)
+    case Fancy(FancyViewModel)
+
+    var reuseIdentifier: String {
+        switch self {
+        case .Standard(_):
+            return CellId
+        case .Fancy(_):
+            return FancyCellId
+        }
+    }
+}
+
+final class MixedCollectionViewController: UICollectionViewController, UICollectionViewDelegateFlowLayout {
+
+    typealias Source = DataSource< Section<MixedItem> >
+    typealias CollectionCellFactory = ComposedCellViewFactory
+    typealias HeaderViewFactory = TitledSupplementaryViewFactory<MixedItem>
+
+    var dataSourceProvider: DataSourceProvider<Source, CollectionCellFactory, HeaderViewFactory>?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        configureCollectionView(collectionView!)
+        collectionView!.registerNib(UINib(nibName: "FancyCollectionViewCell", bundle: nil),
+                                   forCellWithReuseIdentifier: FancyCellId)
+
+        let standardItem = MixedItem.Standard(CellViewModel())
+        let fancyItem = MixedItem.Fancy(FancyViewModel())
+
+        // 1. create view models
+        let section0 = Section(items: standardItem, fancyItem, fancyItem)
+        let section1 = Section(items: fancyItem, standardItem, standardItem, standardItem, fancyItem, standardItem)
+        let section2 = Section(items: fancyItem)
+        let dataSource = DataSource(sections: section0, section1, section2)
+
+        // 2. create cell factories
+        let standardCellFactory = ViewFactory(reuseIdentifier: CellId) { (cell, model: CellViewModel?, type, collectionView, indexPath) -> CollectionViewCell in
+            if let model = model {
+                cell.label.text = model.text + "\n\(indexPath.section), \(indexPath.item)"
+            }
+            return cell
+        }
+        let fancyCellFactory = ViewFactory(reuseIdentifier: CellId) { (cell, model: FancyViewModel?, type, collectionView, indexPath) -> FancyCollectionViewCell in
+            if let model = model {
+                cell.label.text = model.text + "\n\(indexPath.section), \(indexPath.item)"
+                cell.layer.cornerRadius = model.cornerRadius
+            }
+            return cell
+        }
+        let cellFactory = ComposedCellViewFactory(standardCellFactory: standardCellFactory, fancyCellFactory: fancyCellFactory)
+
+        // 3. create supplementary view factory
+        let headerFactory = TitledSupplementaryViewFactory { (header, item: MixedItem?, kind, collectionView, indexPath) -> TitledSupplementaryView in
+            header.label.text = "Section \(indexPath.section)"
+            header.backgroundColor = .darkGrayColor()
+            header.label.textColor = .whiteColor()
+            return header
+        }
+
+        // 4. create data source provider
+        self.dataSourceProvider = DataSourceProvider(dataSource: dataSource,
+                                                     cellFactory: cellFactory,
+                                                     supplementaryFactory: headerFactory)
+
+        // 5. set data source
+        collectionView?.dataSource = self.dataSourceProvider?.collectionViewDataSource
+    }
+
+    func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return CGSize(width: collectionView.frame.size.width, height: 50)
+    }
+}

From 63ac07fc499b860c1543046e13ef85cd509744ef Mon Sep 17 00:00:00 2001
From: Jesse Squires <jesse.d.squires@gmail.com>
Date: Wed, 27 Jul 2016 22:40:08 -0700
Subject: [PATCH 2/3] proj settings

---
 Example/Example.xcodeproj/project.pbxproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index b553058..091d841 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -635,12 +635,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = DataSources;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -674,10 +675,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = DataSources;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};

From 4ee1a400e8bf355f42b3133b468f8a27b4449319 Mon Sep 17 00:00:00 2001
From: Dave Caunt <dcaunt@gmail.com>
Date: Thu, 28 Jul 2016 17:48:56 +0100
Subject: [PATCH 3/3] Update mixed cell type example for Swift 3.0

---
 Example/Sources/ComposedCellViewFactory.swift |  8 ++++----
 Example/Sources/FancyCollectionViewCell.swift |  4 ++--
 .../MixedCollectionViewController.swift       | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Example/Sources/ComposedCellViewFactory.swift b/Example/Sources/ComposedCellViewFactory.swift
index 712d471..7fc085b 100644
--- a/Example/Sources/ComposedCellViewFactory.swift
+++ b/Example/Sources/ComposedCellViewFactory.swift
@@ -35,11 +35,11 @@ struct ComposedCellViewFactory: ReusableViewFactoryProtocol  {
         self.fancyCellFactory = fancyCellFactory
     }
 
-    func reuseIdentiferFor(item item: MixedItem?, type: ReusableViewType, indexPath: NSIndexPath) -> String {
+    func reuseIdentiferFor(item: MixedItem?, type: ReusableViewType, indexPath: IndexPath) -> String {
         return item!.reuseIdentifier
     }
 
-    func configure(view view: UICollectionViewCell, item: MixedItem?, type: ReusableViewType, parentView: UICollectionView, indexPath: NSIndexPath) -> UICollectionViewCell {
+    func configure(view: UICollectionViewCell, item: MixedItem?, type: ReusableViewType, parentView: UICollectionView, indexPath: IndexPath) -> UICollectionViewCell {
         view.accessibilityIdentifier = "\(indexPath.section), \(indexPath.item)"
 
         guard let model = item else {
@@ -47,10 +47,10 @@ struct ComposedCellViewFactory: ReusableViewFactoryProtocol  {
         }
 
         switch model {
-        case let .Standard(standardModel):
+        case let .standard(standardModel):
             let cell = view as! CollectionViewCell
             return standardCellFactory.configure(view: cell, item: standardModel, type: type, parentView: parentView, indexPath: indexPath)
-        case let .Fancy(fancyModel):
+        case let .fancy(fancyModel):
             let cell = view as! FancyCollectionViewCell
             return fancyCellFactory.configure(view: cell, item: fancyModel, type: type, parentView: parentView, indexPath: indexPath)
         }
diff --git a/Example/Sources/FancyCollectionViewCell.swift b/Example/Sources/FancyCollectionViewCell.swift
index 2dc6230..d05eb3c 100644
--- a/Example/Sources/FancyCollectionViewCell.swift
+++ b/Example/Sources/FancyCollectionViewCell.swift
@@ -25,7 +25,7 @@ class FancyCollectionViewCell: UICollectionViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         selectedBackgroundView = UIView()
-        selectedBackgroundView?.backgroundColor = .orangeColor()
-        backgroundColor = .greenColor()
+        selectedBackgroundView?.backgroundColor = .orange()
+        backgroundColor = .green()
     }
 }
diff --git a/Example/Sources/MixedCollectionViewController.swift b/Example/Sources/MixedCollectionViewController.swift
index 0eab877..cb31d97 100644
--- a/Example/Sources/MixedCollectionViewController.swift
+++ b/Example/Sources/MixedCollectionViewController.swift
@@ -26,14 +26,14 @@ struct FancyViewModel {
 }
 
 enum MixedItem {
-    case Standard(CellViewModel)
-    case Fancy(FancyViewModel)
+    case standard(CellViewModel)
+    case fancy(FancyViewModel)
 
     var reuseIdentifier: String {
         switch self {
-        case .Standard(_):
+        case .standard(_):
             return CellId
-        case .Fancy(_):
+        case .fancy(_):
             return FancyCellId
         }
     }
@@ -50,11 +50,11 @@ final class MixedCollectionViewController: UICollectionViewController, UICollect
     override func viewDidLoad() {
         super.viewDidLoad()
         configureCollectionView(collectionView!)
-        collectionView!.registerNib(UINib(nibName: "FancyCollectionViewCell", bundle: nil),
+        collectionView!.register(UINib(nibName: "FancyCollectionViewCell", bundle: nil),
                                    forCellWithReuseIdentifier: FancyCellId)
 
-        let standardItem = MixedItem.Standard(CellViewModel())
-        let fancyItem = MixedItem.Fancy(FancyViewModel())
+        let standardItem = MixedItem.standard(CellViewModel())
+        let fancyItem = MixedItem.fancy(FancyViewModel())
 
         // 1. create view models
         let section0 = Section(items: standardItem, fancyItem, fancyItem)
@@ -81,8 +81,8 @@ final class MixedCollectionViewController: UICollectionViewController, UICollect
         // 3. create supplementary view factory
         let headerFactory = TitledSupplementaryViewFactory { (header, item: MixedItem?, kind, collectionView, indexPath) -> TitledSupplementaryView in
             header.label.text = "Section \(indexPath.section)"
-            header.backgroundColor = .darkGrayColor()
-            header.label.textColor = .whiteColor()
+            header.backgroundColor = .darkGray()
+            header.label.textColor = .white()
             return header
         }
 
@@ -95,7 +95,7 @@ final class MixedCollectionViewController: UICollectionViewController, UICollect
         collectionView?.dataSource = self.dataSourceProvider?.collectionViewDataSource
     }
 
-    func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
         return CGSize(width: collectionView.frame.size.width, height: 50)
     }
 }