Reverse animation implemented

gringoireDM · Nov 21, 2017 · 53f6c06 · 53f6c06
1 parent eb9cbb8
commit 53f6c06
Show file tree

Hide file tree

Showing 8 changed files with 389 additions and 152 deletions.
diff --git a/LNZCollectionLayouts.podspec b/LNZCollectionLayouts.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
     s.platform = :ios
-    s.version = "1.1.0"
+    s.version = "1.1.1"
     s.ios.deployment_target = '8.0'
     s.name = "LNZCollectionLayouts"
  	s.summary      = "A swift collection of UICollectionViewLayout subclasses."
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
 
     s.source = {
         :git => "https://github.com/gringoireDM/LNZCollectionLayouts.git",
-        :tag => "v1.1.0"
+        :tag => "v1.1.1"
     }
 
     s.framework = "UIKit"

diff --git a/LNZCollectionLayouts.xcodeproj/project.pbxproj b/LNZCollectionLayouts.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		500D6F131F1E32B000FE20D4 /* CollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 500D6F121F1E32B000FE20D4 /* CollectionViewController.swift */; };
 		500D6F181F1E6E5100FE20D4 /* LNZCarouselCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 500D6F161F1E6E0000FE20D4 /* LNZCarouselCollectionViewLayout.swift */; };
 		501CF9F31FBFABBD003CAC14 /* SafariAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501CF9F21FBFABBD003CAC14 /* SafariAnimator.swift */; };
+		501CF9F51FC0AEC3003CAC14 /* SafariModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501CF9F41FC0AEC3003CAC14 /* SafariModalViewController.swift */; };
 		5025EE8F1F42EA6C001521F6 /* LNZSafariTabLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5025EE8E1F42EA6C001521F6 /* LNZSafariTabLayout.swift */; };
 		5025EE931F43070A001521F6 /* SafariViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5025EE921F43070A001521F6 /* SafariViewController.swift */; };
 		50377DA41F574FFB00A567D6 /* LNZSnapToCenterCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 500D6F141F1E3D7000FE20D4 /* LNZSnapToCenterCollectionViewLayout.swift */; };
@@ -35,6 +36,7 @@
 		500D6F141F1E3D7000FE20D4 /* LNZSnapToCenterCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LNZSnapToCenterCollectionViewLayout.swift; sourceTree = "<group>"; };
 		500D6F161F1E6E0000FE20D4 /* LNZCarouselCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LNZCarouselCollectionViewLayout.swift; sourceTree = "<group>"; };
 		501CF9F21FBFABBD003CAC14 /* SafariAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariAnimator.swift; sourceTree = "<group>"; };
+		501CF9F41FC0AEC3003CAC14 /* SafariModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariModalViewController.swift; sourceTree = "<group>"; };
 		5025EE8E1F42EA6C001521F6 /* LNZSafariTabLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LNZSafariTabLayout.swift; sourceTree = "<group>"; };
 		5025EE921F43070A001521F6 /* SafariViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafariViewController.swift; sourceTree = "<group>"; };
 		508E11761F5D585200895B7D /* UICollectionViewDelegateSafariLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICollectionViewDelegateSafariLayout.swift; sourceTree = "<group>"; };
@@ -75,7 +77,7 @@
 				500D6EFF1F1E1CFD00FE20D4 /* ViewController.swift */,
 				500D6F121F1E32B000FE20D4 /* CollectionViewController.swift */,
 				5025EE921F43070A001521F6 /* SafariViewController.swift */,
-				501CF9F11FBFAB3A003CAC14 /* Animator */,
+				501CF9F41FC0AEC3003CAC14 /* SafariModalViewController.swift */,
 				500D6F011F1E1CFD00FE20D4 /* Main.storyboard */,
 				500D6F041F1E1CFD00FE20D4 /* Assets.xcassets */,
 				500D6F061F1E1CFD00FE20D4 /* LaunchScreen.storyboard */,
