converting to swift 4.2 Fixes #85

fix ambiguous NSLayoutAttribute compile error

.swift-version

@@ -0,0 +1 @@
+4.0

.travis.yml

@@ -1,6 +1,13 @@
-osx_image: xcode7.3
+osx_image: xcode9.2
 language: objective-c
 
 xcode_project: DemoExpandingCollection/DemoExpandingCollection.xcodeproj
 xcode_scheme: ExpandingCollection
-xcode_sdk: iphonesimulator
+xcode_sdk: iphonesimulator11.2
+
+# SWIFT_VERSION: 4.0
+
+# whitelist
+branches:
+only:
+- master

DemoExpandingCollection/DemoExpandingCollection.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		848596311CF585F3000BCC74 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8485962F1CF585F3000BCC74 /* Main.storyboard */; };
 		848596331CF585F3000BCC74 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 848596321CF585F3000BCC74 /* Assets.xcassets */; };
 		848596361CF585F3000BCC74 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 848596341CF585F3000BCC74 /* LaunchScreen.storyboard */; };
-		848596411CF585F3000BCC74 /* DemoExpandingCollectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848596401CF585F3000BCC74 /* DemoExpandingCollectionTests.swift */; };
 		8485965A1CF586F7000BCC74 /* DemoTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848596541CF586F7000BCC74 /* DemoTableViewController.swift */; };
 		8485965B1CF586F7000BCC74 /* DemoCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848596571CF586F7000BCC74 /* DemoCollectionViewCell.swift */; };
 		8485965C1CF586F7000BCC74 /* DemoCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848596581CF586F7000BCC74 /* DemoCollectionViewCell.xib */; };
@@ -49,13 +48,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		8485963D1CF585F3000BCC74 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 848596201CF585F3000BCC74 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 848596271CF585F3000BCC74;
-			remoteInfo = DemoExpandingCollection;
-		};
 		8499D8191D001B82004B5B37 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 848596201CF585F3000BCC74 /* Project object */;
@@ -88,9 +80,6 @@
 		848596321CF585F3000BCC74 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		848596351CF585F3000BCC74 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		848596371CF585F3000BCC74 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8485963C1CF585F3000BCC74 /* DemoExpandingCollectionTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoExpandingCollectionTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		848596401CF585F3000BCC74 /* DemoExpandingCollectionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoExpandingCollectionTests.swift; sourceTree = "<group>"; };
-		848596421CF585F3000BCC74 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		848596541CF586F7000BCC74 /* DemoTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoTableViewController.swift; sourceTree = "<group>"; };
 		848596571CF586F7000BCC74 /* DemoCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoCollectionViewCell.swift; sourceTree = "<group>"; };
 		848596581CF586F7000BCC74 /* DemoCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoCollectionViewCell.xib; sourceTree = "<group>"; };
@@ -123,13 +112,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		848596391CF585F3000BCC74 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8499D8101D001B82004B5B37 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -169,7 +151,6 @@
 			isa = PBXGroup;
 			children = (
 				8485962A1CF585F3000BCC74 /* DemoExpandingCollection */,
-				8485963F1CF585F3000BCC74 /* DemoExpandingCollectionTests */,
 				8499D8151D001B82004B5B37 /* ExpandingCollection */,
 				848596291CF585F3000BCC74 /* Products */,
 			);
@@ -179,7 +160,6 @@
 			isa = PBXGroup;
 			children = (
 				848596281CF585F3000BCC74 /* DemoExpandingCollection.app */,
-				8485963C1CF585F3000BCC74 /* DemoExpandingCollectionTests.xctest */,
 				8499D8141D001B82004B5B37 /* ExpandingCollection.framework */,
 			);
 			name = Products;
@@ -202,15 +182,6 @@
 			path = DemoExpandingCollection;
 			sourceTree = "<group>";
 		};
-		8485963F1CF585F3000BCC74 /* DemoExpandingCollectionTests */ = {
-			isa = PBXGroup;
-			children = (
-				848596401CF585F3000BCC74 /* DemoExpandingCollectionTests.swift */,
-				848596421CF585F3000BCC74 /* Info.plist */,
-			);
-			path = DemoExpandingCollectionTests;
-			sourceTree = "<group>";
-		};
 		848596521CF586E0000BCC74 /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -429,7 +400,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 848596451CF585F3000BCC74 /* Build configuration list for PBXNativeTarget "DemoExpandingCollection" */;
 			buildPhases = (
-				8485968F1CF58B8A000BCC74 /* Images Generator */,
 				848596241CF585F3000BCC74 /* Sources */,
 				848596251CF585F3000BCC74 /* Frameworks */,
 				848596261CF585F3000BCC74 /* Resources */,
@@ -445,24 +415,6 @@
 			productReference = 848596281CF585F3000BCC74 /* DemoExpandingCollection.app */;
 			productType = "com.apple.product-type.application";
 		};
-		8485963B1CF585F3000BCC74 /* DemoExpandingCollectionTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 848596481CF585F3000BCC74 /* Build configuration list for PBXNativeTarget "DemoExpandingCollectionTests" */;
-			buildPhases = (
-				848596381CF585F3000BCC74 /* Sources */,
-				848596391CF585F3000BCC74 /* Frameworks */,
-				8485963A1CF585F3000BCC74 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				8485963E1CF585F3000BCC74 /* PBXTargetDependency */,
-			);
-			name = DemoExpandingCollectionTests;
-			productName = DemoExpandingCollectionTests;
-			productReference = 8485963C1CF585F3000BCC74 /* DemoExpandingCollectionTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 		8499D8131D001B82004B5B37 /* ExpandingCollection */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 8499D81F1D001B82004B5B37 /* Build configuration list for PBXNativeTarget "ExpandingCollection" */;
@@ -488,20 +440,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Alex K.";
 				TargetAttributes = {
 					848596271CF585F3000BCC74 = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = LEAZS7L33U;
-					};
-					8485963B1CF585F3000BCC74 = {
-						CreatedOnToolsVersion = 7.3.1;
-						TestTargetID = 848596271CF585F3000BCC74;
+						DevelopmentTeam = 34MUF9YXTA;
+						LastSwiftMigration = 1000;
 					};
 					8499D8131D001B82004B5B37 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = LEAZS7L33U;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -519,7 +469,6 @@
 			projectRoot = "";
 			targets = (
 				848596271CF585F3000BCC74 /* DemoExpandingCollection */,
-				8485963B1CF585F3000BCC74 /* DemoExpandingCollectionTests */,
 				8499D8131D001B82004B5B37 /* ExpandingCollection */,
 			);
 		};
@@ -537,13 +486,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		8485963A1CF585F3000BCC74 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8499D8121D001B82004B5B37 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -553,23 +495,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		8485968F1CF58B8A000BCC74 /* Images Generator */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Images Generator";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if which swiftgen >/dev/null; then\nswiftgen images \"$PROJECT_DIR/DemoExpandingCollection/Assets.xcassets\" --output \"$PROJECT_DIR/DemoExpandingCollection/Constants/Images.swift\"\nelse\necho \"warning: SwiftGen not installed, download it from https://github.com/AliSoftware/SwiftGen\"\nfi";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		848596241CF585F3000BCC74 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -598,14 +523,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		848596381CF585F3000BCC74 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				848596411CF585F3000BCC74 /* DemoExpandingCollectionTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8499D80F1D001B82004B5B37 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -627,11 +544,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		8485963E1CF585F3000BCC74 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 848596271CF585F3000BCC74 /* DemoExpandingCollection */;
-			targetProxy = 8485963D1CF585F3000BCC74 /* PBXContainerItemProxy */;
-		};
 		8499D81A1D001B82004B5B37 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 8499D8131D001B82004B5B37 /* ExpandingCollection */;
@@ -668,13 +580,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -696,7 +618,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -713,13 +635,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -735,9 +667,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -745,56 +678,36 @@
 		848596461CF585F3000BCC74 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
+				DEVELOPMENT_TEAM = 34MUF9YXTA;
 				INFOPLIST_FILE = DemoExpandingCollection/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.DemoExpandingCollection;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
 		848596471CF585F3000BCC74 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
+				DEVELOPMENT_TEAM = 34MUF9YXTA;
 				INFOPLIST_FILE = DemoExpandingCollection/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.DemoExpandingCollection;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-			};
