Merge branch 'fix69'

# Conflicts: # Source/ExpandingTableViewController/ExpandingTableViewController.swift # Source/TransitionDriver/TransitionDriver.swift
Fixes #69
2018-01-24 12:00:23 +03:00 · 2018-01-24 11:57:57 +03:00 · 2018-01-18 18:09:35 +03:00 · 2018-01-18 18:02:55 +03:00 · 2018-01-18 18:01:04 +03:00 · 2018-01-16 13:09:21 +03:00
31 changed files with 1330 additions and 1483 deletions
@@ -0,0 +1 @@
+4.0
@@ -1,6 +1,13 @@
-osx_image: xcode8
+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
@@ -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 = (
@@ -445,24 +416,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,23 +441,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Alex K.";
 				TargetAttributes = {
 					848596271CF585F3000BCC74 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 34MUF9YXTA;
-						LastSwiftMigration = 0800;
-					};
-					8485963B1CF585F3000BCC74 = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
-						TestTargetID = 848596271CF585F3000BCC74;
+						LastSwiftMigration = 0920;
 					};
 					8499D8131D001B82004B5B37 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = LEAZS7L33U;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0920;
 					};
 				};
 			};
@@ -522,7 +470,6 @@
 			projectRoot = "";
 			targets = (
 				848596271CF585F3000BCC74 /* DemoExpandingCollection */,
-				8485963B1CF585F3000BCC74 /* DemoExpandingCollectionTests */,
 				8499D8131D001B82004B5B37 /* ExpandingCollection */,
 			);
 		};
@@ -540,13 +487,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		8485963A1CF585F3000BCC74 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8499D8121D001B82004B5B37 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -601,14 +541,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		848596381CF585F3000BCC74 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				848596411CF585F3000BCC74 /* DemoExpandingCollectionTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8499D80F1D001B82004B5B37 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -630,11 +562,6 @@
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
-		8485963E1CF585F3000BCC74 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 848596271CF585F3000BCC74 /* DemoExpandingCollection */;
-			targetProxy = 8485963D1CF585F3000BCC74 /* PBXContainerItemProxy */;
-		};
 		8499D81A1D001B82004B5B37 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 8499D8131D001B82004B5B37 /* ExpandingCollection */;
@@ -671,14 +598,20 @@
 				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_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_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;
@@ -718,14 +651,20 @@
 				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_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_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;
@@ -764,7 +703,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -782,33 +722,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 3.0;
-			};
-			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)";
-				SWIFT_VERSION = 3.0;
-				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)";
-				SWIFT_VERSION = 3.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DemoExpandingCollection.app/DemoExpandingCollection";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -829,7 +744,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -853,7 +769,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -881,15 +798,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 = (
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0920"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -36,6 +37,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -11,47 +11,29 @@ import UIKit
@UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

-  var window: UIWindow?
+    var window: UIWindow?

-
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> 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 _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        configureNavigationTabBar()
+        return true
+    }
 }

 extension AppDelegate {
-  
-  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 = [
-      NSForegroundColorAttributeName : UIColor.white,
-      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 = [
+            NSAttributedStringKey.foregroundColor: UIColor.white,
+            NSAttributedStringKey.shadow: shadow,
+        ]
+    }
 }
@@ -39,6 +39,11 @@
      "idiom" : "iphone",
      "size" : "60x60",
      "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
@@ -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>
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="L1n-Ia-Jrw">
+<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>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <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>
@@ -34,9 +35,9 @@
                        <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>
@@ -62,7 +63,7 @@
                                <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"/>
@@ -74,8 +75,6 @@
                    </navigationItem>
                    <connections>
                        <outlet property="pageLabel" destination="Irl-Rb-fcB" id="oUZ-x9-PkD"/>
-                        <outlet property="titleImageView" destination="92b-RV-q6w" id="3lS-Ot-c9A"/>
-                        <outlet property="titleImageViewXConstraint" destination="kLZ-Jr-wTP" id="cFl-I4-nzg"/>
                        <segue destination="7RW-i0-HfN" kind="show" identifier="NoName" id="enc-PY-spo"/>
                    </connections>
                </viewController>
@@ -90,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"/>
@@ -131,7 +130,7 @@
                                                    </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="49" width="327" height="26.5"/>
+                                                    <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="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
@@ -188,7 +187,7 @@
                                                            </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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="Aal-gs-pRU"/>
                                                            </constraints>
