Merge branch 'v2.0.0'

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change log
+
+## [2.0.0](https://github.com/oakstudios/StackedCollectionView/releases/tag/2.0.0)
+* Update to Swift 4
+
+## [1.0.2](https://github.com/oakstudios/StackedCollectionView/releases/tag/1.0.2)
+* Reinstate isHidden for active cell, instead of alpha = 0.0
+
+## [1.0.1](https://github.com/oakstudios/StackedCollectionView/releases/tag/1.0.1)
+* Add delegate hook for gesture movement outside of specified radius
+* Enable SnapshotView to be updated live during drag gesture
+
+## [1.0.0](https://github.com/oakstudios/StackedCollectionView/releases/tag/1.0.0)
+* Launch 🎉

Example/StackedCollectionView.xcodeproj/project.pbxproj

@@ -271,8 +271,7 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = WGR9T9JH4L;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0910;
 					};
 				};
 			};
@@ -527,14 +526,15 @@
 			baseConfigurationReference = 0B6F72293BE15548F8D3D0D5 /* Pods-StackedCollectionView_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = WGR9T9JH4L;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = StackedCollectionView/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -544,14 +544,15 @@
 			baseConfigurationReference = 8CE4292995C01433B489AF42 /* Pods-StackedCollectionView_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = WGR9T9JH4L;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = StackedCollectionView/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Example/StackedCollectionView.xcodeproj/xcshareddata/xcschemes/StackedCollectionView-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/StackedCollectionView/Constants.swift

@@ -28,7 +28,3 @@ import UIKit
 struct Constant {
     static let Margin: CGFloat = 16.0
 }
-
-struct CellReuseIdentifier {
-    static let CustomCell = "CustomCollectionViewCell"
-}

Example/StackedCollectionView/CustomCollectionViewCell.swift

@@ -27,6 +27,8 @@ import UIKit
 
 class CustomCollectionViewCell: UICollectionViewCell {
 
+    static let identifier = "CustomCollectionViewCell"
+
     var items: [Item]? {
         didSet {
             if let items = items {

Example/StackedCollectionView/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/StackedCollectionView/ViewController.swift

@@ -45,13 +45,13 @@ class ViewController: UIViewController, UICollectionViewDelegate {
         collectionView.delegate = self
         collectionView.stackedDelegate = self
         collectionView.stackedDataSource = self
-        collectionView.register(CustomCollectionViewCell.self, forCellWithReuseIdentifier: CellReuseIdentifier.CustomCell)
+        collectionView.register(CustomCollectionViewCell.self, forCellWithReuseIdentifier: CustomCollectionViewCell.identifier)
 
         view.addSubview(collectionView)
         topLayoutGuide.bottomAnchor.constraint(equalTo: collectionView.topAnchor).isActive = true
         view.leftAnchor.constraint(equalTo: collectionView.leftAnchor).isActive = true
         view.rightAnchor.constraint(equalTo: collectionView.rightAnchor).isActive = true
-        bottomLayoutGuide.topAnchor.constraint(equalTo: collectionView.bottomAnchor).isActive = true
+        view.bottomAnchor.constraint(equalTo: collectionView.bottomAnchor).isActive = true
     }
 
     override func viewWillLayoutSubviews() {
@@ -70,7 +70,7 @@ extension ViewController: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CellReuseIdentifier.CustomCell, for: indexPath) as! CustomCollectionViewCell
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CustomCollectionViewCell.identifier, for: indexPath) as! CustomCollectionViewCell
         if let item = items[indexPath.item] as? Item {
             cell.items = [item]
         } else if let items = items[indexPath.item] as? [Item] {