-			name = Release;
-		};
-		848596491CF585F3000BCC74 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				INFOPLIST_FILE = DemoExpandingCollectionTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.DemoExpandingCollectionTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DemoExpandingCollection.app/DemoExpandingCollection";
-			};
-			name = Debug;
-		};
-		8485964A1CF585F3000BCC74 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				INFOPLIST_FILE = DemoExpandingCollectionTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.DemoExpandingCollectionTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DemoExpandingCollection.app/DemoExpandingCollection";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -802,7 +715,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -810,11 +723,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ExpandingCollection/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -825,7 +739,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -833,11 +747,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ExpandingCollection/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -865,15 +780,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		848596481CF585F3000BCC74 /* Build configuration list for PBXNativeTarget "DemoExpandingCollectionTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				848596491CF585F3000BCC74 /* Debug */,
-				8485964A1CF585F3000BCC74 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		8499D81F1D001B82004B5B37 /* Build configuration list for PBXNativeTarget "ExpandingCollection" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

DemoExpandingCollection/DemoExpandingCollection.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

DemoExpandingCollection/DemoExpandingCollection.xcodeproj/xcshareddata/xcschemes/ExpandingCollection.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DemoExpandingCollection/DemoExpandingCollection/AppDelegate.swift

@@ -11,47 +11,29 @@ import UIKit
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  var window: UIWindow?
+    var window: UIWindow?
 
-
-  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-    configureNavigationTabBar()
-    return true
-  }
-
-  func applicationWillResignActive(application: UIApplication) {
-    
-  }
-
-  func applicationDidEnterBackground(application: UIApplication) {
-   
-  }
-
-  func applicationWillEnterForeground(application: UIApplication) {
-  }
-
-  func applicationDidBecomeActive(application: UIApplication) {
-  }
-
-  func applicationWillTerminate(application: UIApplication) {
-  }
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        configureNavigationTabBar()
+        return true
+    }
 }
 
 extension AppDelegate {
-  
-  private func configureNavigationTabBar() {
-    //transparent background
-    UINavigationBar.appearance().setBackgroundImage(UIImage(), forBarMetrics: .Default)
-    UINavigationBar.appearance().shadowImage     = UIImage()
-    UINavigationBar.appearance().translucent     = true
-    
-    let shadow = NSShadow()
-    shadow.shadowOffset = CGSize(width: 0, height: 2)
-    shadow.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.1)
-    
-    UINavigationBar.appearance().titleTextAttributes = [
-      NSForegroundColorAttributeName : UIColor.whiteColor(),
-      NSShadowAttributeName: shadow
-    ]
-  }
+
+    fileprivate func configureNavigationTabBar() {
+        //transparent background
+        UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
+        UINavigationBar.appearance().shadowImage = UIImage()
+        UINavigationBar.appearance().isTranslucent = true
+
+        let shadow = NSShadow()
+        shadow.shadowOffset = CGSize(width: 0, height: 2)
+        shadow.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.1)
+
+        UINavigationBar.appearance().titleTextAttributes = [
+            NSAttributedString.Key.foregroundColor: UIColor.white,
+            NSAttributedString.Key.shadow: shadow,
+        ]
+    }
 }

DemoExpandingCollection/DemoExpandingCollection/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -29,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

DemoExpandingCollection/DemoExpandingCollection/Base.lproj/LaunchScreen.storyboard

@@ -1,7 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,15 +19,35 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2018 Ramotion. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcf-sN-ku0">
+                                <rect key="frame" x="16" y="630" width="343" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Expanding Collection" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bCd-3b-lHA">
+                                <rect key="frame" x="101.5" y="323" width="173" height="21"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="fcf-sN-ku0" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" id="811-hI-Egq"/>
+                            <constraint firstItem="bCd-3b-lHA" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="T4x-O3-JqD"/>
+                            <constraint firstItem="bCd-3b-lHA" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="VFr-tp-sPw"/>
+                            <constraint firstItem="fcf-sN-ku0" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailingMargin" id="dS9-pv-ebe"/>
+                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="fcf-sN-ku0" secondAttribute="bottom" constant="20" id="kbD-dX-t3N"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52" y="374.66266866566718"/>
         </scene>
     </scenes>
 </document>

DemoExpandingCollection/DemoExpandingCollection/Base.lproj/Main.storyboard

@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="L1n-Ia-Jrw">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="L1n-Ia-Jrw">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Demo View Controller-->
@@ -15,25 +19,25 @@
                         <viewControllerLayoutGuide type="bottom" id="mRg-Mx-OVI"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="CO1-du-RsN">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundImage" translatesAutoresizingMaskIntoConstraints="NO" id="o88-Ae-QCA">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1/15" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Irl-Rb-fcB">
-                                <rect key="frame" x="285" y="559" width="31" height="21"/>
+                                <rect key="frame" x="172" y="626.5" width="31" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.85882352941176465" green="0.8666666666666667" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.85882352941176465" green="0.8666666666666667" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="mRg-Mx-OVI" firstAttribute="top" secondItem="Irl-Rb-fcB" secondAttribute="bottom" constant="20" id="2LM-iO-324"/>
-                            <constraint firstItem="o88-Ae-QCA" firstAttribute="top" secondItem="CpK-wn-s3i" secondAttribute="bottom" constant="-44" id="MHx-PV-wBs"/>
+                            <constraint firstItem="o88-Ae-QCA" firstAttribute="top" secondItem="CO1-du-RsN" secondAttribute="top" id="MHx-PV-wBs"/>
                             <constraint firstAttribute="trailing" secondItem="o88-Ae-QCA" secondAttribute="trailing" id="Xcv-FC-DFw"/>
-                            <constraint firstItem="mRg-Mx-OVI" firstAttribute="top" secondItem="o88-Ae-QCA" secondAttribute="bottom" id="aWe-c0-hwO"/>
+                            <constraint firstAttribute="bottom" secondItem="o88-Ae-QCA" secondAttribute="bottom" id="aWe-c0-hwO"/>
                             <constraint firstItem="o88-Ae-QCA" firstAttribute="leading" secondItem="CO1-du-RsN" secondAttribute="leading" id="sd9-mZ-FXM"/>
                             <constraint firstItem="Irl-Rb-fcB" firstAttribute="centerX" secondItem="CO1-du-RsN" secondAttribute="centerX" id="yzg-tR-vdV"/>
                         </constraints>
@@ -42,24 +46,24 @@
                         <nil key="title"/>
                         <barButtonItem key="leftBarButtonItem" image="searchIcon" id="xuF-jX-6LN"/>
                         <view key="titleView" contentMode="scaleToFill" id="U0J-H7-fvX">
-                            <rect key="frame" x="180" y="6" width="240" height="33"/>
+                            <rect key="frame" x="67.5" y="5.5" width="240" height="33"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Title" translatesAutoresizingMaskIntoConstraints="NO" id="92b-RV-q6w">
-                                    <rect key="frame" x="95" y="9" width="51" height="16"/>
+                                    <rect key="frame" x="94.5" y="8.5" width="51" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="51" id="E8y-UB-H4U"/>
                                         <constraint firstAttribute="height" constant="16" id="FBz-Jg-2za"/>
                                     </constraints>
                                 </imageView>
                             </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="92b-RV-q6w" firstAttribute="centerX" secondItem="U0J-H7-fvX" secondAttribute="centerX" id="kLZ-Jr-wTP"/>
                                 <constraint firstItem="92b-RV-q6w" firstAttribute="centerY" secondItem="U0J-H7-fvX" secondAttribute="centerY" id="qaL-Bm-FyO"/>
                             </constraints>
                         </view>
-                        <barButtonItem key="rightBarButtonItem" title="Item" id="mbm-hT-lYD" customClass="AnimatingBarButton" customModule="DemoExpandingCollection" customModuleProvider="target">
+                        <barButtonItem key="rightBarButtonItem" title="Item" image="locationButton" id="mbm-hT-lYD" customClass="AnimatingBarButton" customModule="DemoExpandingCollection" customModuleProvider="target">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="normalImageName" value="locationButton"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="selectedImageName" value="CloseButton"/>
@@ -85,7 +89,7 @@
                     <toolbarItems/>
                     <nil key="simulatedStatusBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="5hs-Ir-kRn">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -102,21 +106,21 @@
             <objects>
                 <tableViewController storyboardIdentifier="DemoTableViewController" automaticallyAdjustsScrollViewInsets="NO" id="7RW-i0-HfN" customClass="DemoTableViewController" customModule="DemoExpandingCollection" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="static" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="2SU-lJ-2AP">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <sections>
                             <tableViewSection id="IIl-eL-sK9">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CustomTableViewCell" rowHeight="124" id="SFA-X2-Rbf">
-                                        <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="124"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SFA-X2-Rbf" id="RQr-Ti-ps0">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="124"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="map" translatesAutoresizingMaskIntoConstraints="NO" id="MOR-g7-Roh">
-                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="124"/>
                                                 </imageView>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stars" translatesAutoresizingMaskIntoConstraints="NO" id="u4E-kh-oBd">
                                                     <rect key="frame" x="40" y="92" width="77" height="12"/>
@@ -126,9 +130,9 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="La Crescenta-Montrose, CA91020 Glendale
NO. 7911847" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh7-la-W1r">
-                                                    <rect key="frame" x="40" y="48" width="552" height="27"/>
+                                                    <rect key="frame" x="40" y="49" width="319" height="26.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" red="0.49803921568627452" green="0.51764705882352935" blue="0.53725490196078429" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.49803921568627452" green="0.51764705882352935" blue="0.53725490196078429" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -145,278 +149,375 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="124" id="ew1-hI-ark">
-                                        <rect key="frame" x="0.0" y="124" width="600" height="124"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="il3-eE-Dz6">
+                                        <rect key="frame" x="0.0" y="124" width="375" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ew1-hI-ark" id="tMC-aw-BE2">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="il3-eE-Dz6" id="MsP-wf-fvb">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="9zL-0u-FrF">
-                                                    <rect key="frame" x="40" y="20" width="40" height="40"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="uVu-gN-MRp">
+                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="ukw-f4-MVo">
+                                                            <rect key="frame" x="0.0" y="0.0" width="295" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="uxT-p4-twy">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="40" id="MVQ-VZ-6fS"/>
+                                                                        <constraint firstAttribute="height" constant="40" id="Sd9-Ve-7wv"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HrH-RB-ew1">
+                                                                    <rect key="frame" x="50" y="11" width="168" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lHC-gQ-gcP">
+                                                                    <rect key="frame" x="228" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="A79-W0-b7f">
+                                                                    <rect key="frame" x="281" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="cWC-7U-c6U">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="Aal-gs-pRU"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="40" id="78B-o8-UlD"/>
-                                                        <constraint firstAttribute="height" constant="40" id="b9d-Vi-STe"/>
+                                                        <constraint firstAttribute="trailing" secondItem="ukw-f4-MVo" secondAttribute="trailing" id="LFh-OH-GCr"/>
+                                                        <constraint firstItem="ukw-f4-MVo" firstAttribute="leading" secondItem="uVu-gN-MRp" secondAttribute="leading" id="SZN-hq-17r"/>
                                                     </constraints>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="Nk4-8x-Lwg">
-                                                    <rect key="frame" x="524" y="34" width="14" height="13"/>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KVC-Pp-S9H">
-                                                    <rect key="frame" x="108" y="31" width="74" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" red="0.41960784313725491" green="0.41960784313725491" blue="0.41960784313725491" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UAK-of-lpJ">
-                                                    <rect key="frame" x="219" y="34" width="43" height="12"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                                    <color key="textColor" red="0.76470588235294112" green="0.76470588235294112" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2zo-A7-sbM">
-                                                    <rect key="frame" x="40" y="57" width="498" height="59"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="59" id="zel-Yy-v9k"/>
-                                                    </constraints>
-                                                    <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.44313725490196076" green="0.44313725490196076" blue="0.44313725490196076" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="2zo-A7-sbM" firstAttribute="leading" secondItem="tMC-aw-BE2" secondAttribute="leading" constant="40" id="H38-Fq-dyr"/>
-                                                <constraint firstItem="UAK-of-lpJ" firstAttribute="centerY" secondItem="KVC-Pp-S9H" secondAttribute="centerY" id="LsD-yB-O6d"/>
-                                                <constraint firstItem="UAK-of-lpJ" firstAttribute="leading" secondItem="KVC-Pp-S9H" secondAttribute="trailing" constant="37" id="Q2S-o9-jqX"/>
-                                                <constraint firstAttribute="trailing" secondItem="Nk4-8x-Lwg" secondAttribute="trailing" constant="62" id="V8O-HD-kFA"/>
-                                                <constraint firstItem="Nk4-8x-Lwg" firstAttribute="centerY" secondItem="9zL-0u-FrF" secondAttribute="centerY" id="W5E-fE-j0w"/>
-                                                <constraint firstAttribute="trailing" secondItem="2zo-A7-sbM" secondAttribute="trailing" constant="62" id="Z9T-o6-3gf"/>
-                                                <constraint firstItem="KVC-Pp-S9H" firstAttribute="centerY" secondItem="9zL-0u-FrF" secondAttribute="centerY" id="brv-4K-N8t"/>
-                                                <constraint firstItem="KVC-Pp-S9H" firstAttribute="leading" secondItem="9zL-0u-FrF" secondAttribute="trailing" constant="28" id="i1I-Wl-eDa"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="2zo-A7-sbM" secondAttribute="bottom" id="i8F-BH-FCe"/>
-                                                <constraint firstItem="9zL-0u-FrF" firstAttribute="leading" secondItem="tMC-aw-BE2" secondAttribute="leading" constant="40" id="vVg-gG-k8j"/>
-                                                <constraint firstItem="9zL-0u-FrF" firstAttribute="top" secondItem="tMC-aw-BE2" secondAttribute="top" constant="20" id="w5h-fl-OmZ"/>
+                                                <constraint firstItem="uVu-gN-MRp" firstAttribute="top" secondItem="MsP-wf-fvb" secondAttribute="top" constant="15" id="NQl-Be-BKZ"/>
+                                                <constraint firstAttribute="bottom" secondItem="uVu-gN-MRp" secondAttribute="bottom" constant="15" id="jvP-x7-pnF"/>
+                                                <constraint firstAttribute="trailing" secondItem="uVu-gN-MRp" secondAttribute="trailing" constant="40" id="tiY-7g-NSN"/>
+                                                <constraint firstItem="uVu-gN-MRp" firstAttribute="leading" secondItem="MsP-wf-fvb" secondAttribute="leading" constant="40" id="yEt-zX-E7e"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="124" id="0ee-7A-I2I">
-                                        <rect key="frame" x="0.0" y="248" width="600" height="124"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="72K-TN-0SK">
+                                        <rect key="frame" x="0.0" y="254" width="375" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0ee-7A-I2I" id="jPx-eH-c2S">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="72K-TN-0SK" id="Md6-Nq-ERc">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face1" translatesAutoresizingMaskIntoConstraints="NO" id="T8j-gX-HQZ">
-                                                    <rect key="frame" x="40" y="20" width="40" height="40"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="STK-Cw-1By">
+                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="avn-wq-7Zt">
+                                                            <rect key="frame" x="0.0" y="0.0" width="295" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face1" translatesAutoresizingMaskIntoConstraints="NO" id="fq4-to-wKp">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="40" id="G1F-5B-Qmz"/>
+                                                                        <constraint firstAttribute="height" constant="40" id="xIh-K6-n5R"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Amada Iin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8rD-uo-vTf">
+                                                                    <rect key="frame" x="50" y="11" width="168" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9wq-EN-tLL">
+                                                                    <rect key="frame" x="228" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="CCB-2m-LDr">
+                                                                    <rect key="frame" x="281" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="Rj6-os-v8s">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="X0h-Mf-l6D"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="40" id="AKq-2T-BRC"/>
-                                                        <constraint firstAttribute="width" constant="40" id="lAw-yT-R7T"/>
+                                                        <constraint firstItem="avn-wq-7Zt" firstAttribute="leading" secondItem="STK-Cw-1By" secondAttribute="leading" id="JQi-MO-nNf"/>
+                                                        <constraint firstAttribute="trailing" secondItem="avn-wq-7Zt" secondAttribute="trailing" id="O7i-6t-BF2"/>
                                                     </constraints>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="szO-5V-CyH">
-                                                    <rect key="frame" x="524" y="34" width="14" height="13"/>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amada Iin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UEu-Ap-Kms">
-                                                    <rect key="frame" x="108" y="31" width="68" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7hI-Qw-bUn">
-                                                    <rect key="frame" x="213" y="34" width="43" height="12"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkV-jC-tTs">
-                                                    <rect key="frame" x="40" y="57" width="498" height="59"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="59" id="pYw-qC-eUH"/>
-                                                    </constraints>
-                                                    <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="UEu-Ap-Kms" firstAttribute="centerY" secondItem="T8j-gX-HQZ" secondAttribute="centerY" id="0ar-MM-JhP"/>
-                                                <constraint firstAttribute="trailing" secondItem="szO-5V-CyH" secondAttribute="trailing" constant="62" id="I1Z-x4-mXH"/>
-                                                <constraint firstItem="7hI-Qw-bUn" firstAttribute="leading" secondItem="UEu-Ap-Kms" secondAttribute="trailing" constant="37" id="JWw-Z3-bSW"/>
-                                                <constraint firstItem="7hI-Qw-bUn" firstAttribute="centerY" secondItem="UEu-Ap-Kms" secondAttribute="centerY" id="KR6-QV-sS2"/>
-                                                <constraint firstItem="szO-5V-CyH" firstAttribute="centerY" secondItem="T8j-gX-HQZ" secondAttribute="centerY" id="UVU-13-4LE"/>
-                                                <constraint firstItem="rkV-jC-tTs" firstAttribute="leading" secondItem="jPx-eH-c2S" secondAttribute="leading" constant="40" id="cf4-Ue-Xs2"/>
-                                                <constraint firstItem="UEu-Ap-Kms" firstAttribute="leading" secondItem="T8j-gX-HQZ" secondAttribute="trailing" constant="28" id="fhv-QP-9Wc"/>
-                                                <constraint firstAttribute="trailing" secondItem="rkV-jC-tTs" secondAttribute="trailing" constant="62" id="kZt-vH-S8D"/>
-                                                <constraint firstItem="T8j-gX-HQZ" firstAttribute="leading" secondItem="jPx-eH-c2S" secondAttribute="leading" constant="40" id="v3e-He-0Sh"/>
-                                                <constraint firstItem="T8j-gX-HQZ" firstAttribute="top" secondItem="jPx-eH-c2S" secondAttribute="top" constant="20" id="v85-ak-nGz"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="rkV-jC-tTs" secondAttribute="bottom" id="wJM-Lw-H9T"/>
+                                                <constraint firstItem="STK-Cw-1By" firstAttribute="top" secondItem="Md6-Nq-ERc" secondAttribute="top" constant="15" id="OiO-xC-QYX"/>
+                                                <constraint firstAttribute="trailing" secondItem="STK-Cw-1By" secondAttribute="trailing" constant="40" id="T5c-DM-4CG"/>
+                                                <constraint firstItem="STK-Cw-1By" firstAttribute="leading" secondItem="Md6-Nq-ERc" secondAttribute="leading" constant="40" id="bFM-Xr-TcA"/>
+                                                <constraint firstAttribute="bottom" secondItem="STK-Cw-1By" secondAttribute="bottom" constant="15" id="xiT-eh-j7e"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="124" id="fTH-KP-Ac5">
-                                        <rect key="frame" x="0.0" y="372" width="600" height="124"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="Tdr-Sn-B0H">
+                                        <rect key="frame" x="0.0" y="384" width="375" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fTH-KP-Ac5" id="BGd-Mp-TnE">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Tdr-Sn-B0H" id="GLn-XG-K05">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="l6O-iU-Deh">
-                                                    <rect key="frame" x="40" y="20" width="40" height="40"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="DDu-ZJ-lER">
+                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="27f-K8-QUC">
+                                                            <rect key="frame" x="0.0" y="0.0" width="295" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="4yu-jC-UXz">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="40" id="heF-QW-z6Q"/>
+                                                                        <constraint firstAttribute="width" constant="40" id="tiZ-lo-ugS"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nsm-QZ-YcV">
+                                                                    <rect key="frame" x="50" y="11" width="168" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6Y-da-Srh">
+                                                                    <rect key="frame" x="228" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="LNB-9D-Kgq">
+                                                                    <rect key="frame" x="281" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="guA-2J-wB7">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="eVB-K1-R8b"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="40" id="Wvu-NC-dmu"/>
-                                                        <constraint firstAttribute="width" constant="40" id="goR-UO-N7g"/>
+                                                        <constraint firstAttribute="trailing" secondItem="27f-K8-QUC" secondAttribute="trailing" id="CJy-xz-6Zt"/>
+                                                        <constraint firstItem="27f-K8-QUC" firstAttribute="leading" secondItem="DDu-ZJ-lER" secondAttribute="leading" id="JyM-0i-VoB"/>
                                                     </constraints>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="ceS-Mg-PrP">
-                                                    <rect key="frame" x="524" y="34" width="14" height="13"/>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a3U-of-sdv">
-                                                    <rect key="frame" x="108" y="31" width="74" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h3x-N2-MWJ">
-                                                    <rect key="frame" x="219" y="34" width="43" height="12"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3ZN-4l-hGa">
-                                                    <rect key="frame" x="40" y="57" width="498" height="59"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="59" id="z9M-6w-uYi"/>
-                                                    </constraints>
-                                                    <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="h3x-N2-MWJ" firstAttribute="centerY" secondItem="a3U-of-sdv" secondAttribute="centerY" id="879-Lf-sHE"/>
-                                                <constraint firstItem="l6O-iU-Deh" firstAttribute="top" secondItem="BGd-Mp-TnE" secondAttribute="top" constant="20" id="C4W-pg-781"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="3ZN-4l-hGa" secondAttribute="bottom" id="KIV-vm-vEj"/>
-                                                <constraint firstItem="a3U-of-sdv" firstAttribute="centerY" secondItem="l6O-iU-Deh" secondAttribute="centerY" id="N7q-ub-LKa"/>
-                                                <constraint firstAttribute="trailing" secondItem="ceS-Mg-PrP" secondAttribute="trailing" constant="62" id="Sfq-JU-4Nm"/>
-                                                <constraint firstItem="l6O-iU-Deh" firstAttribute="leading" secondItem="BGd-Mp-TnE" secondAttribute="leading" constant="40" id="VMR-N1-Xjl"/>
-                                                <constraint firstItem="ceS-Mg-PrP" firstAttribute="centerY" secondItem="l6O-iU-Deh" secondAttribute="centerY" id="fdg-23-M6H"/>
-                                                <constraint firstAttribute="trailing" secondItem="3ZN-4l-hGa" secondAttribute="trailing" constant="62" id="hmQ-iS-d5t"/>
-                                                <constraint firstItem="a3U-of-sdv" firstAttribute="leading" secondItem="l6O-iU-Deh" secondAttribute="trailing" constant="28" id="o1q-GY-Lns"/>
-                                                <constraint firstItem="3ZN-4l-hGa" firstAttribute="leading" secondItem="BGd-Mp-TnE" secondAttribute="leading" constant="40" id="oCn-vE-6YT"/>
-                                                <constraint firstItem="h3x-N2-MWJ" firstAttribute="leading" secondItem="a3U-of-sdv" secondAttribute="trailing" constant="37" id="wku-gF-N0I"/>
+                                                <constraint firstItem="DDu-ZJ-lER" firstAttribute="top" secondItem="GLn-XG-K05" secondAttribute="top" constant="15" id="l1S-IL-jMj"/>
+                                                <constraint firstAttribute="bottom" secondItem="DDu-ZJ-lER" secondAttribute="bottom" constant="15" id="mWj-0T-I4l"/>
+                                                <constraint firstItem="DDu-ZJ-lER" firstAttribute="leading" secondItem="GLn-XG-K05" secondAttribute="leading" constant="40" id="pvZ-k7-1w4"/>
+                                                <constraint firstAttribute="trailing" secondItem="DDu-ZJ-lER" secondAttribute="trailing" constant="40" id="wdR-TG-u4d"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="124" id="irZ-0L-X9r">
-                                        <rect key="frame" x="0.0" y="496" width="600" height="124"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="DKC-ay-0W5">
+                                        <rect key="frame" x="0.0" y="514" width="375" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="irZ-0L-X9r" id="t3x-Eb-ktg">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DKC-ay-0W5" id="OvL-k3-UIL">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face1" translatesAutoresizingMaskIntoConstraints="NO" id="SY0-ki-F5U">
-                                                    <rect key="frame" x="40" y="20" width="40" height="40"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="STI-xc-qal">
+                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="YWJ-Pq-HUf">
+                                                            <rect key="frame" x="0.0" y="0.0" width="295" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face1" translatesAutoresizingMaskIntoConstraints="NO" id="Uz6-PY-MeW">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="40" id="avr-xK-V22"/>
+                                                                        <constraint firstAttribute="width" constant="40" id="dgi-bt-ecS"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Amada Iin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7OF-et-epa">
+                                                                    <rect key="frame" x="50" y="11" width="168" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xP4-cS-081">
+                                                                    <rect key="frame" x="228" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="C86-X3-gRu">
+                                                                    <rect key="frame" x="281" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="v80-2F-1zn">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="nvf-wL-GDB"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="40" id="1XW-AC-9LK"/>
-                                                        <constraint firstAttribute="height" constant="40" id="jDR-B8-a7U"/>
+                                                        <constraint firstAttribute="trailing" secondItem="YWJ-Pq-HUf" secondAttribute="trailing" id="5ym-ch-XVe"/>
+                                                        <constraint firstItem="YWJ-Pq-HUf" firstAttribute="leading" secondItem="STI-xc-qal" secondAttribute="leading" id="mJk-x2-SxR"/>
                                                     </constraints>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="g7r-dJ-em9">
-                                                    <rect key="frame" x="524" y="34" width="14" height="13"/>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amada Iin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0sx-fO-Xiy">
-                                                    <rect key="frame" x="108" y="31" width="68" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SVA-lD-IQs">
-                                                    <rect key="frame" x="213" y="34" width="43" height="12"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kYn-LQ-ReD">
-                                                    <rect key="frame" x="40" y="57" width="498" height="59"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="59" id="sMt-dP-LYh"/>
-                                                    </constraints>
-                                                    <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="SVA-lD-IQs" firstAttribute="centerY" secondItem="0sx-fO-Xiy" secondAttribute="centerY" id="2jW-fL-D7T"/>
-                                                <constraint firstAttribute="trailing" secondItem="g7r-dJ-em9" secondAttribute="trailing" constant="62" id="ChQ-bB-Cik"/>
-                                                <constraint firstItem="0sx-fO-Xiy" firstAttribute="centerY" secondItem="SY0-ki-F5U" secondAttribute="centerY" id="Faj-Bw-0Tu"/>
-                                                <constraint firstItem="kYn-LQ-ReD" firstAttribute="leading" secondItem="t3x-Eb-ktg" secondAttribute="leading" constant="40" id="HLb-38-S1u"/>
-                                                <constraint firstAttribute="trailing" secondItem="kYn-LQ-ReD" secondAttribute="trailing" constant="62" id="HzA-Nb-vXy"/>
-                                                <constraint firstItem="g7r-dJ-em9" firstAttribute="centerY" secondItem="SY0-ki-F5U" secondAttribute="centerY" id="KEY-Pc-yZs"/>
-                                                <constraint firstItem="SY0-ki-F5U" firstAttribute="leading" secondItem="t3x-Eb-ktg" secondAttribute="leading" constant="40" id="NZg-9p-Sb1"/>
-                                                <constraint firstItem="0sx-fO-Xiy" firstAttribute="leading" secondItem="SY0-ki-F5U" secondAttribute="trailing" constant="28" id="Xe5-9G-9vl"/>
-                                                <constraint firstItem="SY0-ki-F5U" firstAttribute="top" secondItem="t3x-Eb-ktg" secondAttribute="top" constant="20" id="YyV-BS-5UD"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="kYn-LQ-ReD" secondAttribute="bottom" id="oHX-7c-bG2"/>
-                                                <constraint firstItem="SVA-lD-IQs" firstAttribute="leading" secondItem="0sx-fO-Xiy" secondAttribute="trailing" constant="37" id="xkH-1T-7dm"/>
+                                                <constraint firstItem="STI-xc-qal" firstAttribute="top" secondItem="OvL-k3-UIL" secondAttribute="top" constant="15" id="1Wt-eA-mfs"/>
+                                                <constraint firstAttribute="bottom" secondItem="STI-xc-qal" secondAttribute="bottom" constant="15" id="Gcc-F3-tlL"/>
+                                                <constraint firstAttribute="trailing" secondItem="STI-xc-qal" secondAttribute="trailing" constant="40" id="leW-dt-mEv"/>
+                                                <constraint firstItem="STI-xc-qal" firstAttribute="leading" secondItem="OvL-k3-UIL" secondAttribute="leading" constant="40" id="mhF-9Y-V2L"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="124" id="Fj4-n4-S6M">
-                                        <rect key="frame" x="0.0" y="620" width="600" height="124"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="Bem-uK-CGC">
+                                        <rect key="frame" x="0.0" y="644" width="375" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Fj4-n4-S6M" id="D8J-AG-YUN">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bem-uK-CGC" id="wC3-Hh-anO">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="dRk-IE-zXs">
-                                                    <rect key="frame" x="40" y="20" width="40" height="40"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="tMM-s3-OKo">
+                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="TFL-At-uyI">
+                                                            <rect key="frame" x="0.0" y="0.0" width="295" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face2" translatesAutoresizingMaskIntoConstraints="NO" id="QOG-Ub-YqG">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="40" id="7lU-qa-EHL"/>
+                                                                        <constraint firstAttribute="width" constant="40" id="XYT-JZ-AY1"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ReU-Mu-iaN">
+                                                                    <rect key="frame" x="50" y="11" width="168" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zzn-X1-aOV">
+                                                                    <rect key="frame" x="228" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="PsA-nw-Zed">
+                                                                    <rect key="frame" x="281" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="qtA-cn-iTh">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="d7O-23-tUP"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="40" id="KNl-fy-6Ga"/>
-                                                        <constraint firstAttribute="width" constant="40" id="hN8-5E-akX"/>
+                                                        <constraint firstItem="TFL-At-uyI" firstAttribute="leading" secondItem="tMM-s3-OKo" secondAttribute="leading" id="5AL-z3-8xe"/>
+                                                        <constraint firstAttribute="trailing" secondItem="TFL-At-uyI" secondAttribute="trailing" id="Wab-Pf-VgL"/>
                                                     </constraints>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="hz8-Cp-lQj">
-                                                    <rect key="frame" x="524" y="34" width="14" height="13"/>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Peter Allan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YjL-xf-PcV">
-                                                    <rect key="frame" x="108" y="31" width="74" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J4t-pX-zbM">
-                                                    <rect key="frame" x="219" y="34" width="43" height="12"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q6w-vY-gMp">
-                                                    <rect key="frame" x="40" y="57" width="498" height="59"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="59" id="T4M-G7-7hc"/>
-                                                    </constraints>
-                                                    <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="Q6w-vY-gMp" firstAttribute="leading" secondItem="D8J-AG-YUN" secondAttribute="leading" constant="40" id="1ka-fN-GDR"/>
-                                                <constraint firstItem="dRk-IE-zXs" firstAttribute="leading" secondItem="D8J-AG-YUN" secondAttribute="leading" constant="40" id="7Oe-Rd-NXO"/>
-                                                <constraint firstItem="hz8-Cp-lQj" firstAttribute="centerY" secondItem="dRk-IE-zXs" secondAttribute="centerY" id="C2R-V0-FlH"/>
-                                                <constraint firstItem="J4t-pX-zbM" firstAttribute="leading" secondItem="YjL-xf-PcV" secondAttribute="trailing" constant="37" id="DG5-6g-aw8"/>
-                                                <constraint firstItem="dRk-IE-zXs" firstAttribute="top" secondItem="D8J-AG-YUN" secondAttribute="top" constant="20" id="FvH-zN-qew"/>
-                                                <constraint firstItem="J4t-pX-zbM" firstAttribute="centerY" secondItem="YjL-xf-PcV" secondAttribute="centerY" id="JiC-Tf-VdR"/>
-                                                <constraint firstAttribute="trailing" secondItem="hz8-Cp-lQj" secondAttribute="trailing" constant="62" id="LWy-zf-18F"/>
-                                                <constraint firstItem="YjL-xf-PcV" firstAttribute="leading" secondItem="dRk-IE-zXs" secondAttribute="trailing" constant="28" id="PDn-rh-K7o"/>
-                                                <constraint firstAttribute="trailing" secondItem="Q6w-vY-gMp" secondAttribute="trailing" constant="62" id="X6j-C7-AtW"/>
-                                                <constraint firstItem="YjL-xf-PcV" firstAttribute="centerY" secondItem="dRk-IE-zXs" secondAttribute="centerY" id="jkE-J3-oHA"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="Q6w-vY-gMp" secondAttribute="bottom" id="nTe-QJ-NrE"/>
+                                                <constraint firstAttribute="trailing" secondItem="tMM-s3-OKo" secondAttribute="trailing" constant="40" id="0OQ-7D-Xjo"/>
+                                                <constraint firstItem="tMM-s3-OKo" firstAttribute="top" secondItem="wC3-Hh-anO" secondAttribute="top" constant="15" id="Aqq-GD-5qX"/>
+                                                <constraint firstItem="tMM-s3-OKo" firstAttribute="leading" secondItem="wC3-Hh-anO" secondAttribute="leading" constant="40" id="Lz1-G1-EfS"/>
+                                                <constraint firstAttribute="bottom" secondItem="tMM-s3-OKo" secondAttribute="bottom" constant="15" id="g3Y-GA-ZAk"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="130" id="3rA-ws-KnH">
+                                        <rect key="frame" x="0.0" y="774" width="375" height="130"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3rA-ws-KnH" id="vNS-El-lEA">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="130"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="dHy-no-3dG">
+                                                    <rect key="frame" x="0.0" y="15" width="0.0" height="100"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="qg6-9G-buN">
+                                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="40"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="face1" translatesAutoresizingMaskIntoConstraints="NO" id="d7e-fT-v2a">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="40" id="6Ky-QD-1rh"/>
+                                                                        <constraint firstAttribute="width" constant="40" id="R3O-gp-WGo"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Amada Iin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dsG-zh-ZDw">
+                                                                    <rect key="frame" x="0.0" y="11" width="0.0" height="18"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                                    <color key="textColor" red="0.41960784309999999" green="0.41960784309999999" blue="0.41960784309999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FEB 14th" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="37E-Ih-nze">
+                                                                    <rect key="frame" x="0.0" y="14" width="43" height="12"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                    <color key="textColor" red="0.76470588240000004" green="0.76470588240000004" blue="0.76470588240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="heand" translatesAutoresizingMaskIntoConstraints="NO" id="I3D-43-QUr">
+                                                                    <rect key="frame" x="0.0" y="13.5" width="14" height="13"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="uhH-HH-oP4">
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="60" id="kTR-Ho-zi0"/>
+                                                            </constraints>
+                                                            <string key="text">The federal beach atc requires states that receive funding to develop a risk-based beach evaluation and classification plan and apply it to</string>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                            <color key="textColor" red="0.4431372549" green="0.4431372549" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="trailing" secondItem="qg6-9G-buN" secondAttribute="trailing" id="Pjy-os-XZx"/>
+                                                        <constraint firstItem="qg6-9G-buN" firstAttribute="leading" secondItem="dHy-no-3dG" secondAttribute="leading" id="lZi-8T-Hep"/>
+                                                    </constraints>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="dHy-no-3dG" firstAttribute="leading" secondItem="vNS-El-lEA" secondAttribute="leading" constant="40" id="1Pl-pq-EEl"/>
+                                                <constraint firstAttribute="trailing" secondItem="dHy-no-3dG" secondAttribute="trailing" constant="40" id="K29-x8-3Dt"/>
+                                                <constraint firstAttribute="bottom" secondItem="dHy-no-3dG" secondAttribute="bottom" constant="15" id="nC7-OP-5iZ"/>
+                                                <constraint firstItem="dHy-no-3dG" firstAttribute="top" secondItem="vNS-El-lEA" secondAttribute="top" constant="15" id="w4v-Gg-Zqa"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -428,22 +529,23 @@
                             <outlet property="delegate" destination="7RW-i0-HfN" id="28D-Ct-5A9"/>
                         </connections>
                     </tableView>
+                    <toolbarItems/>
                     <navigationItem key="navigationItem" id="9zG-W9-jGP">
                         <nil key="title"/>
                         <barButtonItem key="leftBarButtonItem" image="searchIcon" id="sSw-AG-wrF"/>
                         <view key="titleView" contentMode="scaleToFill" id="qyb-Fh-aIr" userLabel="Item View">
-                            <rect key="frame" x="180" y="6" width="240" height="33"/>
+                            <rect key="frame" x="67.5" y="5.5" width="240" height="33"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Title" translatesAutoresizingMaskIntoConstraints="NO" id="a24-t2-9jd">
-                                    <rect key="frame" x="95" y="9" width="51" height="16"/>
+                                    <rect key="frame" x="94.5" y="8.5" width="51" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="5Zr-Wx-iQB"/>
                                         <constraint firstAttribute="width" constant="51" id="RtX-4m-x9W"/>
                                     </constraints>
                                 </imageView>
                             </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="a24-t2-9jd" firstAttribute="centerX" secondItem="qyb-Fh-aIr" secondAttribute="centerX" id="sdW-OO-2BS"/>
                                 <constraint firstItem="a24-t2-9jd" firstAttribute="centerY" secondItem="qyb-Fh-aIr" secondAttribute="centerY" id="xKF-DL-knz"/>
@@ -455,6 +557,7 @@
                             </connections>
                         </barButtonItem>
                     </navigationItem>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="koT-TQ-RUs" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -468,8 +571,10 @@
         <image name="face1" width="40" height="39"/>
         <image name="face2" width="40" height="39"/>
         <image name="heand" width="14" height="13"/>
+        <image name="locationButton" width="20" height="20"/>
         <image name="map" width="375" height="124"/>
         <image name="searchIcon" width="20" height="20"/>
         <image name="stars" width="77" height="11"/>
     </resources>
+    <color key="tintColor" red="0.97429201227993889" green="0.97273087832317329" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>

DemoExpandingCollection/DemoExpandingCollection/Constants/Images.swift

@@ -1,35 +1,60 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/AliSoftware/SwiftGen
 
-import Foundation
-import UIKit
+#if os(iOS) || os(tvOS) || os(watchOS)
+    import UIKit.UIImage
+    typealias Image = UIImage
+#elseif os(OSX)
+    import AppKit.NSImage
+    typealias Image = NSImage
+#endif
 
-extension UIImage {
-  enum Asset: String {
-    case BackgroundImage = "BackgroundImage"
-    case CloseButton = "CloseButton"
-    case Dots = "dots"
-    case Face1 = "face1"
-    case Face2 = "face2"
-    case Heand = "heand"
-    case Icons = "icons"
-    case Image = "image"
-    case Item0 = "item0"
-    case Item1 = "item1"
-    case Item2 = "item2"
-    case Item3 = "item3"
-    case LocationButton = "locationButton"
-    case Map = "map"
-    case PinIcon = "pinIcon"
-    case SearchIcon = "searchIcon"
-    case Stars = "stars"
-    case Title = "Title"
+// swiftlint:disable file_length
+// swiftlint:disable line_length
 
-    var image: UIImage {
-      return UIImage(asset: self)
+// swiftlint:disable type_body_length
+enum Asset: String {
+    case backgroundImage = "BackgroundImage"
+    case closeButton = "CloseButton"
+    case dots
+    case face1
+    case face2
+    case heand
+    case icons
+    case image
+    case item0
+    case item1
+    case item2
+    case item3
+    case locationButton
+    case map
+    case pinIcon
+    case searchIcon
+    case stars
+    case title = "Title"
+
+    var image: Image {
+        let bundle = Bundle(for: BundleToken.self)
+        #if os(iOS) || os(tvOS) || os(watchOS)
+            let image = Image(named: rawValue, in: bundle, compatibleWith: nil)
+        #elseif os(OSX)
+            let image = bundle.image(forResource: rawValue)
+        #endif
+        guard let result = image else { fatalError("Unable to load image \(rawValue).") }
+        return result
     }
-  }
-
-  convenience init!(asset: Asset) {
-    self.init(named: asset.rawValue)
-  }
 }
+
+// swiftlint:enable type_body_length
+
+extension Image {
+    convenience init!(asset: Asset) {
+        #if os(iOS) || os(tvOS) || os(watchOS)
+            let bundle = Bundle(for: BundleToken.self)
+            self.init(named: asset.rawValue, in: bundle, compatibleWith: nil)
+        #elseif os(OSX)
+            self.init(named: asset.rawValue)
+        #endif
+    }
+}
+
+private final class BundleToken {}

DemoExpandingCollection/DemoExpandingCollection/Helpers/CollectionViewHelper/CollectionViewHelper.swift

@@ -10,25 +10,25 @@ import UIKit
 
 extension UICollectionView {
 
-  func getReusableCellWithIdentifier<T: UICollectionViewCell where T: CollectionViewCellIdentifiable>(indexPath: NSIndexPath) -> T {
-    guard let cell = dequeueReusableCellWithReuseIdentifier(T.cellIdentifier, forIndexPath: indexPath) as? T else {
-      fatalError("Couldn't instantiate view controller with identifier \(T.cellIdentifier) ")
+    func getReusableCellWithIdentifier<T: UICollectionViewCell>(_ indexPath: IndexPath) -> T {
+        guard let cell = dequeueReusableCell(withReuseIdentifier: T.cellIdentifier, for: indexPath) as? T else {
+            fatalError("Couldn't instantiate view controller with identifier \(T.cellIdentifier) ")
+        }
+
+        return cell
     }
-    
-    return cell
-  }
 }
 
 // MARK: UITableViewCell
 
 protocol CollectionViewCellIdentifiable {
-  static var cellIdentifier: String { get }
+    static var cellIdentifier: String { get }
 }
 
 extension CollectionViewCellIdentifiable where Self: UICollectionViewCell {
-  static var cellIdentifier: String {
-    return String(self)
-  }
+    static var cellIdentifier: String {
+        return String(describing: self)
+    }
 }
 
-extension UICollectionViewCell : CollectionViewCellIdentifiable { }
+extension UICollectionViewCell: CollectionViewCellIdentifiable {}

DemoExpandingCollection/DemoExpandingCollection/Helpers/StoryboardHelper/StoryboardHelper.swift

@@ -9,38 +9,38 @@
 import UIKit
 
 extension UIStoryboard {
-  
-  enum Storyboard : String {
-    case Main
-  }
-  
-  convenience init(storyboard: Storyboard, bundle: NSBundle? = nil) {
-    self.init(name: storyboard.rawValue, bundle: bundle)
-  }
-  
-  class func storyboard(storyboard: Storyboard, bundle: NSBundle? = nil) -> UIStoryboard {
-    return UIStoryboard(name: storyboard.rawValue, bundle: bundle)
-  }
-  
-  func instantiateViewController<T: UIViewController where T: StoryboardIdentifiable>() -> T {
-    guard let viewController = instantiateViewControllerWithIdentifier(T.storyboardIdentifier) as? T else {
-      fatalError("Couldn't instantiate view controller with identifier \(T.storyboardIdentifier) ")
+
+    enum Storyboard: String {
+        case Main
+    }
+
+    convenience init(storyboard: Storyboard, bundle: Bundle? = nil) {
+        self.init(name: storyboard.rawValue, bundle: bundle)
+    }
+
+    class func storyboard(_ storyboard: Storyboard, bundle: Bundle? = nil) -> UIStoryboard {
+        return UIStoryboard(name: storyboard.rawValue, bundle: bundle)
+    }
+
+    func instantiateViewController<T: UIViewController>() -> T {
+        guard let viewController = self.instantiateViewController(withIdentifier: T.storyboardIdentifier) as? T else {
+            fatalError("Couldn't instantiate view controller with identifier \(T.storyboardIdentifier) ")
+        }
+
+        return viewController
     }
-    
-    return viewController
-  }
 }
 
-extension UIViewController : StoryboardIdentifiable { }
+extension UIViewController: StoryboardIdentifiable {}
 
 // MARK: identifiable
 
 protocol StoryboardIdentifiable {
-  static var storyboardIdentifier: String { get }
+    static var storyboardIdentifier: String { get }
 }
 
 extension StoryboardIdentifiable where Self: UIViewController {
-  static var storyboardIdentifier: String {
-    return String(self)
-  }
+    static var storyboardIdentifier: String {
+        return String(describing: self)
+    }
 }

DemoExpandingCollection/DemoExpandingCollection/ViewControllers/DemoTableViewController/DemoTableViewController.swift

@@ -9,59 +9,60 @@
 import UIKit
 
 class DemoTableViewController: ExpandingTableViewController {
-  
-  private var scrollOffsetY: CGFloat = 0
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    configureNavBar()
-    let image1 = UIImage.Asset.BackgroundImage.image
-    tableView.backgroundView = UIImageView(image: image1)
-  }
+
+    fileprivate var scrollOffsetY: CGFloat = 0
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        configureNavBar()
+        let image1 = Asset.backgroundImage.image
+        tableView.backgroundView = UIImageView(image: image1)
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+    }
 }
+
 // MARK: Helpers
 
 extension DemoTableViewController {
-  
-  private func configureNavBar() {
-    navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.imageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
-    navigationItem.rightBarButtonItem?.image = navigationItem.rightBarButtonItem?.image!.imageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
-  }
+
+    fileprivate func configureNavBar() {
+        navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
+        navigationItem.rightBarButtonItem?.image = navigationItem.rightBarButtonItem?.image!.withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
+    }
 }
 
 // MARK: Actions
 
 extension DemoTableViewController {
-  
-  @IBAction func backButtonHandler(sender: AnyObject) {
-    // buttonAnimation
-    let viewControllers: [DemoViewController?] = navigationController?.viewControllers.map { $0 as? DemoViewController } ?? []
 
-    for viewController in viewControllers {
-      if let rightButton = viewController?.navigationItem.rightBarButtonItem as? AnimatingBarButton {
-        rightButton.animationSelected(false)
-      }
+    @IBAction func backButtonHandler(_: AnyObject) {
+        // buttonAnimation
+        let viewControllers: [DemoViewController?] = navigationController?.viewControllers.map { $0 as? DemoViewController } ?? []
+
+        for viewController in viewControllers {
+            if let rightButton = viewController?.navigationItem.rightBarButtonItem as? AnimatingBarButton {
+                rightButton.animationSelected(false)
+            }
+        }
+        popTransitionAnimation()
     }
-    popTransitionAnimation()
-  }
 }
 
 // MARK: UIScrollViewDelegate
 
 extension DemoTableViewController {
-  
-  override func scrollViewDidScroll(scrollView: UIScrollView) {
-//    if scrollView.contentOffset.y < -25 {
-//      // buttonAnimation
-//      let viewControllers: [DemoViewController?] = navigationController?.viewControllers.map { $0 as? DemoViewController } ?? []
-//
-//      for viewController in viewControllers {
-//        if let rightButton = viewController?.navigationItem.rightBarButtonItem as? AnimatingBarButton {
-//          rightButton.animationSelected(false)
-//        }
-//      }
-//      popTransitionAnimation()
-//    }
-    
-    scrollOffsetY = scrollView.contentOffset.y
-  }
+
+    override func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if scrollView.contentOffset.y < -25 , let navigationController = navigationController {
+            // buttonAnimation
+            for case let viewController as DemoViewController in navigationController.viewControllers {
+                if case let rightButton as AnimatingBarButton = viewController.navigationItem.rightBarButtonItem {
+                    rightButton.animationSelected(false)
+                }
+            }
+            popTransitionAnimation()
+        }
+        scrollOffsetY = scrollView.contentOffset.y
+    }
 }

DemoExpandingCollection/DemoExpandingCollection/ViewControllers/DemoViewController/Cells/DemoCollectionViewCell.swift

@@ -9,15 +9,15 @@
 import UIKit
 
 class DemoCollectionViewCell: BasePageCollectionCell {
-  
-  @IBOutlet weak var backgroundImageView: UIImageView!
-  @IBOutlet weak var customTitle: UILabel!
-  
+
+    @IBOutlet var backgroundImageView: UIImageView!
+    @IBOutlet var customTitle: UILabel!
+
     override func awakeFromNib() {
         super.awakeFromNib()
-      
-      customTitle.layer.shadowRadius = 2
-      customTitle.layer.shadowOffset = CGSize(width: 0, height: 3)
-      customTitle.layer.shadowOpacity = 0.2
+
+        customTitle.layer.shadowRadius = 2
+        customTitle.layer.shadowOffset = CGSize(width: 0, height: 3)
+        customTitle.layer.shadowOpacity = 0.2
     }
 }

DemoExpandingCollection/DemoExpandingCollection/ViewControllers/DemoViewController/Cells/DemoCollectionViewCell.xib

@@ -1,8 +1,9 @@
 <?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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,45 +13,40 @@
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rbd-6U-uYZ">
-                        <rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons" translatesAutoresizingMaskIntoConstraints="NO" id="7zK-Le-Npw">
-                                <rect key="frame" x="20" y="287" width="116" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="116" id="7hq-gd-WaT"/>
                                     <constraint firstAttribute="height" constant="40" id="cUH-6u-zMD"/>
                                 </constraints>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dots" translatesAutoresizingMaskIntoConstraints="NO" id="Au6-h8-xBa">
-                                <rect key="frame" x="228" y="298" width="4" height="19"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="19" id="KJW-6L-1Ol"/>
                                     <constraint firstAttribute="width" constant="4" id="YcW-cL-JpF"/>
                                 </constraints>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stars" translatesAutoresizingMaskIntoConstraints="NO" id="l9V-6B-rdj">
-                                <rect key="frame" x="159" y="266" width="77" height="12"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="12" id="Nl5-u6-NGX"/>
                                     <constraint firstAttribute="width" constant="77" id="NwE-fo-yyB"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NO. 7911847" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMH-Qa-ClW">
-                                <rect key="frame" x="24" y="265" width="68" height="14"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                <color key="textColor" red="0.49803921568627452" green="0.51764705882352935" blue="0.53725490196078429" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.49803921568627452" green="0.51764705882352935" blue="0.53725490196078429" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="La Crescenta-Montrose, CA91020" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eC4-wU-lTH">
-                                <rect key="frame" x="39" y="240" width="179" height="14"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                <color key="textColor" red="0.49803921569999998" green="0.51764705879999995" blue="0.53725490200000003" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.49803921569999998" green="0.51764705879999995" blue="0.53725490200000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Au6-h8-xBa" firstAttribute="top" secondItem="l9V-6B-rdj" secondAttribute="bottom" constant="20" id="1qd-Em-ZT9"/>
                             <constraint firstItem="pMH-Qa-ClW" firstAttribute="leading" secondItem="rbd-6U-uYZ" secondAttribute="leading" constant="24" id="7zn-VD-NCK"/>
@@ -67,33 +63,27 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4h2-Xv-xjU">
-                        <rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="item0" translatesAutoresizingMaskIntoConstraints="NO" id="9FK-FA-F0l">
-                                <rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
-                            </imageView>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="item0" translatesAutoresizingMaskIntoConstraints="NO" id="9FK-FA-F0l"/>
                             <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ATCOASTAL" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XFh-D7-eSl">
-                                <rect key="frame" x="62" y="10" width="132" height="29"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <bool key="isElement" value="NO"/>
                                 </accessibility>
                                 <fontDescription key="fontDescription" type="system" pointSize="24"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
-                                <color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="0.076029349662162168" colorSpace="calibratedRGB"/>
+                                <color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="0.076029349662162168" colorSpace="custom" customColorSpace="sRGB"/>
                                 <size key="shadowOffset" width="0.0" height="0.0"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oce-vs-fcR" userLabel="LeftView">
-                                <rect key="frame" x="8" y="293" width="110" height="32"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NORTH LAT 36" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZG8-y8-Dfi">
-                                        <rect key="frame" x="13" y="9" width="85" height="15"/>
                                         <fontDescription key="fontDescription" type="system" weight="thin" pointSize="12"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" red="1" green="0.2070791421" blue="0.80130883779999995" alpha="0.0" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="1" green="0.2070791421" blue="0.80130883779999995" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="ZG8-y8-Dfi" firstAttribute="centerX" secondItem="oce-vs-fcR" secondAttribute="centerX" id="5kH-aW-2nu"/>
                                     <constraint firstAttribute="height" constant="32" id="Ltd-P2-jig"/>
@@ -101,10 +91,8 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FVj-GH-Mhw" userLabel="CenterView">
-                                <rect key="frame" x="119" y="293" width="20" height="32"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pinIcon" translatesAutoresizingMaskIntoConstraints="NO" id="LFF-iv-Z1U">
-                                        <rect key="frame" x="2" y="7" width="15" height="18"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <accessibilityTraits key="traits" staticText="YES"/>
                                             <bool key="isElement" value="YES"/>
@@ -115,7 +103,7 @@
                                         </constraints>
                                     </imageView>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <accessibilityTraits key="traits" staticText="YES"/>
                                     <bool key="isElement" value="NO"/>
@@ -128,16 +116,14 @@
                                 </constraints>
                             </view>
                             <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EKg-XH-vNU" userLabel="RightView">
-                                <rect key="frame" x="140" y="293" width="110" height="32"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EAST LNG 97" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zmS-RM-seQ">
-                                        <rect key="frame" x="18" y="9" width="75" height="15"/>
                                         <fontDescription key="fontDescription" type="system" weight="thin" pointSize="12"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" red="1" green="0.20707914213106515" blue="0.8013088377544425" alpha="0.0" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="1" green="0.20707914213106515" blue="0.8013088377544425" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="zmS-RM-seQ" firstAttribute="centerY" secondItem="EKg-XH-vNU" secondAttribute="centerY" id="dxV-Q6-AU9"/>
                                     <constraint firstItem="zmS-RM-seQ" firstAttribute="centerX" secondItem="EKg-XH-vNU" secondAttribute="centerX" id="ls8-YV-n1Q"/>
@@ -145,7 +131,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="9FK-FA-F0l" firstAttribute="top" secondItem="4h2-Xv-xjU" secondAttribute="top" id="0HR-8P-WVW"/>
                             <constraint firstItem="EKg-XH-vNU" firstAttribute="leading" secondItem="FVj-GH-Mhw" secondAttribute="trailing" constant="1" id="6Bb-cJ-uQs"/>
@@ -166,9 +152,8 @@
                         </constraints>
                     </view>
                 </subviews>
-                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             </view>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="4h2-Xv-xjU" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" id="0xA-8H-CCG"/>
                 <constraint firstItem="rbd-6U-uYZ" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="6nN-mZ-xkq"/>
@@ -178,7 +163,7 @@
             <size key="customSize" width="275" height="575"/>
             <connections>
                 <outlet property="backConstraintY" destination="dmf-qy-2nS" id="szE-V2-yce"/>
-                <outlet property="backContainerView" destination="rbd-6U-uYZ" id="bk5-30-huH"/>
+                <outlet property="backContainerView" destination="rbd-6U-uYZ" id="fl2-yE-o3C"/>
                 <outlet property="backgroundImageView" destination="9FK-FA-F0l" id="kns-UF-jMo"/>
                 <outlet property="customTitle" destination="XFh-D7-eSl" id="eia-lY-ptu"/>
                 <outlet property="frontConstraintY" destination="0xA-8H-CCG" id="qOL-jY-lrP"/>

DemoExpandingCollection/DemoExpandingCollection/ViewControllers/DemoViewController/DemoViewController.swift

@@ -9,138 +9,136 @@
 import UIKit
 
 class DemoViewController: ExpandingViewController {
-  
-  typealias ItemInfo = (imageName: String, title: String)
-  private var cellsIsOpen = [Bool]()
-  private let items: [ItemInfo] = [("item0", "Boston"),("item1", "New York"),("item2", "San Francisco"),("item3", "Washington")]
-  
-  @IBOutlet weak var pageLabel: UILabel!
+
+    typealias ItemInfo = (imageName: String, title: String)
+    fileprivate var cellsIsOpen = [Bool]()
+    fileprivate let items: [ItemInfo] = [("item0", "Boston"), ("item1", "New York"), ("item2", "San Francisco"), ("item3", "Washington")]
+
+    @IBOutlet var pageLabel: UILabel!
 }
 
-// MARK: life cicle
+// MARK: - Lifecycle 🌎
 
 extension DemoViewController {
-  
-  override func viewDidLoad() {
-    itemSize = CGSize(width: 256, height: 335)
-    super.viewDidLoad()
-    
-    registerCell()
-    fillCellIsOpeenArry()
-    addGestureToView(collectionView!)
-    configureNavBar()
-  }
-}
 
-// MARK: Helpers 
+    override func viewDidLoad() {
+        itemSize = CGSize(width: 256, height: 460)
+        super.viewDidLoad()
 
+        registerCell()
+        fillCellIsOpenArray()
+        addGesture(to: collectionView!)
+        configureNavBar()
+    }
+}
+
+// MARK: Helpers
+
 extension DemoViewController {
-  
-  private func registerCell() {
-    let nib = UINib(nibName: String(DemoCollectionViewCell), bundle: nil)
-    collectionView?.registerNib(nib, forCellWithReuseIdentifier: String(DemoCollectionViewCell))
-  }
-  
-  private func fillCellIsOpeenArry() {
-    for _ in items {
-      cellsIsOpen.append(false)
+
+    fileprivate func registerCell() {
+
+        let nib = UINib(nibName: String(describing: DemoCollectionViewCell.self), bundle: nil)
+        collectionView?.register(nib, forCellWithReuseIdentifier: String(describing: DemoCollectionViewCell.self))
+    }
+
+    fileprivate func fillCellIsOpenArray() {
+        cellsIsOpen = Array(repeating: false, count: items.count)
+    }
+
+    fileprivate func getViewController() -> ExpandingTableViewController {
+        let storyboard = UIStoryboard(storyboard: .Main)
+        let toViewController: DemoTableViewController = storyboard.instantiateViewController()
+        return toViewController
+    }
+
+    fileprivate func configureNavBar() {
+        navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
     }
-  }
-  
-  private func getViewController() -> ExpandingTableViewController {
-    let storyboard = UIStoryboard(storyboard: .Main)
-    let toViewController: DemoTableViewController = storyboard.instantiateViewController()
-    return toViewController
-  }
-  
-  private func configureNavBar() {
-    navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.imageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
-  }
 }
 
 /// MARK: Gesture
-
 extension DemoViewController {
-  
-  private func addGestureToView(toView: UIView) {
-    let gesutereUp = Init(UISwipeGestureRecognizer(target: self, action: #selector(DemoViewController.swipeHandler(_:)))) {
-      $0.direction = .Up
-    }
-    
-    let gesutereDown = Init(UISwipeGestureRecognizer(target: self, action: #selector(DemoViewController.swipeHandler(_:)))) {
-      $0.direction = .Down
-    }
-    toView.addGestureRecognizer(gesutereUp)
-    toView.addGestureRecognizer(gesutereDown)
-  }
 
-  func swipeHandler(sender: UISwipeGestureRecognizer) {
-    let indexPath = NSIndexPath(forRow: currentIndex, inSection: 0)
-    guard let cell  = collectionView?.cellForItemAtIndexPath(indexPath) as? DemoCollectionViewCell else { return }
-    // double swipe Up transition
-    if cell.isOpened == true && sender.direction == .Up {
-      pushToViewController(getViewController())
-      
-      if let rightButton = navigationItem.rightBarButtonItem as? AnimatingBarButton {
-        rightButton.animationSelected(true)
-      }
+    fileprivate func addGesture(to view: UIView) {
+        let upGesture = Init(UISwipeGestureRecognizer(target: self, action: #selector(DemoViewController.swipeHandler(_:)))) {
+            $0.direction = .up
+        }
+
+        let downGesture = Init(UISwipeGestureRecognizer(target: self, action: #selector(DemoViewController.swipeHandler(_:)))) {
+            $0.direction = .down
+        }
+        view.addGestureRecognizer(upGesture)
+        view.addGestureRecognizer(downGesture)
+    }
+
+    @objc func swipeHandler(_ sender: UISwipeGestureRecognizer) {
+        let indexPath = IndexPath(row: currentIndex, section: 0)
+        guard let cell = collectionView?.cellForItem(at: indexPath) as? DemoCollectionViewCell else { return }
+        // double swipe Up transition
+        if cell.isOpened == true && sender.direction == .up {
+            pushToViewController(getViewController())
+
+            if let rightButton = navigationItem.rightBarButtonItem as? AnimatingBarButton {
+                rightButton.animationSelected(true)
+            }
+        }
+
+        let open = sender.direction == .up ? true : false
+        cell.cellIsOpen(open)
+        cellsIsOpen[indexPath.row] = cell.isOpened
     }
-    
-    let open = sender.direction == .Up ? true : false
-    cell.cellIsOpen(open)
-    cellsIsOpen[indexPath.row] = cell.isOpened
-  }
 }
 
-// MARK: UIScrollViewDelegate 
+// MARK: UIScrollViewDelegate
 
 extension DemoViewController {
-  
-  func scrollViewDidScroll(scrollView: UIScrollView) {
-    pageLabel.text = "\(currentIndex+1)/\(items.count)"
-  }
+
+    func scrollViewDidScroll(_: UIScrollView) {
+        pageLabel.text = "\(currentIndex + 1)/\(items.count)"
+    }
 }
 
 // MARK: UICollectionViewDataSource
 
 extension DemoViewController {
-  
-  override func collectionView(collectionView: UICollectionView, willDisplayCell cell: UICollectionViewCell, forItemAtIndexPath indexPath: NSIndexPath) {
-    super.collectionView(collectionView, willDisplayCell: cell, forItemAtIndexPath: indexPath)
-    guard let cell = cell as? DemoCollectionViewCell else { return }
 
-    let index = indexPath.row % items.count
-    let info = items[index]
-    cell.backgroundImageView?.image = UIImage(named: info.imageName)
-    cell.customTitle.text = info.title
-    cell.cellIsOpen(cellsIsOpen[index], animated: false)
-  }
-  
-  func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
-    guard let cell = collectionView.cellForItemAtIndexPath(indexPath) as? DemoCollectionViewCell
-          where currentIndex == indexPath.row else { return }
+    override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        super.collectionView(collectionView, willDisplay: cell, forItemAt: indexPath)
+        guard let cell = cell as? DemoCollectionViewCell else { return }
 
-    if cell.isOpened == false {
-      cell.cellIsOpen(true)
-    } else {
-      pushToViewController(getViewController())
-      
-      if let rightButton = navigationItem.rightBarButtonItem as? AnimatingBarButton {
-        rightButton.animationSelected(true)
-      }
+        let index = indexPath.row % items.count
+        let info = items[index]
+        cell.backgroundImageView?.image = UIImage(named: info.imageName)
+        cell.customTitle.text = info.title
+        cell.cellIsOpen(cellsIsOpen[index], animated: false)
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        guard let cell = collectionView.cellForItem(at: indexPath) as? DemoCollectionViewCell
+            , currentIndex == indexPath.row else { return }
+
+        if cell.isOpened == false {
+            cell.cellIsOpen(true)
+        } else {
+            pushToViewController(getViewController())
+
+            if let rightButton = navigationItem.rightBarButtonItem as? AnimatingBarButton {
+                rightButton.animationSelected(true)
+            }
+        }
     }
-  }
 }
 
 // MARK: UICollectionViewDataSource
 
 extension DemoViewController {
-  
-  override func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-    return items.count
-  }
-  
-  override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-    return collectionView.dequeueReusableCellWithReuseIdentifier(String(DemoCollectionViewCell), forIndexPath: indexPath)
-  }
+
+    override func collectionView(_: UICollectionView, numberOfItemsInSection _: Int) -> Int {
+        return items.count
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: DemoCollectionViewCell.self), for: indexPath)
+    }
 }

DemoExpandingCollection/DemoExpandingCollection/Views/AnimatingBarButton/AnimationBarButton.swift

@@ -8,79 +8,78 @@
 
 import UIKit
 
+fileprivate final class CustomView: UIView {
+    var onLayoutSubviews: () -> Void = {}
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        onLayoutSubviews()
+    }
+}
+
 class AnimatingBarButton: UIBarButtonItem, Rotatable {
-  
-  @IBInspectable var normalImageName: String = ""
-  @IBInspectable var selectedImageName: String = ""
-  
-  @IBInspectable var duration: Double = 1
-  
-  let normalView = UIImageView(frame: .zero)
-  let selectedView = UIImageView(frame: .zero)
+
+    @IBInspectable var normalImageName: String = ""
+    @IBInspectable var selectedImageName: String = ""
+
+    @IBInspectable var duration: Double = 1
+
+    let normalView = UIImageView(frame: .zero)
+    let selectedView = UIImageView(frame: .zero)
 }
 
 // MARK: life cicle
 
 extension AnimatingBarButton {
-  
-  override func awakeFromNib() {
-    super.awakeFromNib()
-    customView = UIView(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
-//    customView?.backgroundColor = .redColor()
-    
-    configurateImageViews()
-  }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        let view = CustomView(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
+        view.onLayoutSubviews = { [weak self] in self?.configurateImageViews() }
+        customView = view
+    }
 }
 
 // MARK: public
 
 extension AnimatingBarButton {
-  
-  func animationSelected(selected: Bool) {
-    if selected {
-      rotateAnimationFrom(normalView, toItem: selectedView, duration: duration)
-    } else {
-      rotateAnimationFrom(selectedView, toItem: normalView, duration: duration)
+
+    func animationSelected(_ selected: Bool) {
+        if selected {
+            rotateAnimationFrom(normalView, toItem: selectedView, duration: duration)
+        } else {
+            rotateAnimationFrom(selectedView, toItem: normalView, duration: duration)
+        }
     }
-  }
 }
 
 // MARK: Create
 
 extension AnimatingBarButton {
-  
-  private func configurateImageViews() {
-    configureImageView(normalView, imageName: normalImageName)
-    configureImageView(selectedView, imageName: selectedImageName)
-    
-    selectedView.alpha = 0
-//    normalView.hidden = true
-  }
 
-  private func configureImageView(imageView: UIImageView, imageName: String) {
-    guard let customView = customView else { return }
+    fileprivate func configurateImageViews() {
+        configureImageView(normalView, imageName: normalImageName)
+        configureImageView(selectedView, imageName: selectedImageName)
 
-    imageView.translatesAutoresizingMaskIntoConstraints = false
-    imageView.image = UIImage(named: imageName)
-    imageView.contentMode = .ScaleAspectFit
-//    imageView.backgroundColor = .greenColor()
-    
-//    imageView.layer.anchorPoint = CGPoint(x: 0.5, y: 0.5)
-    customView.addSubview(imageView)
-    
-    // add constraints
-    [(NSLayoutAttribute.CenterX, 12), (.CenterY, -1)].forEach { info in
-      (customView, imageView) >>>- {
-        $0.attribute = info.0
-        $0.constant = CGFloat(info.1)
-      }
+        selectedView.alpha = 0
     }
-    
-    [NSLayoutAttribute.Height, .Width].forEach { attribute in
-      imageView >>>- {
-        $0.attribute = attribute
-        $0.constant = 20
-      }
+
+    fileprivate func configureImageView(_ imageView: UIImageView, imageName: String) {
+        guard let customView = customView else { return }
+        guard let image = UIImage(named: imageName)?.withRenderingMode(UIImage.RenderingMode.alwaysTemplate) else { return }
+
+        imageView.image = image
+        imageView.contentMode = .scaleAspectFit
+        imageView.tintColor = tintColor
+
+        imageView.layer.shadowColor = UIColor.black.cgColor
+        imageView.layer.shadowRadius = 0.6
+        imageView.layer.shadowOffset = CGSize(width: 0, height: 1.5)
+        imageView.layer.shadowOpacity = 0.3
+
+        let x = (customView.bounds.size.width - image.size.width) / 2 + 12
+        let y = (customView.bounds.size.height - image.size.height) / 2
+        imageView.frame = CGRect(origin: CGPoint(x: x, y: y), size: image.size)
+        customView.addSubview(imageView)
     }
-  }
 }

DemoExpandingCollection/DemoExpandingCollection/Views/AnimatingBarButton/Animations/Rotatable.swift

@@ -10,33 +10,33 @@ import UIKit
 
 protocol Rotatable {
 
-  func rotateAnimationFrom(fromItem: UIView, toItem: UIView, duration: Double) 
+    func rotateAnimationFrom(_ fromItem: UIView, toItem: UIView, duration: Double)
 }
 
 extension Rotatable {
 
-  func rotateAnimationFrom(fromItem: UIView, toItem: UIView, duration: Double) {
-    
-    let fromRotate  = animationFrom(0, to: M_PI, key: "transform.rotation", duration: duration)
-    let fromOpacity = animationFrom(1, to: 0, key: "opacity", duration: duration)
+    func rotateAnimationFrom(_ fromItem: UIView, toItem: UIView, duration: Double) {
 
-    let toRotate    = animationFrom(-M_PI, to: 0, key: "transform.rotation", duration: duration)
-    let toOpacity   = animationFrom(0, to: 1, key: "opacity", duration: duration)
-    
-    fromItem.layer.addAnimation(fromRotate, forKey: nil)
-    fromItem.layer.addAnimation(fromOpacity, forKey: nil)
-    
-    toItem.layer.addAnimation(toRotate, forKey: nil)
-    toItem.layer.addAnimation(toOpacity, forKey: nil)
- }
-  
-  private func animationFrom(from: Double, to: Double, key: String, duration: Double) -> CABasicAnimation {
-    return Init(CABasicAnimation(keyPath: key)) {
-      $0.duration            = duration
-      $0.fromValue           = from
-      $0.toValue             = to
-      $0.fillMode            = kCAFillModeForwards
-      $0.removedOnCompletion = false
+        let fromRotate = animationFrom(0, to: Double.pi, key: "transform.rotation", duration: duration)
+        let fromOpacity = animationFrom(1, to: 0, key: "opacity", duration: duration)
+
+        let toRotate = animationFrom(-Double.pi, to: 0, key: "transform.rotation", duration: duration)
+        let toOpacity = animationFrom(0, to: 1, key: "opacity", duration: duration)
+
+        fromItem.layer.add(fromRotate, forKey: nil)
+        fromItem.layer.add(fromOpacity, forKey: nil)
+
+        toItem.layer.add(toRotate, forKey: nil)
+        toItem.layer.add(toOpacity, forKey: nil)
+    }
+
+    fileprivate func animationFrom(_ from: Double, to: Double, key: String, duration: Double) -> CABasicAnimation {
+        return Init(CABasicAnimation(keyPath: key)) {
+            $0.duration = duration
+            $0.fromValue = from
+            $0.toValue = to
+            $0.fillMode = CAMediaTimingFillMode.forwards
+            $0.isRemovedOnCompletion = false
+        }
     }
-  }
 }

DemoExpandingCollection/DemoExpandingCollectionTests/DemoExpandingCollectionTests.swift

@@ -1,35 +0,0 @@
-//
-//  DemoExpandingCollectionTests.swift
-//  DemoExpandingCollectionTests
-//
-//  Created by Alex K. on 25/05/16.
-//  Copyright © 2016 Alex K. All rights reserved.
-//
-
-import XCTest
-@testable import DemoExpandingCollection
-
-class DemoExpandingCollectionTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        measureBlock {
-            // Put the code you want to measure the time of here.
-        }
-    }
-}

DemoExpandingCollection/DemoExpandingCollectionTests/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>

README.md

@@ -1,25 +1,39 @@
-![header](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/header.png)
+![header](./header.png)
+<img src="https://github.com/Ramotion/expanding-collection/blob/master/expanding-collection.gif" width="600" height="450" />
+<br><br/>
+
 
 # expanding-collection
 
 [![Twitter](https://img.shields.io/badge/Twitter-@Ramotion-blue.svg?style=flat)](http://twitter.com/Ramotion)
 [![CocoaPods](https://img.shields.io/cocoapods/p/expanding-collection.svg)](https://cocoapods.org/pods/expanding-collection)
 [![CocoaPods](https://img.shields.io/cocoapods/v/expanding-collection.svg)](http://cocoapods.org/pods/expanding-collection)
-[![CocoaPods](https://img.shields.io/cocoapods/metrics/doc-percent/expanding-collection.svg)](https://cdn.rawgit.com/Ramotion/expanding-collection/master/docs/index.html)
-
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Ramotion/expanding-collection)
-[![Travis](https://travis-ci.org/Ramotion/elastic-pull-to-update.svg?branch=master)](https://travis-ci.org/Ramotion/elastic-pull-to-update)
+[![Travis](https://travis-ci.org/Ramotion/expanding-collection.svg?branch=master)](https://travis-ci.org/Ramotion/expanding-collection)
 [![codebeat badge](https://codebeat.co/badges/6a009992-5bf2-4730-aa35-f3b20ce7693d)](https://codebeat.co/projects/github-com-ramotion-expanding-collection)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://paypal.me/Ramotion)
 
-[shot on dribbble](https://dribbble.com/shots/2741477-iOS-Expanding-Collection-Open-Source):
-![Animation](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/preview.gif)
+# Check this library on other platforms:
+<a href="https://github.com/Ramotion/expanding-collection-android">
+<img src="https://github.com/ramotion/navigation-stack/raw/master/Android_Java@2x.png" width="178" height="81"></a>
 
-The [iPhone mockup](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) available [here](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection).
+## About
+This project is maintained by Ramotion, Inc.<br>
+We specialize in the designing and coding of custom UI for Mobile Apps and Websites.<br>
+
+**Looking for developers for your project?**<br>
+This project is maintained by Ramotion, Inc. We specialize in the designing and coding of custom UI for Mobile Apps and Websites.
+
+<a href="mailto:alex.a@ramotion.com?subject=Project%20inquiry%20from%20Github">
+<img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a> <br>
+
+
+The [iPhone mockup](https://store.ramotion.com/product/iphone-x-clay-mockups?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) available [here](https://store.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection).
 
 ## Requirements
 
-- iOS 8.0+
-- Xcode 7.3
+- iOS 9.0+
+- Xcode 9.0+
 
 ## Installation
 
@@ -29,6 +43,7 @@ or use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
 pod 'expanding-collection'
 ```
+
 or [Carthage](https://github.com/Carthage/Carthage) users can simply add to their `Cartfile`:
 ```
 github "Ramotion/expanding-collection"
@@ -37,7 +52,7 @@ github "Ramotion/expanding-collection"
 ## Usage
 
 ```swift
-import ExpandingCollection
+import expanding_collection
 ```
 
 #### Create CollectionViewCell
@@ -68,7 +83,7 @@ import ExpandingCollection
 
 ``` swift
 override func viewDidLoad() {
-    itemSize = CGSize(width: 214, height: 264)
+    itemSize = CGSize(width: 214, height: 460) //IMPORTANT!!! Height of open state cell
     super.viewDidLoad()
 
     // register cell
@@ -138,10 +153,18 @@ func scrollViewDidEndDecelerating(scrollView: UIScrollView) {
 2) Set header height default 236
 
 ``` swift
-override func viewDidLoad() {
-    super.viewDidLoad()
+override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+    super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
     headerHeight = ***
-}  
+}
+```
+OR
+
+``` swift
+required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    headerHeight = ***
+}
 ```
 
 3) Call the push method in YourViewController to YourTableViewController
@@ -155,14 +178,25 @@ override func viewDidLoad() {
 4) For back transition use `popTransitionAnimation()`
 
 
+This library is a part of a <a href="https://github.com/Ramotion/swift-ui-animation-components-and-libraries"><b>selection of our best UI open-source projects.</b></a>
+
 ## License
 
 Expanding collection is released under the MIT license.
 See [LICENSE](./LICENSE) for details.
 
-## About
-The project maintained by [app development agency](https://ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) [Ramotion Inc.](https://ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection)
-See our other [open-source projects](https://github.com/ramotion) or [hire](https://ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) us to design, develop, and grow your product.
+<br>
 
-[![Twitter URL](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=https://github.com/ramotion/expanding-collection)
-[![Twitter Follow](https://img.shields.io/twitter/follow/ramotion.svg?style=social)](https://twitter.com/ramotion)
+# Get the Showroom App for iOS to give it a try
+Try this UI component and more like this in our iOS app. Contact us if interested.
+
+<a href="https://itunes.apple.com/app/apple-store/id1182360240?pt=550053&ct=expanding-collection&mt=8" >
+<img src="https://github.com/ramotion/gliding-collection/raw/master/app_store@2x.png" width="117" height="34"></a>
+<a href="mailto:alex.a@ramotion.com?subject=Project%20inquiry%20from%20Github">
+<img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a>
+<br>
+<br>
+
+Follow us for the latest updates<br>
+<a href="https://goo.gl/rPFpid" >
+<img src="https://i.imgur.com/ziSqeSo.png/" width="156" height="28"></a>

Source/ExpandingTableViewController/ExpandingTableViewController.swift

@@ -9,58 +9,56 @@
 import UIKit
 
 /// Base class for UITableViewcontroller which have back transition method
-public class ExpandingTableViewController: UITableViewController {
-  
-  // MARK: Vars
-  /// The height of the table view header
-  public var headerHeight: CGFloat = 236
-  
-  var transitionDriver: TransitionDriver?
+open class ExpandingTableViewController: UITableViewController {
+
+    // MARK: Vars
+  /// The height of the table view header, set before transition
+    open var headerHeight: CGFloat = 236
+
+    var transitionDriver: TransitionDriver?
 }
 
-// MARK: Helpers 
+// MARK: Helpers
 
 extension ExpandingTableViewController {
-  
-  private func getScreen() -> UIImage? {
-    let height = (headerHeight - tableView.contentOffset.y) < 0 ? 0 : (headerHeight - tableView.contentOffset.y)
-    let backImageSize = CGSize(width: view.bounds.width, height: view.bounds.height - height + getTabBarHeight())
-    let backImageOrigin = CGPoint(x: 0, y: height + tableView.contentOffset.y)
-    return view.takeSnapshot(CGRect(origin: backImageOrigin, size: backImageSize))
-  }
-  
-  private func getTabBarHeight() -> CGFloat {
-    guard let navigationController = self.navigationController else {
-      return 0
-    }
-    
-    let insets = automaticallyAdjustsScrollViewInsets
-    let tabBarHeight =  insets == true ? navigationController.navigationBar.frame.size.height : 0
-    let stausBarHeight = insets == true ? UIApplication.sharedApplication().statusBarFrame.size.height : 0
-    return tabBarHeight + stausBarHeight
-  }
 
+    fileprivate func getScreen() -> UIImage? {
+        let height = (headerHeight - tableView.contentOffset.y) < 0 ? 0 : (headerHeight - tableView.contentOffset.y)
+        let backImageSize = CGSize(width: view.bounds.width, height: view.bounds.height - height + getTabBarHeight())
+        let backImageOrigin = CGPoint(x: 0, y: height + tableView.contentOffset.y)
+        return view.takeSnapshot(CGRect(origin: backImageOrigin, size: backImageSize))
+    }
+
+    fileprivate func getTabBarHeight() -> CGFloat {
+        guard let navigationController = self.navigationController else {
+            return 0
+        }
+
+        let insets = automaticallyAdjustsScrollViewInsets
+        let tabBarHeight = insets == true ? navigationController.navigationBar.frame.size.height : 0
+        let stausBarHeight = insets == true ? UIApplication.shared.statusBarFrame.size.height : 0
+        return tabBarHeight + stausBarHeight
+    }
 }
 
 // MARK: Methods
 
 extension ExpandingTableViewController {
-  
-  /**
-   Pops the top view controller from the navigation stack and updates the display with custom animation.
-   */
-  public func popTransitionAnimation() {
-    guard let transitionDriver = self.transitionDriver else {
-      return
-    }
-    
-    let backImage = getScreen()
-    var offset = tableView.contentOffset.y > headerHeight ? headerHeight : tableView.contentOffset.y
-    
-    offset += getTabBarHeight()
- 
-    transitionDriver.popTransitionAnimationContantOffset(offset, backImage: backImage)
-    self.navigationController?.popViewControllerAnimated(false)
-  }
 