@@ -250,7 +249,7 @@
                                                            </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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="X0h-Mf-l6D"/>
                                                            </constraints>
@@ -312,7 +311,7 @@
                                                            </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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="eVB-K1-R8b"/>
                                                            </constraints>
@@ -374,7 +373,7 @@
                                                            </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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="nvf-wL-GDB"/>
                                                            </constraints>
@@ -436,7 +435,7 @@
                                                            </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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="d7O-23-tUP"/>
                                                            </constraints>
@@ -468,10 +467,10 @@
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="dHy-no-3dG">
-                                                    <rect key="frame" x="40" y="15" width="295" height="100"/>
+                                                    <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="295" height="40"/>
+                                                            <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"/>
@@ -481,24 +480,24 @@
                                                                    </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="50" y="11" width="168" height="18"/>
+                                                                    <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="228" y="14" width="43" height="12"/>
+                                                                    <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="281" y="13.5" width="14" height="13"/>
+                                                                    <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="284.5" height="60"/>
+                                                            <rect key="frame" x="0.0" y="40" width="0.0" height="60"/>
                                                            <constraints>
                                                                <constraint firstAttribute="height" constant="60" id="kTR-Ho-zi0"/>
                                                            </constraints>
@@ -559,10 +558,6 @@
                        </barButtonItem>
                    </navigationItem>
                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <outlet property="titleImageView" destination="a24-t2-9jd" id="dZR-2A-N8b"/>
-                        <outlet property="titleImageViewXConstraint" destination="sdW-OO-2BS" id="huK-Bc-7RX"/>
-                    </connections>
                </tableViewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="koT-TQ-RUs" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
@@ -576,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>
@@ -1,11 +1,11 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/AliSoftware/SwiftGen

 #if os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIImage
-  typealias Image = UIImage
+    import UIKit.UIImage
+    typealias Image = UIImage
 #elseif os(OSX)
-  import AppKit.NSImage
-  typealias Image = NSImage
+    import AppKit.NSImage
+    typealias Image = NSImage
 #endif

 // swiftlint:disable file_length
@@ -13,47 +13,48 @@

 // swiftlint:disable type_body_length
 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"
+    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
-  }
+    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
+    }
 }
+
 // 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
-  }
+    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 {}
@@ -10,25 +10,25 @@ import UIKit

 extension UICollectionView {

-  func getReusableCellWithIdentifier<T: UICollectionViewCell>(_ indexPath: IndexPath) -> T where T: CollectionViewCellIdentifiable {
-    guard let cell = dequeueReusableCell(withReuseIdentifier: T.cellIdentifier, for: 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(describing: self)
-  }
+    static var cellIdentifier: String {
+        return String(describing: self)
+    }
 }

-extension UICollectionViewCell : CollectionViewCellIdentifiable { }
+extension UICollectionViewCell: CollectionViewCellIdentifiable {}
@@ -9,38 +9,38 @@
 import UIKit

 extension UIStoryboard {
-  
-  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 where T: StoryboardIdentifiable {
-    guard let viewController = self.instantiateViewController(withIdentifier: 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(describing: self)
-  }
+    static var storyboardIdentifier: String {
+        return String(describing: self)
+    }
 }
@@ -9,67 +9,55 @@
 import UIKit

 class DemoTableViewController: ExpandingTableViewController {
-  
-  fileprivate var scrollOffsetY: CGFloat = 0
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    configureNavBar()
-    let image1 = Asset.backgroundImage.image
-    tableView.backgroundView = UIImageView(image: image1)
-  }
-  
-  @IBOutlet weak var titleImageView: UIImageView!
-  @IBOutlet weak var titleImageViewXConstraint: NSLayoutConstraint!
-  
-}

-// MARK: - Lifecycle
-extension DemoTableViewController {
-  
-  override func viewWillLayoutSubviews() {
-    super.viewWillLayoutSubviews()
-    guard let titleView = navigationItem.titleView else { return }
-    let center = UIScreen.main.bounds.midX
-    let diff = center - titleView.frame.midX
-    titleImageViewXConstraint.constant = diff
-  }
-  
+    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 {
-  
-  fileprivate func configureNavBar() {
-    navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.withRenderingMode(UIImageRenderingMode.alwaysOriginal)
-    navigationItem.rightBarButtonItem?.image = navigationItem.rightBarButtonItem?.image!.withRenderingMode(UIImageRenderingMode.alwaysOriginal)
-  }
-  
+
+    fileprivate func configureNavBar() {
+        navigationItem.leftBarButtonItem?.image = navigationItem.leftBarButtonItem?.image!.withRenderingMode(UIImageRenderingMode.alwaysOriginal)
+        navigationItem.rightBarButtonItem?.image = navigationItem.rightBarButtonItem?.image!.withRenderingMode(UIImageRenderingMode.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)
-      }
+extension DemoTableViewController {
+
+    @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) {
+
+    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)
@@ -77,7 +65,7 @@ extension DemoTableViewController {
 //      }
 //      popTransitionAnimation()
 //    }
-    
-    scrollOffsetY = scrollView.contentOffset.y
-  }
+
+        scrollOffsetY = scrollView.contentOffset.y
+    }
 }
@@ -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
    }
 }