@@ -87,6 +89,7 @@
 		500D6F0F1F1E1D2500FE20D4 /* Layouts */ = {
 			isa = PBXGroup;
 			children = (
+				501CF9F11FBFAB3A003CAC14 /* Animator */,
 				508E11751F5D584400895B7D /* CustomDelegates */,
 				500D6F141F1E3D7000FE20D4 /* LNZSnapToCenterCollectionViewLayout.swift */,
 				500D6F101F1E1D3D00FE20D4 /* LNZInfiniteCollectionViewLayout.swift */,
@@ -187,6 +190,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				500D6F131F1E32B000FE20D4 /* CollectionViewController.swift in Sources */,
+				501CF9F51FC0AEC3003CAC14 /* SafariModalViewController.swift in Sources */,
 				500D6F001F1E1CFD00FE20D4 /* ViewController.swift in Sources */,
 				5025EE931F43070A001521F6 /* SafariViewController.swift in Sources */,
 				508E11771F5D585200895B7D /* UICollectionViewDelegateSafariLayout.swift in Sources */,

diff --git a/LNZCollectionLayouts/Animator/SafariAnimator.swift b/LNZCollectionLayouts/Animator/SafariAnimator.swift
diff --git a/LNZCollectionLayouts/Base.lproj/Main.storyboard b/LNZCollectionLayouts/Base.lproj/Main.storyboard
@@ -15,8 +15,8 @@
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="LNZCollectionLayouts" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                        <viewControllerLayoutGuide type="top" id="znc-id-M6d"/>
+                        <viewControllerLayoutGuide type="bottom" id="7mk-6z-bGA"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
@@ -141,7 +141,7 @@
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Uh-E3-Nxu">
+                                        <textView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Uh-E3-Nxu">
                                             <rect key="frame" x="0.0" y="41" width="207" height="165"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
@@ -160,6 +160,9 @@
                                     <constraint firstItem="5jb-Jc-YS3" firstAttribute="centerX" secondItem="xhQ-6r-lhM" secondAttribute="centerX" id="xgU-DT-M0n"/>
                                 </constraints>
                                 <size key="customSize" width="207" height="206"/>
+                                <connections>
+                                    <segue destination="FzH-l9-2ZS" kind="presentation" identifier="presentTabSegue" id="NSf-zP-RnO"/>
+                                </connections>
                             </collectionViewCell>
                         </cells>
                         <connections>
@@ -170,7 +173,60 @@
                 </collectionViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="q1Z-n1-GUz" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1156" y="899.10044977511257"/>
+            <point key="canvasLocation" x="1156" y="1259"/>
+        </scene>
+        <!--Safari Modal View Controller-->
+        <scene sceneID="uoW-pD-mGM">
+            <objects>
+                <viewController id="FzH-l9-2ZS" customClass="SafariModalViewController" customModule="LNZCollectionLayouts" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="7GF-GS-Xuj"/>
+                        <viewControllerLayoutGuide type="bottom" id="yMs-QI-AX0"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="F8I-rd-fPl">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" tag="10" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mBt-So-m7I">
+                                <rect key="frame" x="166" y="52" width="42" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xNa-35-AFk">
+                                <rect key="frame" x="0.0" y="73" width="375" height="594"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vbm-05-DaW">
+                                <rect key="frame" x="16" y="40" width="30" height="30"/>
+                                <state key="normal" title="X"/>
+                                <connections>
+                                    <action selector="close:" destination="FzH-l9-2ZS" eventType="touchUpInside" id="ch6-QI-I8q"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="mBt-So-m7I" firstAttribute="top" secondItem="7GF-GS-Xuj" secondAttribute="bottom" constant="32" id="9VR-UH-N1t"/>
+                            <constraint firstItem="vbm-05-DaW" firstAttribute="leading" secondItem="F8I-rd-fPl" secondAttribute="leadingMargin" id="J2I-mo-hjB"/>
+                            <constraint firstItem="xNa-35-AFk" firstAttribute="leading" secondItem="F8I-rd-fPl" secondAttribute="leading" id="PXT-mo-lZO"/>
+                            <constraint firstItem="vbm-05-DaW" firstAttribute="top" secondItem="7GF-GS-Xuj" secondAttribute="bottom" constant="20" id="Rh8-df-sfk"/>
+                            <constraint firstItem="xNa-35-AFk" firstAttribute="top" secondItem="mBt-So-m7I" secondAttribute="bottom" id="oRe-UT-Ahf"/>
+                            <constraint firstItem="yMs-QI-AX0" firstAttribute="top" secondItem="xNa-35-AFk" secondAttribute="bottom" id="pCg-E7-Lig"/>
+                            <constraint firstAttribute="trailing" secondItem="xNa-35-AFk" secondAttribute="trailing" id="uQ4-LG-Mu9"/>
+                            <constraint firstItem="mBt-So-m7I" firstAttribute="centerX" secondItem="F8I-rd-fPl" secondAttribute="centerX" id="zbj-mb-Ys1"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="elementTitle" destination="mBt-So-m7I" id="jeA-UV-NKv"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pRf-nd-oiZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1942" y="1259"/>
         </scene>
         <!--Collection View Controller-->
         <scene sceneID="oUm-5m-6sL">

diff --git a/LNZCollectionLayouts/Info.plist b/LNZCollectionLayouts/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>