-}
+    /**
+     Pops the top view controller from the navigation stack and updates the display with custom animation.
+     */
+    public func popTransitionAnimation() {
+        guard let transitionDriver = self.transitionDriver else {
+            return
+        }
+
+        let backImage = getScreen()
+        var offset = tableView.contentOffset.y > headerHeight ? headerHeight : tableView.contentOffset.y
+
+        offset += getTabBarHeight()
+
+        transitionDriver.popTransitionAnimationContantOffset(offset, backImage: backImage)
+        _ = navigationController?.popViewController(animated: false)
+    }
+}

Source/ExpandingViewController/CollectionView/Cells/BasePageCollectionCell.swift

@@ -9,283 +9,292 @@
 import UIKit
 
 /// Base class for UICollectionViewCell
-public class BasePageCollectionCell: UICollectionViewCell {
-  
-  /// Animation oposition offset when cell is open
-  @IBInspectable public var yOffset: CGFloat = 40
-  
-  // MARK: Constants
-  
-  struct Constants {
-    static let backContainer = "backContainerViewKey"
-    static let shadowView      = "shadowViewKey"
-    static let frontContainer  = "frontContainerKey"
+open class BasePageCollectionCell: UICollectionViewCell {
 
-    static let backContainerY  = "backContainerYKey"
-    static let frontContainerY = "frontContainerYKey"
-  }
-  
-  // MARK: Vars
+    /// DEPRECATED! Animation oposition offset when cell is open
+    @IBInspectable open var yOffset: CGFloat = 40
+    /// Spacing between centers of views
+    @IBInspectable open var ySpacing: CGFloat = CGFloat.greatestFiniteMagnitude
+    /// Additional height of back view, when it grows
+    @IBInspectable open var additionalHeight: CGFloat = CGFloat.greatestFiniteMagnitude
+    /// Additional width of back view, when it grows
+    @IBInspectable open var additionalWidth: CGFloat = CGFloat.greatestFiniteMagnitude
+    /// Should front view drow shadow to bottom or not
+    @IBInspectable open var dropShadow: Bool = true
 
-  /// The view used as the face of the cell must connectid from xib or storyboard.
-  @IBOutlet public weak var frontContainerView: UIView!
-  /// The view used as the back of the cell must connectid from xib or storyboard.
-  @IBOutlet public weak var backContainerView: UIView!
-  
-  /// constraints for backContainerView must connectid from xib or storyboard
-  @IBOutlet public weak var backConstraintY: NSLayoutConstraint!
-  /// constraints for frontContainerView must connectid from xib or storyboard
-  @IBOutlet public weak var frontConstraintY: NSLayoutConstraint!
-  
-  var shadowView: UIView?
-  
-  /// A Boolean value that indicates whether the cell is opened.
-  public var isOpened = false
-  
-  // MARK: inits
-  
-  /**
-   Initializes a UICollectionViewCell from data in a given unarchiver.
-   
-   - parameter aDecoder: An unarchiver object.
-   
-   - returns: An initialized UICollectionViewCell object.
-   */
-  required public init?(coder aDecoder: NSCoder) {
-    super.init(coder: aDecoder)
-    
-    configureOutletFromDecoder(aDecoder)
-  }
-  
-  /**
-   Initializes and returns a newly allocated view object with the specified frame rectangle.
-   
-   - parameter frame: The frame rectangle for the view
-   
-   - returns: An initialized UICollectionViewCell object.
-   */
-  override init(frame: CGRect) {
-    super.init(frame: frame)
-    
-    commonInit()
-  }
+    // MARK: Constants
+
+    struct Constants {
+        static let backContainer = "backContainerViewKey"
+        static let shadowView = "shadowViewKey"
+        static let frontContainer = "frontContainerKey"
+
+        static let backContainerY = "backContainerYKey"
+        static let frontContainerY = "frontContainerYKey"
+    }
+
+    // MARK: Vars
+
+    /// The view used as the face of the cell must connectid from xib or storyboard.
+    @IBOutlet open var frontContainerView: UIView!
+    /// The view used as the back of the cell must connectid from xib or storyboard.
+    @IBOutlet open var backContainerView: UIView!
+
+    /// constraints for backContainerView must connectid from xib or storyboard
+    @IBOutlet open var backConstraintY: NSLayoutConstraint!
+    /// constraints for frontContainerView must connectid from xib or storyboard
+    @IBOutlet open var frontConstraintY: NSLayoutConstraint!
+
+    var shadowView: UIView?
+
+    /// A Boolean value that indicates whether the cell is opened.
+    open var isOpened = false
+
+    // MARK: inits
+
+    /**
+     Initializes a UICollectionViewCell from data in a given unarchiver.
+
+     - parameter aDecoder: An unarchiver object.
+
+     - returns: An initialized UICollectionViewCell object.
+     */
+    public required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+
+        configureOutletFromDecoder(aDecoder)
+    }
+
+    /**
+     Initializes and returns a newly allocated view object with the specified frame rectangle.
+
+     - parameter frame: The frame rectangle for the view
+
+     - returns: An initialized UICollectionViewCell object.
+     */
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        commonInit()
+    }
 }
 
 // MARK: life cicle
 
 extension BasePageCollectionCell {
-  
-  public override func awakeFromNib() {
-    super.awakeFromNib()
-    
-    commonInit()
-  }
-  
-  private func commonInit() {
-    configurationViews()
-    shadowView = createShadowViewOnView(frontContainerView)
-  }
 
+    open override func awakeFromNib() {
+        super.awakeFromNib()
+
+        commonInit()
+    }
+
+    fileprivate func commonInit() {
+        configurationViews()
+        shadowView = createShadowViewOnView(frontContainerView)
+    }
 }
 