@@ -9,148 +9,136 @@
 import UIKit

 class DemoViewController: ExpandingViewController {
-  
-  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 weak var pageLabel: UILabel!
-  @IBOutlet weak var titleImageView: UIImageView!
-  @IBOutlet weak var titleImageViewXConstraint: NSLayoutConstraint!
-  
+
+    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: - Lifecycle 🌎
+
 extension DemoViewController {
-  
-  override func viewDidLoad() {
-    itemSize = CGSize(width: 256, height: 335)
-    super.viewDidLoad()
-    
-    registerCell()
-    fillCellIsOpenArray()
-    addGesture(to: collectionView!)
-    configureNavBar()
-  }
-  
-  override func viewWillLayoutSubviews() {
-    super.viewWillLayoutSubviews()
-    guard let titleView = navigationItem.titleView else { return }
-    let center = UIScreen.main.bounds.midX
-    let diff = center - titleView.frame.midX
-    titleImageViewXConstraint.constant = diff
-  }
-  
+
+    override func viewDidLoad() {
+        itemSize = CGSize(width: 256, height: 335)
+        super.viewDidLoad()
+
+        registerCell()
+        fillCellIsOpenArray()
+        addGesture(to: collectionView!)
+        configureNavBar()
+    }
 }

 // MARK: Helpers
+
 extension DemoViewController {
-  
-  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(UIImageRenderingMode.alwaysOriginal)
-  }
-  
+
+    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(UIImageRenderingMode.alwaysOriginal)
+    }
 }

 /// MARK: Gesture
 extension DemoViewController {
-  
-  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)
-  }

-  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)
-      }
+    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
+
 extension DemoViewController {
-  
-  func scrollViewDidScroll(_ scrollView: UIScrollView) {
-    pageLabel.text = "\(currentIndex+1)/\(items.count)"
-  }
-  
-}

-// MARK: UICollectionViewDataSource
-extension DemoViewController {
-  
-  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 }
-
-    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: 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)
-      }
+    func scrollViewDidScroll(_: UIScrollView) {
+        pageLabel.text = "\(currentIndex + 1)/\(items.count)"
    }
-  }
-  
 }

 // MARK: UICollectionViewDataSource
+
 extension DemoViewController {
-  
-  override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-    return items.count
-  }
-  
-  override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-    return collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: DemoCollectionViewCell.self), for: indexPath)
-  }
-  
+
+    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 }
+
+        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: 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(_: 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)
+    }
 }
@@ -8,81 +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 {
-  
-  fileprivate func configurateImageViews() {
-    configureImageView(normalView, imageName: normalImageName)
-    configureImageView(selectedView, imageName: selectedImageName)
-    
-    selectedView.alpha = 0
-//    normalView.hidden = true
-  }

-  fileprivate 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)
-        return
-      }
+        selectedView.alpha = 0
    }
-    
-    [NSLayoutAttribute.height, .width].forEach { attribute in
-      imageView >>>- {
-        $0.attribute = attribute
-        $0.constant = 20
-        return
-      }
+
+    fileprivate func configureImageView(_ imageView: UIImageView, imageName: String) {
+        guard let customView = customView else { return }
+        guard let image = UIImage(named: imageName)?.withRenderingMode(UIImageRenderingMode.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)
    }
-  }
 }
@@ -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: Double.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(-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            = kCAFillModeForwards
-      $0.isRemovedOnCompletion = 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 = kCAFillModeForwards
+            $0.isRemovedOnCompletion = false
+        }
    }
-  }
 }