-// MARK: Control 
+// MARK: Control
 
 extension BasePageCollectionCell {
-  
-  /**
-   Open or close cell.
-   
-   - parameter isOpen: Contains the value true if the cell should display open state, if false should display close state.
-   - parameter animated: Set to true if the change in selection state is animated.
-   */
-  public func cellIsOpen(isOpen: Bool, animated: Bool = true) {
-    if isOpen == isOpened { return }
-    
-    frontConstraintY.constant = isOpen == true ? -frontContainerView.bounds.size.height / 5 : 0
-    backConstraintY.constant  = isOpen == true ? frontContainerView.bounds.size.height / 5 - yOffset / 2 : 0
-    
-    if let widthConstant = backContainerView.getConstraint(.Width) {
-      widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + yOffset : frontContainerView.bounds.size.width
-    }
-    
-    if let heightConstant = backContainerView.getConstraint(.Height) {
-      heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + yOffset : frontContainerView.bounds.size.height
-    }
-    
-    configurationCell()
 
-    
-    if animated == true {
-      UIView.animateWithDuration(0.3, delay: 0, options: .CurveEaseInOut, animations: {
-        self.contentView.layoutIfNeeded()
-      }, completion: nil)
-    } else {
-      self.contentView.layoutIfNeeded()
+    /**
+     Open or close cell.
+
+     - parameter isOpen: Contains the value true if the cell should display open state, if false should display close state.
+     - parameter animated: Set to true if the change in selection state is animated.
+     */
+    public func cellIsOpen(_ isOpen: Bool, animated: Bool = true) {
+        if isOpen == isOpened { return }
+
+        if ySpacing == .greatestFiniteMagnitude {
+            frontConstraintY.constant = isOpen == true ? -frontContainerView.bounds.size.height / 6 : 0
+            backConstraintY.constant = isOpen == true ? frontContainerView.bounds.size.height / 6 - yOffset / 2 : 0
+        } else {
+            frontConstraintY.constant = isOpen == true ? -ySpacing / 2 : 0
+            backConstraintY.constant = isOpen == true ? ySpacing / 2 : 0
+        }
+
+        if let widthConstant = backContainerView.getConstraint(.width) {
+            if additionalWidth == .greatestFiniteMagnitude {
+                widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + yOffset : frontContainerView.bounds.size.width
+            } else {
+                widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + additionalWidth : frontContainerView.bounds.size.width
+            }
+        }
+
+        if let heightConstant = backContainerView.getConstraint(.height) {
+            if additionalHeight == .greatestFiniteMagnitude {
+                heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + yOffset : frontContainerView.bounds.size.height
+            } else {
+                heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + additionalHeight : frontContainerView.bounds.size.height
+            }
+        }
+
+        isOpened = isOpen
+
+        if animated == true {
+            UIView.animate(withDuration: 0.3, delay: 0, options: UIView.AnimationOptions(), animations: {
+                self.contentView.layoutIfNeeded()
+            }, completion: nil)
+        } else {
+            contentView.layoutIfNeeded()
+        }
     }
-   
-    isOpened = isOpen
-  }
 }
 
 // MARK: Configuration
 
 extension BasePageCollectionCell {
-  
-  private func configurationViews() {
-    backContainerView.layer.masksToBounds = true
-    backContainerView.layer.cornerRadius  = 5
-    
-    frontContainerView.layer.masksToBounds = true
-    frontContainerView.layer.cornerRadius  = 5
-    
-    contentView.layer.masksToBounds = false
-    layer.masksToBounds             = false
-  }
-  
-  private func createShadowViewOnView(view: UIView?) -> UIView? {
-    guard let view = view else {return nil}
-    
-    let shadow = Init(UIView(frame: .zero)) {
-      $0.backgroundColor                           = .clearColor()
-      $0.translatesAutoresizingMaskIntoConstraints = false
-      $0.layer.masksToBounds                       = false;
-      $0.layer.shadowColor                         = UIColor.blackColor().CGColor
-      $0.layer.shadowRadius                        = 10
-      $0.layer.shadowOpacity                       = 0.3
-      $0.layer.shadowOffset                        = CGSize(width: 0, height:0)
+
+    fileprivate func configurationViews() {
+        backContainerView.layer.masksToBounds = true
+        backContainerView.layer.cornerRadius = 5
+
+        frontContainerView.layer.masksToBounds = true
+        frontContainerView.layer.cornerRadius = 5
+
+        contentView.layer.masksToBounds = false
+        layer.masksToBounds = false
     }
-    contentView.insertSubview(shadow, belowSubview: view)
-    
-    // create constraints
-    for info: (attribute: NSLayoutAttribute, scale: CGFloat)  in [(NSLayoutAttribute.Width, 0.8), (NSLayoutAttribute.Height, 0.9)] {
-      if let frontViewConstraint = view.getConstraint(info.attribute) {
-        shadow >>>- {
-          $0.attribute = info.attribute
-          $0.constant  = frontViewConstraint.constant * info.scale
+
+    fileprivate func createShadowViewOnView(_ view: UIView?) -> UIView? {
+        guard let view = view else { return nil }
+
+        let shadow = Init(UIView(frame: .zero)) {
+            $0.backgroundColor = UIColor(white: 0, alpha: 0)
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            $0.layer.masksToBounds = false
+            if dropShadow {
+                $0.layer.shadowColor = UIColor.black.cgColor
+                $0.layer.shadowRadius = 10
+                $0.layer.shadowOpacity = 0.3
+                $0.layer.shadowOffset = CGSize(width: 0, height: 0)
+            }
         }
-      }
+        contentView.insertSubview(shadow, belowSubview: view)
+
+        // create constraints
+        let sizeConstaints: [(NSLayoutConstraint.Attribute, CGFloat)] = [(NSLayoutConstraint.Attribute.width, 0.8), (NSLayoutConstraint.Attribute.height, 0.9)]
+        for info: (attribute: NSLayoutConstraint.Attribute, scale: CGFloat) in sizeConstaints {
+            if let frontViewConstraint = view.getConstraint(info.attribute) {
+                shadow >>>- {
+                    $0.attribute = info.attribute
+                    $0.constant = frontViewConstraint.constant * info.scale
+                    return
+                }
+            }
+        }
+        
+        let centerConstraints: [(NSLayoutConstraint.Attribute, CGFloat)] = [(NSLayoutConstraint.Attribute.centerX, 0), (NSLayoutConstraint.Attribute.centerY, 30)]
+        for info: (attribute: NSLayoutConstraint.Attribute, offset: CGFloat) in centerConstraints {
+            (contentView, shadow, view) >>>- {
+                $0.attribute = info.attribute
+                $0.constant = info.offset
+                return
+            }
+        }
+
+        // size shadow
+        let width = shadow.getConstraint(.width)?.constant
+        let height = shadow.getConstraint(.height)?.constant
+
+        shadow.layer.shadowPath = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: width!, height: height!), cornerRadius: 0).cgPath
+
+        return shadow
     }
-    
-    for info: (attribute: NSLayoutAttribute, offset: CGFloat)  in [(NSLayoutAttribute.CenterX, 0), (NSLayoutAttribute.CenterY, 30)] {
-      (contentView, shadow, view) >>>- {
-        $0.attribute = info.attribute
-        $0.constant  = info.offset
-      }
+
+    func configureCellViewConstraintsWithSize(_ size: CGSize) {
+        guard isOpened == false && frontContainerView.getConstraint(.width)?.constant != size.width else { return }
+
+        [frontContainerView, backContainerView].forEach {
+            let constraintWidth = $0?.getConstraint(.width)
+            constraintWidth?.constant = size.width
+
+            let constraintHeight = $0?.getConstraint(.height)
+            constraintHeight?.constant = size.height
+        }
     }
-    
-    // size shadow
-    let width  = shadow.getConstraint(.Width)?.constant
-    let height = shadow.getConstraint(.Height)?.constant
-    
-    shadow.layer.shadowPath = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: width!, height: height!), cornerRadius: 0).CGPath
-    
-    return shadow
-  }
-  
-	
-	func configurationCell() {
-		// Prevents indefinite growing of the cell issue
-		let i: CGFloat = self.isOpened ? 1 : -1
-		let superHeight = superview?.frame.size.height ?? 0
-		
-		frame.size.height += i * superHeight
-		frame.origin.y -= i * superHeight / 2
-		frame.origin.x -= i * yOffset / 2
-		frame.size.width += i * yOffset
-	}
-	
-  
-  func configureCellViewConstraintsWithSize(size: CGSize) {
-    guard isOpened == false && frontContainerView.getConstraint(.Width)?.constant != size.width else { return }
-    
-    [frontContainerView, backContainerView].forEach {
-      let constraintWidth = $0.getConstraint(.Width)
-      constraintWidth?.constant = size.width
-      
-      let constraintHeight = $0.getConstraint(.Height)
-      constraintHeight?.constant = size.height
-    }
-  }
 }
 
 // MARK: NSCoding
 
 extension BasePageCollectionCell {
-  
-  private func highlightedImageFalseOnView(view: UIView) {
-    for item in view.subviews {
-      if case let imageView as UIImageView = item {
-        imageView.highlighted = false
-      }
-      if item.subviews.count > 0 {
-        highlightedImageFalseOnView(item)
-      }
-    }
-  }
-  
-  private func copyShadowFromView(fromView: UIView, toView: UIView) {
-    fromView.layer.shadowPath    = toView.layer.shadowPath
-    fromView.layer.masksToBounds = toView.layer.masksToBounds
-    fromView.layer.shadowColor   = toView.layer.shadowColor
-    fromView.layer.shadowRadius  = toView.layer.shadowRadius
-    fromView.layer.shadowOpacity = toView.layer.shadowOpacity
-    fromView.layer.shadowOffset  = toView.layer.shadowOffset
-  }
 
-  
-  func copyCell() -> BasePageCollectionCell? {
-    highlightedImageFalseOnView(contentView)
-    
-    let data = NSKeyedArchiver.archivedDataWithRootObject(self)
-    guard case let copyView as BasePageCollectionCell = NSKeyedUnarchiver.unarchiveObjectWithData(data),
-      let shadowView = self.shadowView else {
-      return nil
+    fileprivate func highlightedImageFalseOnView(_ view: UIView) {
+        for item in view.subviews {
+            if case let imageView as UIImageView = item {
+                imageView.isHighlighted = false
+            }
+            if item.subviews.count > 0 {
+                highlightedImageFalseOnView(item)
+            }
+        }
     }
-    
-    // configure
-    copyView.backContainerView.layer.masksToBounds  = backContainerView.layer.masksToBounds
-    copyView.backContainerView.layer.cornerRadius   = backContainerView.layer.cornerRadius
 
-    copyView.frontContainerView.layer.masksToBounds = frontContainerView.layer.masksToBounds
-    copyView.frontContainerView.layer.cornerRadius  = frontContainerView.layer.cornerRadius
-    
-    // copy shadow layer
-    copyShadowFromView(copyView.shadowView!, toView: shadowView)
-    
-    for index in 0..<copyView.frontContainerView.subviews.count {
-      copyShadowFromView(copyView.frontContainerView.subviews[index], toView: frontContainerView.subviews[index])
+    fileprivate func copyShadowFromView(_ fromView: UIView, toView: UIView) {
+        fromView.layer.shadowPath = toView.layer.shadowPath
+        fromView.layer.masksToBounds = toView.layer.masksToBounds
+        fromView.layer.shadowColor = toView.layer.shadowColor
+        fromView.layer.shadowRadius = toView.layer.shadowRadius
+        fromView.layer.shadowOpacity = toView.layer.shadowOpacity
+        fromView.layer.shadowOffset = toView.layer.shadowOffset
     }
-    return copyView
-  }
-  
-  public override func encodeWithCoder(coder: NSCoder) {
-    super.encodeWithCoder(coder)
-    coder.encodeObject(backContainerView, forKey: Constants.backContainer)
-    coder.encodeObject(frontContainerView, forKey: Constants.frontContainer)
-    coder.encodeObject(frontConstraintY, forKey: Constants.frontContainerY)
-    coder.encodeObject(backConstraintY, forKey: Constants.backContainerY)
-    coder.encodeObject(shadowView, forKey: Constants.shadowView)
-  }
-  
-  private func configureOutletFromDecoder(coder: NSCoder) {
-    if case let shadowView as UIView = coder.decodeObjectForKey(Constants.shadowView) {
-      self.shadowView = shadowView
+
+    func copyCell() -> BasePageCollectionCell? {
+        highlightedImageFalseOnView(contentView)
+
+        let data = NSKeyedArchiver.archivedData(withRootObject: self)
+        guard case let copyView as BasePageCollectionCell = NSKeyedUnarchiver.unarchiveObject(with: data),
+            let shadowView = self.shadowView else {
+            return nil
+        }
+
+        // configure
+        copyView.backContainerView.layer.masksToBounds = backContainerView.layer.masksToBounds
+        copyView.backContainerView.layer.cornerRadius = backContainerView.layer.cornerRadius
+
+        copyView.frontContainerView.layer.masksToBounds = frontContainerView.layer.masksToBounds
+        copyView.frontContainerView.layer.cornerRadius = frontContainerView.layer.cornerRadius
+
+        // copy shadow layer
+        copyShadowFromView(copyView.shadowView!, toView: shadowView)
+
+        for index in 0 ..< copyView.frontContainerView.subviews.count {
+            copyShadowFromView(copyView.frontContainerView.subviews[index], toView: frontContainerView.subviews[index])
+        }
+        return copyView
     }
-    
-    if case let backView as UIView = coder.decodeObjectForKey(Constants.backContainer) {
-      backContainerView = backView
+
+    open override func encode(with coder: NSCoder) {
+        super.encode(with: coder)
+        coder.encode(backContainerView, forKey: Constants.backContainer)
+        coder.encode(frontContainerView, forKey: Constants.frontContainer)
+        coder.encode(frontConstraintY, forKey: Constants.frontContainerY)
+        coder.encode(backConstraintY, forKey: Constants.backContainerY)
+        coder.encode(shadowView, forKey: Constants.shadowView)
     }
-    
-    if case let frontView as UIView = coder.decodeObjectForKey(Constants.frontContainer) {
-      frontContainerView = frontView
+
+    fileprivate func configureOutletFromDecoder(_ coder: NSCoder) {
+        if case let shadowView as UIView = coder.decodeObject(forKey: Constants.shadowView) {
+            self.shadowView = shadowView
+        }
+
+        if case let backView as UIView = coder.decodeObject(forKey: Constants.backContainer) {
+            backContainerView = backView
+        }
+
+        if case let frontView as UIView = coder.decodeObject(forKey: Constants.frontContainer) {
+            frontContainerView = frontView
+        }
+
+        if case let constraint as NSLayoutConstraint = coder.decodeObject(forKey: Constants.frontContainerY) {
+            frontConstraintY = constraint
+        }
+
+        if case let constraint as NSLayoutConstraint = coder.decodeObject(forKey: Constants.backContainerY) {
+            backConstraintY = constraint
+        }
     }
-    
-    if case let constraint as NSLayoutConstraint = coder.decodeObjectForKey(Constants.frontContainerY) {
-      frontConstraintY = constraint
-    }
-    
-    if case let constraint as NSLayoutConstraint = coder.decodeObjectForKey(Constants.backContainerY) {
-      backConstraintY = constraint
-    }
-  }
-}
+}

Source/ExpandingViewController/CollectionView/Layout/PageCollectionLayout.swift

@@ -9,141 +9,141 @@
 import UIKit
 
 class PageCollectionLayout: UICollectionViewFlowLayout {
-  
-  private var lastCollectionViewSize: CGSize = CGSizeZero
-  
-  var scalingOffset: CGFloat      = 200
-  var minimumScaleFactor: CGFloat = 0.9
-  var minimumAlphaFactor: CGFloat = 0.3
-  var scaleItems: Bool            = true
-  
-  required init?(coder aDecoder: NSCoder) {
-    fatalError()
-  }
-  
-  init(itemSize: CGSize) {
-    super.init()
-    commonInit(itemSize)
-  }
+
+    fileprivate var lastCollectionViewSize: CGSize = CGSize.zero
+
+    var scalingOffset: CGFloat = 200
+    var minimumScaleFactor: CGFloat = 0.9
+    var minimumAlphaFactor: CGFloat = 0.3
+    var scaleItems: Bool = true
+
+    required init?(coder _: NSCoder) {
+        fatalError()
+    }
+
+    init(itemSize: CGSize) {
+        super.init()
+        commonInit(itemSize)
+    }
 }
 
 // MARK: life cicle
 
 extension PageCollectionLayout {
-  
-  private func commonInit(itemSize: CGSize) {
-    scrollDirection    = .Horizontal
-    minimumLineSpacing = 25
-    self.itemSize      = itemSize
-  }
+
+    fileprivate func commonInit(_ itemSize: CGSize) {
+        scrollDirection = .horizontal
+        minimumLineSpacing = 25
+        self.itemSize = itemSize
+    }
 }
 
 // MARK: override
 
 extension PageCollectionLayout {
-  
-  override func invalidateLayoutWithContext(context: UICollectionViewLayoutInvalidationContext) {
-    super.invalidateLayoutWithContext(context)
-    
-    guard let collectionView = self.collectionView else { return }
-    
-    if collectionView.bounds.size != lastCollectionViewSize {
-      self.configureInset()
-      self.lastCollectionViewSize = collectionView.bounds.size
+
+    override func invalidateLayout(with context: UICollectionViewLayoutInvalidationContext) {
+        super.invalidateLayout(with: context)
+
+        guard let collectionView = self.collectionView else { return }
+
+        if collectionView.bounds.size != lastCollectionViewSize {
+            configureInset()
+            lastCollectionViewSize = collectionView.bounds.size
+        }
     }
-  }
-  
-  override func targetContentOffsetForProposedContentOffset(proposedContentOffset: CGPoint, withScrollingVelocity velocity: CGPoint) -> CGPoint {
-    guard let collectionView = self.collectionView else {
-      return proposedContentOffset
+
+    override func targetContentOffset(forProposedContentOffset proposedContentOffset: CGPoint, withScrollingVelocity velocity: CGPoint) -> CGPoint {
+        guard let collectionView = self.collectionView else {
+            return proposedContentOffset
+        }
+
+        let proposedRect = CGRect(x: proposedContentOffset.x, y: 0, width: collectionView.bounds.width, height: collectionView.bounds.height)
+        guard let layoutAttributes = self.layoutAttributesForElements(in: proposedRect) else {
+            return proposedContentOffset
+        }
+
+        var candidateAttributes: UICollectionViewLayoutAttributes?
+        let proposedContentOffsetCenterX = proposedContentOffset.x + collectionView.bounds.width / 2
+
+        for attributes in layoutAttributes {
+            if attributes.representedElementCategory != .cell {
+                continue
+            }
+
+            if candidateAttributes == nil {
+                candidateAttributes = attributes
+                continue
+            }
+
+            if abs(attributes.center.x - proposedContentOffsetCenterX) < abs(candidateAttributes!.center.x - proposedContentOffsetCenterX) {
+                candidateAttributes = attributes
+            }
+        }
+
+        guard let aCandidateAttributes = candidateAttributes else {
+            return proposedContentOffset
+        }
+
+        var newOffsetX = aCandidateAttributes.center.x - collectionView.bounds.size.width / 2
+        let offset = newOffsetX - collectionView.contentOffset.x
+
+        if (velocity.x < 0 && offset > 0) || (velocity.x > 0 && offset < 0) {
+            let pageWidth = itemSize.width + minimumLineSpacing
+            newOffsetX += velocity.x > 0 ? pageWidth : -pageWidth
+        }
+
+        return CGPoint(x: newOffsetX, y: proposedContentOffset.y)
     }
-    
-    let proposedRect = CGRectMake(proposedContentOffset.x, 0, collectionView.bounds.width, collectionView.bounds.height)
-    guard let layoutAttributes = self.layoutAttributesForElementsInRect(proposedRect) else {
-      return proposedContentOffset
+
+    override func shouldInvalidateLayout(forBoundsChange _: CGRect) -> Bool {
+        return true
     }
-    
-    var candidateAttributes: UICollectionViewLayoutAttributes?
-    let proposedContentOffsetCenterX = proposedContentOffset.x + collectionView.bounds.width / 2
-    
-    for attributes in layoutAttributes {
-      if attributes.representedElementCategory != .Cell {
-        continue
-      }
-      
-      if candidateAttributes == nil {
-        candidateAttributes = attributes
-        continue
-      }
-      
-      if fabs(attributes.center.x - proposedContentOffsetCenterX) < fabs(candidateAttributes!.center.x - proposedContentOffsetCenterX) {
-        candidateAttributes = attributes
-      }
+
+    override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
+        guard let collectionView = self.collectionView,
+            let superAttributes = super.layoutAttributesForElements(in: rect) else {
+            return super.layoutAttributesForElements(in: rect)
+        }
+        if scaleItems == false {
+            return super.layoutAttributesForElements(in: rect)
+        }
+
+        let contentOffset = collectionView.contentOffset
+        let size = collectionView.bounds.size
+
+        let visibleRect = CGRect(x: contentOffset.x, y: contentOffset.y, width: size.width, height: size.height)
+        let visibleCenterX = visibleRect.midX
+
+        guard case let newAttributesArray as [UICollectionViewLayoutAttributes] = NSArray(array: superAttributes, copyItems: true) else {
+            return nil
+        }
+
+        newAttributesArray.forEach {
+            let distanceFromCenter = visibleCenterX - $0.center.x
+            let absDistanceFromCenter = min(abs(distanceFromCenter), self.scalingOffset)
+            let scale = absDistanceFromCenter * (self.minimumScaleFactor - 1) / self.scalingOffset + 1
+            $0.transform3D = CATransform3DScale(CATransform3DIdentity, scale, scale, 1)
+
+            let alpha = absDistanceFromCenter * (self.minimumAlphaFactor - 1) / self.scalingOffset + 1
+            $0.alpha = alpha
+        }
+
+        return newAttributesArray
     }
-    
-    guard let aCandidateAttributes = candidateAttributes else {
-      return proposedContentOffset
-    }
-    
-    var newOffsetX = aCandidateAttributes.center.x - collectionView.bounds.size.width / 2
-    let offset = newOffsetX - collectionView.contentOffset.x
-    
-    if (velocity.x < 0 && offset > 0) || (velocity.x > 0 && offset < 0) {
-      let pageWidth = self.itemSize.width + self.minimumLineSpacing
-      newOffsetX += velocity.x > 0 ? pageWidth : -pageWidth
-    }
-    
-    return CGPointMake(newOffsetX, proposedContentOffset.y)
-  }
-  
-  override func shouldInvalidateLayoutForBoundsChange(newBounds: CGRect) -> Bool {
-    return true
-  }
-  
-  override func layoutAttributesForElementsInRect(rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
-    guard let collectionView = self.collectionView,
-      let superAttributes = super.layoutAttributesForElementsInRect(rect) else {
-        return super.layoutAttributesForElementsInRect(rect)
-    }
-    if scaleItems == false{
-      return super.layoutAttributesForElementsInRect(rect)
-    }
-    
-    let contentOffset = collectionView.contentOffset
-    let size = collectionView.bounds.size
-    
-    let visibleRect = CGRectMake(contentOffset.x, contentOffset.y, size.width, size.height)
-    let visibleCenterX = CGRectGetMidX(visibleRect)
-    
-    guard case let newAttributesArray as [UICollectionViewLayoutAttributes] = NSArray(array: superAttributes, copyItems: true) else {
-      return nil
-    }
-    
-    newAttributesArray.forEach {
-      let distanceFromCenter = visibleCenterX - $0.center.x
-      let absDistanceFromCenter = min(abs(distanceFromCenter), self.scalingOffset)
-      let scale = absDistanceFromCenter * (self.minimumScaleFactor - 1) / self.scalingOffset + 1
-      $0.transform3D = CATransform3DScale(CATransform3DIdentity, scale, scale, 1)
-      
-      let alpha = absDistanceFromCenter * (self.minimumAlphaFactor - 1) / self.scalingOffset + 1
-      $0.alpha = alpha
-    }
-   
-    return newAttributesArray
-  }
 }
 
 // MARK: helpers
 
 extension PageCollectionLayout {
-  
-  private func configureInset() -> Void {
-    guard let collectionView = self.collectionView else {
-      return
+
+    fileprivate func configureInset() {
+        guard let collectionView = self.collectionView else {
+            return
+        }
+
+        let inset = collectionView.bounds.size.width / 2 - itemSize.width / 2
+        collectionView.contentInset = UIEdgeInsets.init(top: 0, left: inset, bottom: 0, right: inset)
+        collectionView.contentOffset = CGPoint(x: -inset, y: 0)
     }
-    
-    let inset = collectionView.bounds.size.width / 2 - itemSize.width / 2
-    collectionView.contentInset  = UIEdgeInsetsMake(0, inset, 0, inset)
-    collectionView.contentOffset = CGPointMake(-inset, 0)
-  }
 }

Source/ExpandingViewController/CollectionView/PageCollectionView.swift

@@ -9,39 +9,41 @@
 import UIKit
 
 class PageCollectionView: UICollectionView {
-  
 }
 
 // MARK: init
 
 extension PageCollectionView {
-  
-  class func createOnView(view: UIView,
-                          layout: UICollectionViewLayout,
-                          height:CGFloat,
-                          dataSource: UICollectionViewDataSource,
-                          delegate: UICollectionViewDelegate) -> PageCollectionView {
-    
-    let collectionView = Init(PageCollectionView(frame: CGRect.zero, collectionViewLayout: layout)) {
-      $0.translatesAutoresizingMaskIntoConstraints = false
-      $0.decelerationRate                          = UIScrollViewDecelerationRateFast
-      $0.showsHorizontalScrollIndicator            = false
-      $0.dataSource                                = dataSource
-      $0.delegate                                  = delegate
-      $0.backgroundColor                           = .clearColor()
+
+    class func createOnView(_ view: UIView,
+                            layout: UICollectionViewLayout,
+                            height: CGFloat,
+                            dataSource: UICollectionViewDataSource,
+                            delegate: UICollectionViewDelegate) -> PageCollectionView {
+
+        let collectionView = Init(PageCollectionView(frame: CGRect.zero, collectionViewLayout: layout)) {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            $0.decelerationRate = UIScrollView.DecelerationRate.fast
+            $0.showsHorizontalScrollIndicator = false
+            $0.dataSource = dataSource
+            $0.delegate = delegate
+            $0.backgroundColor = UIColor(white: 0, alpha: 0)
+        }
+        view.addSubview(collectionView)
+
+        // add constraints
+        collectionView >>>- {
+            $0.attribute = .height
+            $0.constant = height
+            return
+        }
+        [NSLayoutConstraint.Attribute.left, .right, .centerY].forEach { attribute in
+            (view, collectionView) >>>- {
+                $0.attribute = attribute
+                return
+            }
+        }
+
+        return collectionView
     }
-    view.addSubview(collectionView)
-    
-    // add constraints
-    collectionView >>>- {
-      $0.attribute = .Height
-      $0.constant  = height
-    }
-    [NSLayoutAttribute.Left, .Right, .CenterY].forEach { attribute in
-      (view, collectionView) >>>- { $0.attribute = attribute }
-    }
-    
-    return collectionView
-  }
-  
-}
+}

Source/ExpandingViewController/ExpandingViewController.swift

@@ -9,129 +9,124 @@
 import UIKit
 
 /// UIViewController with UICollectionView with custom transition method
-public class ExpandingViewController: UIViewController {
-  
-  /// The default size to use for cells.
-  public var itemSize = CGSize(width: 256, height: 335)
-  
-  ///  The collection view object managed by this view controller.
-  public var collectionView: UICollectionView?
-  
-  private var transitionDriver: TransitionDriver?
-  
-  /// Index of current cell
-  public var currentIndex: Int {
-    guard let collectionView = self.collectionView else { return 0 }
-    
-    let startOffset = (collectionView.bounds.size.width - itemSize.width) / 2
-    guard let collectionLayout  = collectionView.collectionViewLayout as? UICollectionViewFlowLayout else {
-      return 0
+open class ExpandingViewController: UIViewController {
+
+    /// The default size to use for cells. Height of open cell state
+    open var itemSize = CGSize(width: 256, height: 460)
+
+    ///  The collection view object managed by this view controller.
+    open var collectionView: UICollectionView?
+
+    fileprivate var transitionDriver: TransitionDriver?
+
+    /// Index of current cell
+    open var currentIndex: Int {
+        guard let collectionView = self.collectionView else { return 0 }
+
+        let startOffset = (collectionView.bounds.size.width - itemSize.width) / 2
+        guard let collectionLayout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout else {
+            return 0
+        }
+
+        let minimumLineSpacing = collectionLayout.minimumLineSpacing
+        let a = collectionView.contentOffset.x + startOffset + itemSize.width / 2
+        let b = itemSize.width + minimumLineSpacing
+        return Int(a / b)
     }
-    
-    let minimumLineSpacing = collectionLayout.minimumLineSpacing
-    return Int((collectionView.contentOffset.x + startOffset + itemSize.width / 2) / (itemSize.width + minimumLineSpacing))
-  }
 }
 
 // MARK: life cicle
 
 extension ExpandingViewController {
-  
-  public override func viewDidLoad() {
-    super.viewDidLoad()
-    commonInit()
- }
+
+    open override func viewDidLoad() {
+        super.viewDidLoad()
+        commonInit()
+    }
 }
 
 // MARK: Transition
 
 public extension ExpandingViewController {
-  
-  /**
-   Pushes a view controller onto the receiver’s stack and updates the display with custom animation.
-   
-   - parameter viewController: The table view controller to push onto the stack. 
-   */
-  func pushToViewController(viewController: ExpandingTableViewController) {
-    guard let collectionView = self.collectionView,
-    let navigationController = self.navigationController else {
-      return
+
+    /**
+     Pushes a view controller onto the receiver’s stack and updates the display with custom animation.
+
+     - parameter viewController: The table view controller to push onto the stack.
+     */
+    func pushToViewController(_ viewController: ExpandingTableViewController) {
+        guard let collectionView = self.collectionView,
+            let navigationController = self.navigationController else {
+            return
+        }
+
+        viewController.transitionDriver = transitionDriver
+        let insets = viewController.automaticallyAdjustsScrollViewInsets
+        let tabBarHeight = insets == true ? navigationController.navigationBar.frame.size.height : 0
+        let stausBarHeight = insets == true ? UIApplication.shared.statusBarFrame.size.height : 0
+        let backImage = getBackImage(viewController, headerHeight: viewController.headerHeight)
+
+        transitionDriver?.pushTransitionAnimationIndex(currentIndex,
+                                                       collecitionView: collectionView,
+                                                       backImage: backImage,
+                                                       headerHeight: viewController.headerHeight,
+                                                       insets: tabBarHeight + stausBarHeight) { headerView in
+            viewController.tableView.tableHeaderView = headerView
+            self.navigationController?.pushViewController(viewController, animated: false)
+        }
     }
-    
-    viewController.transitionDriver = transitionDriver
-    let insets = viewController.automaticallyAdjustsScrollViewInsets
-    let tabBarHeight =  insets == true ? navigationController.navigationBar.frame.size.height : 0
-    let stausBarHeight = insets == true ? UIApplication.sharedApplication().statusBarFrame.size.height : 0
-    let backImage = getBackImage(viewController, headerHeight: viewController.headerHeight)
-    
-    transitionDriver?.pushTransitionAnimationIndex(currentIndex,
-                                                   collecitionView: collectionView,
-                                                   backImage: backImage,
-                                                   headerHeight: viewController.headerHeight,
-                                                   insets: tabBarHeight + stausBarHeight) { headerView in
-      viewController.tableView.tableHeaderView = headerView
-      self.navigationController?.pushViewController(viewController, animated: false)
-    }
-  }
 }
 
 // MARK: create
 
 extension ExpandingViewController {
-  
-  private func commonInit() {
-    
-    let layout = PageCollectionLayout(itemSize: itemSize)
-    collectionView = PageCollectionView.createOnView(view,
-                                                     layout: layout,
-                                                     height: itemSize.height + itemSize.height / 5 * 2,
-                                                     dataSource: self,
-                                                     delegate: self)
-    transitionDriver = TransitionDriver(view: view)
-  }
+
+    fileprivate func commonInit() {
+
+        let layout = PageCollectionLayout(itemSize: itemSize)
+        collectionView = PageCollectionView.createOnView(view,
+                                                         layout: layout,
+                                                         height: itemSize.height,
+                                                         dataSource: self,
+                                                         delegate: self)
+        if #available(iOS 10.0, *) {
+            collectionView?.isPrefetchingEnabled = false
+        }
+        transitionDriver = TransitionDriver(view: view)
+    }
 }
 
 // MARK: Helpers
 
 extension ExpandingViewController {
-  
-  private func getBackImage(viewController: UIViewController, headerHeight: CGFloat) -> UIImage? {
-    let imageSize = CGSize(width: viewController.view.bounds.width, height: viewController.view.bounds.height - headerHeight)
-    let imageFrame = CGRect(origin: CGPoint(x: 0, y: 0), size: imageSize)
-    return viewController.view.takeSnapshot(imageFrame)
-  }
 
+    fileprivate func getBackImage(_ viewController: UIViewController, headerHeight: CGFloat) -> UIImage? {
+        let imageSize = CGSize(width: viewController.view.bounds.width, height: viewController.view.bounds.height - headerHeight)
+        let imageFrame = CGRect(origin: CGPoint(x: 0, y: 0), size: imageSize)
+        return viewController.view.takeSnapshot(imageFrame)
+    }
 }
 
 // MARK: UICollectionViewDataSource
 
 extension ExpandingViewController: UICollectionViewDataSource, UICollectionViewDelegate {
-  
-  public func collectionView(collectionView: UICollectionView, willDisplayCell cell: UICollectionViewCell, forItemAtIndexPath indexPath: NSIndexPath) {
-    guard case let cell as BasePageCollectionCell = cell else {
-      return
+
+    open func collectionView(_: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt _: IndexPath) {
+        guard case let cell as BasePageCollectionCell = cell else {
+            return
+        }
+
+        cell.configureCellViewConstraintsWithSize(itemSize)
     }
     
-    cell.configureCellViewConstraintsWithSize(itemSize)
-  }
-  public func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-    fatalError("need emplementation in subclass")
-  }
-  
-  public func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-    fatalError("need emplementation in subclass")
-  }
-}
-
-// MARK: UIScrollViewDelegate 
-
-extension ExpandingViewController {
-  
-  public func scrollViewDidEndDecelerating(scrollView: UIScrollView) {
-    let indexPath = NSIndexPath(forRow: currentIndex, inSection: 0)
-    if case let currentCell as BasePageCollectionCell = collectionView?.cellForItemAtIndexPath(indexPath) {
-      currentCell.configurationCell()
+    open func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
     }
-  }
-}
 
+    open func collectionView(_: UICollectionView, numberOfItemsInSection _: Int) -> Int {
+        fatalError("need emplementation in subclass")
+    }
+
+    open func collectionView(_: UICollectionView, cellForItemAt _: IndexPath) -> UICollectionViewCell {
+        fatalError("need emplementation in subclass")
+    }
+}

Source/Helpers/Animations/CornerAnimatable/CornerAnimatable.swift

@@ -8,23 +8,22 @@
 
 import UIKit
 
-
 protocol CornerAnimatable {
-  func animationCornerRadius(radius: CGFloat, duration: Double)
+    func animationCornerRadius(_ radius: CGFloat, duration: Double)
 }
 
 extension CornerAnimatable where Self: UIView {
-  
-  func animationCornerRadius(radius: CGFloat, duration: Double) {
-    let animation = Init(CABasicAnimation(keyPath: "cornerRadius")) {
-      $0.duration            = duration
-      $0.toValue             = radius
-      $0.fillMode            = kCAFillModeForwards
-      $0.removedOnCompletion = false;
+
+    func animationCornerRadius(_ radius: CGFloat, duration: Double) {
+        let animation = Init(CABasicAnimation(keyPath: "cornerRadius")) {
+            $0.duration = duration
+            $0.toValue = radius
+            $0.fillMode = CAMediaTimingFillMode.forwards
+            $0.isRemovedOnCompletion = false
+        }
+
+        layer.add(animation, forKey: nil)
     }
-    
-    layer.addAnimation(animation, forKey: nil)
-  }
 }
 
-extension UIView: CornerAnimatable {}
+extension UIView: CornerAnimatable {}

Source/Helpers/ConfigurationHelper/ConfigurationHelper.swift

@@ -8,9 +8,7 @@
 
 import Foundation
 
-@warn_unused_result
-internal func Init<Type>(value : Type, @noescape block: (object: Type) -> Void) -> Type
-{
-  block(object: value)
-  return value
+internal func Init<Type>(_ value: Type, block: (_ object: Type) -> Void) -> Type {
+    block(value)
+    return value
 }

Source/Helpers/Constraints Helpers/ConstraintsHelper.swift

@@ -9,83 +9,92 @@
 import UIKit
 
 struct ConstraintInfo {
-  var attribute: NSLayoutAttribute = .Left
-  var secondAttribute: NSLayoutAttribute = .NotAnAttribute
-  var constant: CGFloat = 0
-  var identifier: String?
-  var relation: NSLayoutRelation = .Equal
+    var attribute: NSLayoutConstraint.Attribute = .left
+    var secondAttribute: NSLayoutConstraint.Attribute = .notAnAttribute
+    var constant: CGFloat = 0
+    var identifier: String?
+    var relation: NSLayoutConstraint.Relation = .equal
 }
 
-infix operator >>>- { associativity left precedence 150 }
-
-func >>>- <T: UIView> (left: (T, T), @noescape block: (inout ConstraintInfo) -> ()) -> NSLayoutConstraint {
-  var info = ConstraintInfo()
-  block(&info)
-  info.secondAttribute = info.secondAttribute == .NotAnAttribute ? info.attribute : info.secondAttribute
-  
-  let constraint = NSLayoutConstraint(item: left.1,
-                                      attribute: info.attribute,
-                                      relatedBy: info.relation,
-                                      toItem: left.0,
-                                      attribute: info.secondAttribute,
-                                      multiplier: 1,
-                                      constant: info.constant)
-  constraint.identifier = info.identifier
-  left.0.addConstraint(constraint)
-  return constraint
+precedencegroup ConstOp {
+    associativity: left
+    higherThan: AssignmentPrecedence
 }
 
-func >>>- <T: UIView> (left: T, @noescape block: (inout ConstraintInfo) -> ()) -> NSLayoutConstraint {
-  var info = ConstraintInfo()
-  block(&info)
-  
-  let constraint = NSLayoutConstraint(item: left,
-                                      attribute: info.attribute,
-                                      relatedBy: info.relation,
-                                      toItem: nil,
-                                      attribute: info.attribute,
-                                      multiplier: 1,
-                                      constant: info.constant)
-  constraint.identifier = info.identifier
-  left.addConstraint(constraint)
-  return constraint
+infix operator >>>-: ConstOp
+
+@discardableResult
+func >>>- <T: UIView>(left: (T, T), block: (inout ConstraintInfo) -> Void) -> NSLayoutConstraint {
+    var info = ConstraintInfo()
+    block(&info)
+    info.secondAttribute = info.secondAttribute == .notAnAttribute ? info.attribute : info.secondAttribute
+
+    let constraint = NSLayoutConstraint(item: left.1,
+                                        attribute: info.attribute,
+                                        relatedBy: info.relation,
+                                        toItem: left.0,
+                                        attribute: info.secondAttribute,
+                                        multiplier: 1,
+                                        constant: info.constant)
+    constraint.identifier = info.identifier
+    left.0.addConstraint(constraint)
+    return constraint
 }
 
-func >>>- <T: UIView> (left: (T, T, T), @noescape block: (inout ConstraintInfo) -> ()) -> NSLayoutConstraint {
-  var info = ConstraintInfo()
-  block(&info)
-  info.secondAttribute = info.secondAttribute == .NotAnAttribute ? info.attribute : info.secondAttribute
-  
-  let constraint = NSLayoutConstraint(item: left.1,
-                                      attribute: info.attribute,
-                                      relatedBy: info.relation,
-                                      toItem: left.2,
-                                      attribute: info.secondAttribute,
-                                      multiplier: 1,
-                                      constant: info.constant)
-  constraint.identifier = info.identifier
-  left.0.addConstraint(constraint)
-  return constraint
+@discardableResult
+func >>>- <T: UIView>(left: T, block: (inout ConstraintInfo) -> Void) -> NSLayoutConstraint {
+    var info = ConstraintInfo()
+    block(&info)
+
+    let constraint = NSLayoutConstraint(item: left,
+                                        attribute: info.attribute,
+                                        relatedBy: info.relation,
+                                        toItem: nil,
+                                        attribute: info.attribute,
+                                        multiplier: 1,
+                                        constant: info.constant)
+    constraint.identifier = info.identifier
+    left.addConstraint(constraint)
+    return constraint
+}
+
+@discardableResult
+func >>>- <T: UIView>(left: (T, T, T), block: (inout ConstraintInfo) -> Void) -> NSLayoutConstraint {
+    var info = ConstraintInfo()
+    block(&info)
+    info.secondAttribute = info.secondAttribute == .notAnAttribute ? info.attribute : info.secondAttribute
+
+    let constraint = NSLayoutConstraint(item: left.1,
+                                        attribute: info.attribute,
+                                        relatedBy: info.relation,
+                                        toItem: left.2,
+                                        attribute: info.secondAttribute,
+                                        multiplier: 1,
+                                        constant: info.constant)
+    constraint.identifier = info.identifier
+    left.0.addConstraint(constraint)
+    return constraint
 }
 
 // MARK: UIView
 
 extension UIView {
-  
-  func addScaleToFillConstratinsOnView(view: UIView) {
-    [NSLayoutAttribute.Left, .Right, .Top, .Bottom].forEach { attribute in
-      (self, view) >>>- { $0.attribute = attribute }
+
+    func addScaleToFillConstratinsOnView(_ view: UIView) {
+        [NSLayoutConstraint.Attribute.left, .right, .top, .bottom].forEach { attribute in
+            (self, view) >>>- {
+                $0.attribute = attribute
+                return
+            }
+        }
     }
-  }
-  
-  func getConstraint(attributes: NSLayoutAttribute) -> NSLayoutConstraint? {
-    return constraints.filter {
-      if $0.firstAttribute == attributes && $0.secondItem == nil {
-        return true
-      }
-      return false
-    }.first
-  }
-
 
+    func getConstraint(_ attributes: NSLayoutConstraint.Attribute) -> NSLayoutConstraint? {
+        return constraints.filter {
+            if $0.firstAttribute == attributes && $0.secondItem == nil {
+                return true
+            }
+            return false
+        }.first
+    }
 }

Source/Helpers/ScreenShot/ScreenShotHelper.swift

@@ -9,20 +9,20 @@
 import UIKit
 
 extension UIView {
-  func takeSnapshot(frame: CGRect) -> UIImage? {
-    UIGraphicsBeginImageContextWithOptions(frame.size, false, 0.0)
-    
-    let context = UIGraphicsGetCurrentContext();
-    CGContextTranslateCTM(context, frame.origin.x * -1, frame.origin.y * -1)
-    
-    guard let currentContext = UIGraphicsGetCurrentContext() else {
-      return nil
+    func takeSnapshot(_ frame: CGRect) -> UIImage? {
+        UIGraphicsBeginImageContextWithOptions(frame.size, false, 0.0)
+
+        let context = UIGraphicsGetCurrentContext()
+        context?.translateBy(x: frame.origin.x * -1, y: frame.origin.y * -1)
+
+        guard let currentContext = UIGraphicsGetCurrentContext() else {
+            return nil
+        }
+
+        layer.render(in: currentContext)
+        let image = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+
+        return image
     }
-    
-    self.layer.renderInContext(currentContext)
-    let image = UIGraphicsGetImageFromCurrentImageContext()
-    UIGraphicsEndImageContext()
-    
-    return image
-  }
-}
+}

Source/Helpers/SubviewsForEach/SubviewsForEach.swift

@@ -9,24 +9,24 @@
 import UIKit
 
 protocol SubviewsForEach {
-  func subviewsForEach(f: UIView -> Void)
+    func subviewsForEach(_ f: (UIView) -> Void)
 }
 
 extension SubviewsForEach where Self: UIView {
-  
-  func subviewsForEach(f: UIView -> Void) {
-    forEachView(self, f: f)
-  }
-  
-  private func forEachView(view: UIView, f: UIView -> Void) {
-    view.subviews.forEach {
-      f($0)
-      
-      if $0.subviews.count > 0 {
-        forEachView($0, f: f)
-      }
+
+    func subviewsForEach(_ f: (UIView) -> Void) {
+        forEachView(self, f: f)
+    }
+
+    fileprivate func forEachView(_ view: UIView, f: (UIView) -> Void) {
+        view.subviews.forEach {
+            f($0)
+
+            if $0.subviews.count > 0 {
+                forEachView($0, f: f)
+            }
+        }
     }
-  }
 }
 
-extension UIView: SubviewsForEach {}
+extension UIView: SubviewsForEach {}

Source/TransitionDriver/TransitionDriver.swift

@@ -9,250 +9,259 @@
 import UIKit
 
 class TransitionDriver {
-  
-  // MARK: Constants
-  struct Constants {
-    static let HideKey = 101
-  }
-  
-  // MARK: Vars
-  
-  private let view: UIView
-  private let duration: Double = 0.4
-  
-  // for push animation
-  private var copyCell: BasePageCollectionCell?
-  private var currentCell: BasePageCollectionCell?
-  private var backImageView: UIImageView?
-  
-  private var leftCell: UICollectionViewCell?
-  private var rightCell: UICollectionViewCell?
-  private var step: CGFloat = 0
-  
-  private var frontViewFrame = CGRect.zero
-  private var backViewFrame  = CGRect.zero
-  
-  init(view: UIView) {
-    self.view = view
-  }
+
+    // MARK: Constants
+
+    struct Constants {
+        static let HideKey = 101
+    }
+
+    // MARK: Vars
+
+    fileprivate let view: UIView
+    fileprivate let duration: Double = 0.4
+
+    // for push animation
+    fileprivate var copyCell: BasePageCollectionCell?
+    fileprivate var currentCell: BasePageCollectionCell?
+    fileprivate var backImageView: UIImageView?
+
+    fileprivate var leftCell: UICollectionViewCell?
+    fileprivate var rightCell: UICollectionViewCell?
+    fileprivate var step: CGFloat = 0
+
+    fileprivate var frontViewFrame = CGRect.zero
+    fileprivate var backViewFrame = CGRect.zero
+
+    init(view: UIView) {
+        self.view = view
+    }
 }
 
 // MARK: control
 
 extension TransitionDriver {
-  
-  func pushTransitionAnimationIndex(currentIndex: Int,
-                                    collecitionView: UICollectionView,
-                                    backImage: UIImage?,
-                                    headerHeight: CGFloat,
-                                    insets: CGFloat,
-                                    completion: UIView -> Void) {
-    
-    guard case let cell as BasePageCollectionCell = collecitionView.cellForItemAtIndexPath(NSIndexPath(forRow: currentIndex, inSection: 0)),
-      let copyView = cell.copyCell() else { return }
-    copyCell = copyView
-    
-    // move cells
-    moveCellsCurrentIndex(currentIndex, collectionView: collecitionView)
-    
-    currentCell = cell
-    cell.hidden = true
-    
-    configurateCell(copyView, backImage: backImage)
-    backImageView = addImageToView(copyView.backContainerView, image: backImage)
-    
-    openBackViewConfigureConstraints(copyView, height: headerHeight, insets: insets)
-    openFrontViewConfigureConstraints(copyView, height: headerHeight, insets: insets)
-    
-    // corner animation 
-    copyView.backContainerView.animationCornerRadius(0, duration: duration)
-    copyView.frontContainerView.animationCornerRadius(0, duration: duration)
-    
-   // constraints animation
-    UIView.animateWithDuration(duration, delay: 0, options: .CurveEaseInOut, animations: {
-      self.view.layoutIfNeeded()
-      self.backImageView?.alpha        = 1
-      self.copyCell?.shadowView?.alpha = 0
-      copyView.frontContainerView.subviewsForEach { if $0.tag == Constants.HideKey { $0.alpha = 0 } }
-    }, completion: { success in
-      let data = NSKeyedArchiver.archivedDataWithRootObject(copyView.frontContainerView)
-      guard case let headerView as UIView = NSKeyedUnarchiver.unarchiveObjectWithData(data) else {
-        fatalError("must copy")
-      }
-      completion(headerView)
-    })
-  }
-  
-  func popTransitionAnimationContantOffset(offset: CGFloat, backImage: UIImage?) {
-    guard let copyCell = self.copyCell else {
-      return
+
+    func pushTransitionAnimationIndex(_ currentIndex: Int,
+                                      collecitionView: UICollectionView,
+                                      backImage: UIImage?,
+                                      headerHeight: CGFloat,
+                                      insets: CGFloat,
+                                      completion: @escaping (UIView) -> Void) {
+
+        guard case let cell as BasePageCollectionCell = collecitionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)),
+            let copyView = cell.copyCell() else { return }
+        copyCell = copyView
+
+        // move cells
+        moveCellsCurrentIndex(currentIndex, collectionView: collecitionView)
+
+        currentCell = cell
+        cell.isHidden = true
+
+        configurateCell(copyView, backImage: backImage)
+        backImageView = addImageToView(copyView.backContainerView, image: backImage)
+
+        openBackViewConfigureConstraints(copyView, height: headerHeight, insets: insets)
+        openFrontViewConfigureConstraints(copyView, height: headerHeight, insets: insets)
+
+        // corner animation
+        copyView.backContainerView.animationCornerRadius(0, duration: duration)
+        copyView.frontContainerView.animationCornerRadius(0, duration: duration)
+        copyView.center = view.center
+
+        // constraints animation
+        UIView.animate(withDuration: duration, delay: 0, options: UIView.AnimationOptions(), animations: {
+            self.view.layoutIfNeeded()
+            self.backImageView?.alpha = 1
+            self.copyCell?.shadowView?.alpha = 0
+            copyView.frontContainerView.subviewsForEach { if $0.tag == Constants.HideKey { $0.alpha = 0 } }
+        }, completion: { _ in
+            let data = NSKeyedArchiver.archivedData(withRootObject: copyView.frontContainerView)
+            guard case let headerView as UIView = NSKeyedUnarchiver.unarchiveObject(with: data) else {
+                fatalError("must copy")
+            }
+            completion(headerView)
+        })
+    }
+
+    func popTransitionAnimationContantOffset(_ offset: CGFloat, backImage: UIImage?) {
+        guard let copyCell = self.copyCell else {
+            return
+        }
+
+        backImageView?.image = backImage
+        // configuration start position
+        configureCellBeforeClose(copyCell, offset: offset)
+
+        closeBackViewConfigurationConstraints(copyCell)
+        closeFrontViewConfigurationConstraints(copyCell)
+
+        // corner animation
+        copyCell.backContainerView.animationCornerRadius(copyCell.backContainerView.layer.cornerRadius, duration: duration)
+        copyCell.frontContainerView.animationCornerRadius(copyCell.frontContainerView.layer.cornerRadius, duration: duration)
+
+        UIView.animate(withDuration: duration, delay: 0, options: UIView.AnimationOptions(), animations: {
+            self.rightCell?.center.x -= self.step
+            self.leftCell?.center.x += self.step
+
+            self.view.layoutIfNeeded()
+            self.backImageView?.alpha = 0
+            copyCell.shadowView?.alpha = 1
+
+            copyCell.frontContainerView.subviewsForEach { if $0.tag == Constants.HideKey { $0.alpha = 1 } }
+        }, completion: { _ in
+            self.currentCell?.isHidden = false
+            self.removeCurrentCell()
+        })
     }
-    
-    backImageView?.image = backImage
-    // configuration start position
-    configureCellBeforeClose(copyCell, offset: offset)
-    
-    closeBackViewConfigurationConstraints(copyCell)
-    closeFrontViewConfigurationConstraints(copyCell)
-    
-    // corner animation
-    copyCell.backContainerView.animationCornerRadius(copyCell.backContainerView.layer.cornerRadius, duration: duration)
-    copyCell.frontContainerView.animationCornerRadius(copyCell.frontContainerView.layer.cornerRadius, duration: duration)
-    
-    UIView.animateWithDuration(duration, delay: 0, options: .CurveEaseInOut, animations: {
-      self.rightCell?.center.x -= self.step
-      self.leftCell?.center.x  += self.step
-      
-      self.view.layoutIfNeeded()
-      self.backImageView?.alpha  = 0
-      copyCell.shadowView?.alpha = 1
-      
-      copyCell.frontContainerView.subviewsForEach { if $0.tag == Constants.HideKey { $0.alpha = 1 } }
-      }, completion: { success in
-         self.currentCell?.hidden = false
-         self.removeCurrentCell()
-    })
-  }
 }
 
 // MARK: Helpers
 
 extension TransitionDriver {
-  
-  private func removeCurrentCell()  {
-    if case let currentCell as UIView = self.copyCell {
-      currentCell.removeFromSuperview()
-    }
-  }
-  
-  private func configurateCell(cell: BasePageCollectionCell, backImage: UIImage?) {
-    cell.translatesAutoresizingMaskIntoConstraints = false
-    view.addSubview(cell)
-    
-    // add constraints
-    [(NSLayoutAttribute.Width, cell.bounds.size.width), (NSLayoutAttribute.Height, cell.bounds.size.height)].forEach { info in
-      cell >>>- {
-        $0.attribute = info.0
-        $0.constant  = info.1
-      }
-    }
-    
-    [NSLayoutAttribute.CenterX, .CenterY].forEach { attribute in
-      (view, cell) >>>- { $0.attribute = attribute }
-    }
-    cell.layoutIfNeeded()
-  }
-  
-  private func addImageToView(view: UIView, image: UIImage?) -> UIImageView? {
-    guard let image = image else { return nil }
-    
-    let imageView = Init(UIImageView(image: image)) {
-      $0.translatesAutoresizingMaskIntoConstraints = false
-      $0.alpha = 0
-    }
-    view.addSubview(imageView)
-    
-    // add constraints
-    [NSLayoutAttribute.Left, .Right, .Top, .Bottom].forEach { attribute in
-      (view, imageView) >>>- { $0.attribute = attribute }
-    }
-    imageView.layoutIfNeeded()
-    
-    return imageView
-  }
-  
-  private func moveCellsCurrentIndex(currentIndex: Int, collectionView: UICollectionView) {
-    self.leftCell  = nil
-    self.rightCell = nil
 
-    if let leftCell = collectionView.cellForItemAtIndexPath(NSIndexPath(forRow: currentIndex - 1, inSection: 0)) {
-      let step = leftCell.frame.size.width + (leftCell.frame.origin.x - collectionView.contentOffset.x)
-      UIView.animateWithDuration(0.2, animations: {
-        leftCell.center.x -= step
-      })
-      self.leftCell = leftCell
-      self.step     = step
+    fileprivate func removeCurrentCell() {
+        if case let currentCell as UIView = copyCell {
+            currentCell.removeFromSuperview()
+        }
     }
-    
-    if let rightCell = collectionView.cellForItemAtIndexPath(NSIndexPath(forRow: currentIndex + 1, inSection: 0)) {
-      let step = collectionView.frame.size.width - (rightCell.frame.origin.x - collectionView.contentOffset.x)
-      UIView.animateWithDuration(0.2, animations: {
-        rightCell.center.x += step
-      })
-      self.rightCell = rightCell
-      self.step      = step
+
+    fileprivate func configurateCell(_ cell: BasePageCollectionCell, backImage _: UIImage?) {
+        cell.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(cell)
+
+        // add constraints
+        [(NSLayoutConstraint.Attribute.width, cell.bounds.size.width), (NSLayoutConstraint.Attribute.height, cell.bounds.size.height)].forEach { info in
+            cell >>>- {
+                $0.attribute = info.0
+                $0.constant = info.1
+                return
+            }
+        }
+
+        [NSLayoutConstraint.Attribute.centerX, .centerY].forEach { attribute in
+            (view, cell) >>>- {
+                $0.attribute = attribute
+                return
+            }
+        }
+        cell.layoutIfNeeded()
+    }
+
+    fileprivate func addImageToView(_ view: UIView, image: UIImage?) -> UIImageView? {
+        guard let image = image else { return nil }
+
+        let imageView = Init(UIImageView(image: image)) {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            $0.alpha = 0
+        }
+        view.addSubview(imageView)
+
+        // add constraints
+        [NSLayoutConstraint.Attribute.left, .right, .top, .bottom].forEach { attribute in
+            (view, imageView) >>>- {
+                $0.attribute = attribute
+                return
+            }
+        }
+        imageView.layoutIfNeeded()
+
+        return imageView
+    }
+
+    fileprivate func moveCellsCurrentIndex(_ currentIndex: Int, collectionView: UICollectionView) {
+        leftCell = nil
+        rightCell = nil
+
+        if let leftCell = collectionView.cellForItem(at: IndexPath(row: currentIndex - 1, section: 0)) {
+            let step = leftCell.frame.size.width + (leftCell.frame.origin.x - collectionView.contentOffset.x)
+            UIView.animate(withDuration: 0.2, animations: {
+                leftCell.center.x -= step
+            })
+            self.leftCell = leftCell
+            self.step = step
+        }
+
+        if let rightCell = collectionView.cellForItem(at: IndexPath(row: currentIndex + 1, section: 0)) {
+            let step = collectionView.frame.size.width - (rightCell.frame.origin.x - collectionView.contentOffset.x)
+            UIView.animate(withDuration: 0.2, animations: {
+                rightCell.center.x += step
+            })
+            self.rightCell = rightCell
+            self.step = step
+        }
     }
-  }
 }
 
 // MARK: animations
 
 extension TransitionDriver {
-  
-  private func openFrontViewConfigureConstraints(cell: BasePageCollectionCell, height: CGFloat, insets: CGFloat) {
-    
-    if let heightConstraint = cell.frontContainerView.getConstraint(.Height) {
-      frontViewFrame.size.height = heightConstraint.constant
-      heightConstraint.constant  = height
-    }
-    
-    if let widthConstraint = cell.frontContainerView.getConstraint(.Width) {
-      frontViewFrame.size.width = widthConstraint.constant
-      widthConstraint.constant  = view.bounds.size.width
-    }
-    
-    frontViewFrame.origin.y        = cell.frontConstraintY.constant
-    cell.frontConstraintY.constant = -view.bounds.size.height / 2 + height / 2 + insets
-  }
-  
-  private func openBackViewConfigureConstraints(cell: BasePageCollectionCell, height: CGFloat, insets: CGFloat) {
-    
-    if let heightConstraint = cell.backContainerView.getConstraint(.Height) {
-      backViewFrame.size.height = heightConstraint.constant
-      heightConstraint.constant = view.bounds.size.height - height
-    }
-    
-    if let widthConstraint = cell.backContainerView.getConstraint(.Width) {
-      backViewFrame.size.width = widthConstraint.constant
-      widthConstraint.constant = view.bounds.size.width
-    }
-    
-    backViewFrame.origin.y        = cell.backConstraintY.constant
-    cell.backConstraintY.constant = view.bounds.size.height / 2 - (view.bounds.size.height - 236) / 2 + insets
-  }
-  
-  private func closeBackViewConfigurationConstraints(cell: BasePageCollectionCell?) {
-    guard let cell = cell else { return }
-    
-    let heightConstraint       = cell.backContainerView.getConstraint(.Height)
-    heightConstraint?.constant = backViewFrame.size.height
 
-    let widthConstraint       = cell.backContainerView.getConstraint(.Width)
-    widthConstraint?.constant = backViewFrame.size.width
+    fileprivate func openFrontViewConfigureConstraints(_ cell: BasePageCollectionCell, height: CGFloat, insets: CGFloat) {
 
-    cell.backConstraintY.constant = backViewFrame.origin.y
-  }
-  
-  private func closeFrontViewConfigurationConstraints(cell: BasePageCollectionCell?) {
-    guard let cell = cell else { return }
-    
-    if let heightConstraint = cell.frontContainerView.getConstraint(.Height) {
-      heightConstraint.constant = frontViewFrame.size.height
+        if let heightConstraint = cell.frontContainerView.getConstraint(.height) {
+            frontViewFrame.size.height = heightConstraint.constant
+            heightConstraint.constant = height
+        }
+
+        if let widthConstraint = cell.frontContainerView.getConstraint(.width) {
+            frontViewFrame.size.width = widthConstraint.constant
+            widthConstraint.constant = view.bounds.size.width
+        }
+
+        frontViewFrame.origin.y = cell.frontConstraintY.constant
+        cell.frontConstraintY.constant = -view.bounds.size.height / 2 + height / 2 + insets
     }
-    
-    if let widthConstraint = cell.frontContainerView.getConstraint(.Width) {
-      widthConstraint.constant = frontViewFrame.size.width
+
+    fileprivate func openBackViewConfigureConstraints(_ cell: BasePageCollectionCell, height: CGFloat, insets: CGFloat) {
+
+        if let heightConstraint = cell.backContainerView.getConstraint(.height) {
+            backViewFrame.size.height = heightConstraint.constant
+            heightConstraint.constant = view.bounds.size.height - height
+        }
+
+        if let widthConstraint = cell.backContainerView.getConstraint(.width) {
+            backViewFrame.size.width = widthConstraint.constant
+            widthConstraint.constant = view.bounds.size.width
+        }
+
+        backViewFrame.origin.y = cell.backConstraintY.constant
+    cell.backConstraintY.constant = view.bounds.size.height / 2 - (view.bounds.size.height - height) / 2 + insets
     }
-    
-    cell.frontConstraintY.constant = frontViewFrame.origin.y
-  }
-  
-  private func configureCellBeforeClose(cell: BasePageCollectionCell, offset: CGFloat) {
-    cell.frontConstraintY.constant -= offset
-    cell.backConstraintY.constant  -= offset / 2.0
-    if let heightConstraint = cell.backContainerView.getConstraint(.Height) {
-      heightConstraint.constant += offset
+
+    fileprivate func closeBackViewConfigurationConstraints(_ cell: BasePageCollectionCell?) {
+        guard let cell = cell else { return }
+
+        let heightConstraint = cell.backContainerView.getConstraint(.height)
+        heightConstraint?.constant = backViewFrame.size.height
+
+        let widthConstraint = cell.backContainerView.getConstraint(.width)
+        widthConstraint?.constant = backViewFrame.size.width
+
+        cell.backConstraintY.constant = backViewFrame.origin.y
+    }
+
+    fileprivate func closeFrontViewConfigurationConstraints(_ cell: BasePageCollectionCell?) {
+        guard let cell = cell else { return }
+
+        if let heightConstraint = cell.frontContainerView.getConstraint(.height) {
+            heightConstraint.constant = frontViewFrame.size.height
+        }
+
+        if let widthConstraint = cell.frontContainerView.getConstraint(.width) {
+            widthConstraint.constant = frontViewFrame.size.width
+        }
+
+        cell.frontConstraintY.constant = frontViewFrame.origin.y
+    }
+
+    fileprivate func configureCellBeforeClose(_ cell: BasePageCollectionCell, offset: CGFloat) {
+        cell.frontConstraintY.constant -= offset
+        cell.backConstraintY.constant -= offset / 2.0
+        if let heightConstraint = cell.backContainerView.getConstraint(.height) {
+            heightConstraint.constant += offset
+        }
+        cell.contentView.layoutIfNeeded()
     }
-    cell.contentView.layoutIfNeeded()
-  }
 }

expanding-collection.podspec

@@ -1,12 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'expanding-collection'
-  s.version      = '0.3.0'
+  s.version      = '2.1.1'
   s.summary      = 'Transition animtion from CollectionView to TableView'
   s.license      = 'MIT'
   s.homepage     = 'https://github.com/Ramotion/expanding-collection'
   s.author       = { 'Juri Vasylenko' => 'juri.v@ramotion.com' }
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.source       = { :git => 'https://github.com/Ramotion/expanding-collection.git', :tag => s.version.to_s }
   s.source_files  = 'Source/**/*.swift'
-  s.requires_arc = true
 end