@@ -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.
-        measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-}
@@ -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>
@@ -1,31 +1,33 @@
-[![header](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/header.png)](https://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-logo)
+![header](./header.png)
+![animation](./preview.gif)
+

 # 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/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)

+# 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>
+
 ## 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><br>**Looking for developers for your project?** 
+We specialize in the designing and coding of custom UI for Mobile Apps and Websites.<br>

-<a href="https://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us/#Get_in_Touch" > <img src="https://github.com/Ramotion/navigation-stack/raw/master/contact_our_team@2x.png" width="150" height="30"></a>
+**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="https://ramotion.com/?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us/#Get_in_Touch"> 
+<img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a> <br>

-[![Animation](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/preview.gif)](https://dribbble.com/shots/2741477-iOS-Expanding-Collection-Open-Source)

 The [iPhone mockup](https://store.ramotion.com?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).

-## Try this UI control in action
-
-<a href="https://itunes.apple.com/app/apple-store/id1182360240?pt=550053&ct=gthb-expanding-collection&mt=8" > <img src="https://github.com/Ramotion/navigation-stack/raw/master/Download_on_the_App_Store_Badge_US-UK_135x40.png" width="170" height="58"></a>
-
 ## Requirements

 - iOS 9.0+
@@ -37,6 +39,8 @@ Just add the Source folder to your project.

 or use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
+pod 'expanding-collection', '~> 1.1.2' swift 4
+
 pod 'expanding-collection', '~> 1.0.3' swift 3

 pod 'expanding-collection', '~> 0.3.2' swift 2
@@ -172,7 +176,18 @@ override func viewDidLoad() {
 Expanding collection is released under the MIT license.
 See [LICENSE](./LICENSE) for details.

-## Follow us
+<br>

+# 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="https://ramotion.com/?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us/#Get_in_Touch"> 
+<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>
 [![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)
@@ -10,56 +10,55 @@ import UIKit

 /// Base class for UITableViewcontroller which have back transition method
 open class ExpandingTableViewController: UITableViewController {
-  
-  // MARK: Vars
-  /// The height of the table view header
-  open var headerHeight: CGFloat = 236
-  
-  var transitionDriver: TransitionDriver?
+
+    // 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 {
-  
-  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
-  }

+    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
+
+    /**
+     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)
    }
-    
-    let backImage = getScreen()
-    var offset = tableView.contentOffset.y > headerHeight ? headerHeight : tableView.contentOffset.y
-    
-    offset += getTabBarHeight()
- 
-    transitionDriver.popTransitionAnimationContantOffset(offset, backImage: backImage)
-    let _ = self.navigationController?.popViewController(animated: false)
-  }
 }
@@ -10,209 +10,207 @@ import UIKit

 /// Base class for UICollectionViewCell
 open class BasePageCollectionCell: UICollectionViewCell {
-  
-  /// 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
-  
-  // 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
+    /// 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 open weak var frontContainerView: UIView!
-  /// The view used as the back of the cell must connectid from xib or storyboard.
-  @IBOutlet open weak var backContainerView: UIView!
-  
-  /// constraints for backContainerView must connectid from xib or storyboard
-  @IBOutlet open weak var backConstraintY: NSLayoutConstraint!
-  /// constraints for frontContainerView must connectid from xib or storyboard
-  @IBOutlet open weak 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.
-   */
-  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 {
-  
-  open override func awakeFromNib() {
-    super.awakeFromNib()
-    
-    commonInit()
-  }
-  
-  fileprivate 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 }
-    
-    if ySpacing == .greatestFiniteMagnitude {
-      frontConstraintY.constant = isOpen == true ? -frontContainerView.bounds.size.height / 5 : 0
-      backConstraintY.constant  = isOpen == true ? frontContainerView.bounds.size.height / 5 - yOffset / 2 : 0
-    } else {
-      frontConstraintY.constant = isOpen == true ? -ySpacing / 2 : 0
-      backConstraintY.constant  = isOpen == true ? ySpacing / 2 : 0
+
+    /**
+     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 / 5 : 0
+            backConstraintY.constant = isOpen == true ? frontContainerView.bounds.size.height / 5 - 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
+        configurationCell()
+
+        if animated == true {
+            UIView.animate(withDuration: 0.3, delay: 0, options: UIViewAnimationOptions(), animations: {
+                self.contentView.layoutIfNeeded()
+            }, completion: nil)
+        } else {
+            contentView.layoutIfNeeded()
+        }
    }
-    
-    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
-    configurationCell()
-    
-    if animated == true {
-      UIView.animate(withDuration: 0.3, delay: 0, options: UIViewAnimationOptions(), animations: {
-        self.contentView.layoutIfNeeded()
-      }, completion: nil)
-    } else {
-      self.contentView.layoutIfNeeded()
-    }
-   
-  }
 }

 // MARK: Configuration

 extension BasePageCollectionCell {
-  
-  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
-  }
-  
-  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)
-      }
+
+    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
-          return
+
+    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
+        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
+                    return
+                }
+            }
+        }
+
+        for info: (attribute: NSLayoutAttribute, offset: CGFloat) in [(NSLayoutAttribute.centerX, 0), (NSLayoutAttribute.centerY, 30)] {
+            (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
-        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
-  }
-  
-	
-	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
+
+    func configurationCell() {
+        // Prevents indefinite growing of the cell issue
+        let i: CGFloat = isOpened ? 1 : -1
+        let superHeight = superview?.frame.size.height ?? 0
+
+        frame.size.height += i * superHeight
+        frame.origin.y -= i * superHeight / 2
        if additionalWidth == .greatestFiniteMagnitude {
            frame.origin.x -= i * yOffset / 2
            frame.size.width += i * yOffset
@@ -220,100 +218,98 @@ extension BasePageCollectionCell {
            frame.origin.x -= i * additionalWidth / 2
            frame.size.width += i * additionalWidth
        }
-	}
-	
-  
-  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
    }
-  }
+
+    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 {
-  
-  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)
-      }
-    }
-  }
-  
-  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
-  }

-  
-  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
+    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
-  }
-  
-  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)
-  }
-  
-  fileprivate func configureOutletFromDecoder(_ coder: NSCoder) {
-    if case let shadowView as UIView = coder.decodeObject(forKey: 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.decodeObject(forKey: 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.decodeObject(forKey: 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.decodeObject(forKey: Constants.frontContainerY) {
-      frontConstraintY = constraint
-    }
-    
-    if case let constraint as NSLayoutConstraint = coder.decodeObject(forKey: Constants.backContainerY) {
-      backConstraintY = constraint
-    }
-  }
 }
@@ -9,141 +9,141 @@
 import UIKit

 class PageCollectionLayout: UICollectionViewFlowLayout {
-  
-  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 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 {
-  
-  fileprivate 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 invalidateLayout(with context: UICollectionViewLayoutInvalidationContext) {
-    super.invalidateLayout(with: 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 targetContentOffset(forProposedContentOffset 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 fabs(attributes.center.x - proposedContentOffsetCenterX) < fabs(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 = CGRect(x: proposedContentOffset.x, y: 0, width: collectionView.bounds.width, height: collectionView.bounds.height)
-    guard let layoutAttributes = self.layoutAttributesForElements(in: 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 CGPoint(x: newOffsetX, y: proposedContentOffset.y)
-  }
-  
-  override func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) -> Bool {
-    return true
-  }
-  
-  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
-  }
 }

 // MARK: helpers

 extension PageCollectionLayout {
-  
-  fileprivate 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 = UIEdgeInsetsMake(0, inset, 0, 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 = CGPoint(x: -inset, y: 0)
-  }
 }
@@ -9,42 +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                           = UIColor(white: 0, alpha: 0)
-    }
-    view.addSubview(collectionView)
-    
-    // add constraints
-    collectionView >>>- {
-      $0.attribute = .height
-      $0.constant  = height
-      return
-    }
-    [NSLayoutAttribute.left, .right, .centerY].forEach { attribute in
-      (view, collectionView) >>>- {
-        $0.attribute = attribute
-        return
+
+    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 = UIColor(white: 0, alpha: 0)
        }
+        view.addSubview(collectionView)
+
+        // add constraints
+        collectionView >>>- {
+            $0.attribute = .height
+            $0.constant = height
+            return
+        }
+        [NSLayoutAttribute.left, .right, .centerY].forEach { attribute in
+            (view, collectionView) >>>- {
+                $0.attribute = attribute
+                return
+            }
+        }
+
+        return collectionView
    }
-    
-    return collectionView
-  }
-  
 }
@@ -10,133 +10,132 @@ import UIKit

 /// UIViewController with UICollectionView with custom transition method
 open class ExpandingViewController: UIViewController {
-  
-  /// The default size to use for cells.
-  open var itemSize = CGSize(width: 256, height: 335)
-  
-  ///  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
+
+    /// The default size to use for cells.
+    open var itemSize = CGSize(width: 256, height: 335)
+
+    ///  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
-    let a = collectionView.contentOffset.x + startOffset + itemSize.width / 2
-    let b = itemSize.width + minimumLineSpacing
-    return Int(a / b)
-  }
 }

 // MARK: life cicle

 extension ExpandingViewController {
-  
-  open 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.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)
-    }
-  }
 }

 // MARK: create

 extension ExpandingViewController {
-  
-  fileprivate func commonInit() {
-    
-    let layout = PageCollectionLayout(itemSize: itemSize)
-    collectionView = PageCollectionView.createOnView(view,
-                                                     layout: layout,
-                                                     height: itemSize.height + itemSize.height / 5 * 2,
-                                                     dataSource: self,
-                                                     delegate: self)
-    if #available(iOS 10.0, *) {
-      collectionView?.isPrefetchingEnabled = false
-    } 
-    transitionDriver = TransitionDriver(view: view)
-  }
+
+    fileprivate func commonInit() {
+
+        let layout = PageCollectionLayout(itemSize: itemSize)
+        collectionView = PageCollectionView.createOnView(view,
+                                                         layout: layout,
+                                                         height: itemSize.height + itemSize.height / 5 * 2,
+                                                         dataSource: self,
+                                                         delegate: self)
+        if #available(iOS 10.0, *) {
+            collectionView?.isPrefetchingEnabled = false
+        }
+        transitionDriver = TransitionDriver(view: view)
+    }
 }

 // MARK: Helpers

 extension ExpandingViewController {
-  
-  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)
-  }

+    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 {
-  
-  open func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-    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)
+    }
+
+    open func collectionView(_: UICollectionView, numberOfItemsInSection _: Int) -> Int {
+        fatalError("need emplementation in subclass")
+    }
+
+    open func collectionView(_: UICollectionView, cellForItemAt _: IndexPath) -> UICollectionViewCell {
+        fatalError("need emplementation in subclass")
    }
-    
-    cell.configureCellViewConstraintsWithSize(itemSize)
-  }
-  open func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-    fatalError("need emplementation in subclass")
-  }
-  
-  open func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-    fatalError("need emplementation in subclass")
-  }
 }

-// MARK: UIScrollViewDelegate 
+// MARK: UIScrollViewDelegate

 extension ExpandingViewController {
-  
-  public func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
-    let indexPath = IndexPath(row: currentIndex, section: 0)
-    if case let currentCell as BasePageCollectionCell = collectionView?.cellForItem(at: indexPath) {
-      currentCell.configurationCell()
-    }
-  }
-}

+    public func scrollViewDidEndDecelerating(_: UIScrollView) {
+        let indexPath = IndexPath(row: currentIndex, section: 0)
+        if case let currentCell as BasePageCollectionCell = collectionView?.cellForItem(at: indexPath) {
+            currentCell.configurationCell()
+        }
+    }
+}
@@ -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.isRemovedOnCompletion = false;
+
+    func animationCornerRadius(_ radius: CGFloat, duration: Double) {
+        let animation = Init(CABasicAnimation(keyPath: "cornerRadius")) {
+            $0.duration = duration
+            $0.toValue = radius
+            $0.fillMode = kCAFillModeForwards
+            $0.isRemovedOnCompletion = false
+        }
+
+        layer.add(animation, forKey: nil)
    }
-    
-    layer.add(animation, forKey: nil)
-  }
 }

 extension UIView: CornerAnimatable {}
@@ -8,9 +8,7 @@

 import Foundation

-
-internal func Init<Type>(_ value : Type, block: (_ object: Type) -> Void) -> Type
-{
-  block(value)
-  return value
+internal func Init<Type>(_ value: Type, block: (_ object: Type) -> Void) -> Type {
+    block(value)
+    return value
 }
@@ -9,11 +9,11 @@
 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: NSLayoutAttribute = .left
+    var secondAttribute: NSLayoutAttribute = .notAnAttribute
+    var constant: CGFloat = 0
+    var identifier: String?
+    var relation: NSLayoutRelation = .equal
 }

 precedencegroup ConstOp {
@@ -21,82 +21,80 @@ precedencegroup ConstOp {
    higherThan: AssignmentPrecedence
 }

-infix operator >>>- : ConstOp
+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), 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
 }

@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
+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
+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
-        return
+
+    func addScaleToFillConstratinsOnView(_ view: UIView) {
+        [NSLayoutAttribute.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: NSLayoutAttribute) -> NSLayoutConstraint? {
+        return constraints.filter {
+            if $0.firstAttribute == attributes && $0.secondItem == nil {
+                return true
+            }
+            return false
+        }.first
+    }
 }
@@ -9,20 +9,20 @@
 import UIKit

 extension UIView {
-  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
+    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.render(in: currentContext)
-    let image = UIGraphicsGetImageFromCurrentImageContext()
-    UIGraphicsEndImageContext()
-    
-    return image
-  }
 }
@@ -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)
-  }
-  
-  fileprivate 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 {}
@@ -9,258 +9,259 @@
 import UIKit

 class TransitionDriver {
-  
-  // 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: 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: @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: UIViewAnimationOptions(), 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.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
+
+    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: UIViewAnimationOptions(), 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: UIViewAnimationOptions(), 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.animate(withDuration: duration, delay: 0, options: UIViewAnimationOptions(), 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?.isHidden = false
-         self.removeCurrentCell()
-    })
-  }
 }

 // MARK: Helpers

 extension TransitionDriver {
-  
-  fileprivate func removeCurrentCell()  {
-    if case let currentCell as UIView = self.copyCell {
-      currentCell.removeFromSuperview()
-    }
-  }
-  
-  fileprivate 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
-        return
-      }
-    }
-    
-    [NSLayoutAttribute.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
-    [NSLayoutAttribute.left, .right, .top, .bottom].forEach { attribute in
-      (view, imageView) >>>- {
-        $0.attribute = attribute
-        return
-        }
-    }
-    imageView.layoutIfNeeded()
-    
-    return imageView
-  }
-  
-  fileprivate func moveCellsCurrentIndex(_ currentIndex: Int, collectionView: UICollectionView) {
-    self.leftCell  = nil
-    self.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
+    fileprivate func removeCurrentCell() {
+        if case let currentCell as UIView = copyCell {
+            currentCell.removeFromSuperview()
+        }
    }
-    
-    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
+
+    fileprivate 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
+                return
+            }
+        }
+
+        [NSLayoutAttribute.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
+        [NSLayoutAttribute.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 {
-  
-  fileprivate 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
-  }
-  
-  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 - 236) / 2 + insets
-  }
-  
-  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
+    fileprivate func openFrontViewConfigureConstraints(_ cell: BasePageCollectionCell, height: CGFloat, insets: CGFloat) {

-    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 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
-  }
-  
-  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
+
+    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()
-  }
 }
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = 'expanding-collection'
-  s.version      = '1.1.0'
+  s.version      = '1.1.3'
  s.summary      = 'Transition animtion from CollectionView to TableView'
  s.license      = 'MIT'
  s.homepage     = 'https://github.com/Ramotion/expanding-collection'
Author	SHA1	Message	Date
Alex K	a4d60e40f7	Merge branch 'fix69' # Conflicts: # Source/ExpandingTableViewController/ExpandingTableViewController.swift # Source/TransitionDriver/TransitionDriver.swift	2018-01-24 12:00:23 +03:00
Alex K	938a7a13c0	Fixes #69	2018-01-24 11:57:57 +03:00
i.kolpachkov	8c28b92a17	add launch screen	2018-01-18 18:09:35 +03:00
i.kolpachkov	2c2f770889	setup swift version, bump pod version	2018-01-18 18:02:55 +03:00
i.kolpachkov	019a239ee3	update swift format, update travis CI config	2018-01-18 18:01:04 +03:00
i.kolpachkov	026283a303	bump cocoapods version, update readme file	2018-01-16 13:09:21 +03:00
i.kolpachkov	2f3c7e32bb	code cleanup, improve layout, iphoneX adjustments	2018-01-16 13:05:10 +03:00
i.kolpachkov	7ac7564fff	swift 4.0 migration, project cleanup	2018-01-15 19:24:11 +03:00
Juri Vasylenko	f0ba09cc80	Update README.md	2017-11-11 18:24:32 +03:00
Travis CI	1ca20427a7	reorganize readme	2017-07-28 15:39:15 +03:00
Alex	f7dfe38777	Update README.md	2017-06-27 11:48:39 +03:00
Alex K	db3165009d	update podspec	2017-05-25 10:23:23 +03:00