Bug fixed with scrolling

Author: Alberto Aznar

CiaoTransitions.podspec

@@ -7,7 +7,7 @@ s.ios.deployment_target = '11'
 s.name = "CiaoTransitions"
 s.summary = "With Ciao you can make fancy custom transitions. Use it in your iOS projects to make push and modal transitions between view controllers"
 s.requires_arc = true
-s.version = "0.2.0"
+s.version = "0.2.1"
 
 # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 

CiaoTransitions/CiaoTransition.swift

@@ -29,6 +29,10 @@ open class CiaoTransition: NSObject {
         self.animator = style.animator(configurator: self.configurator, scaleConfigurator: self.scaleConfigurator)
         self.interactor = style.interactor(configurator: self.configurator)
     }
+    
+    public func didScroll(_ scrollView: UIScrollView) {
+        interactor.scrollViewDidScroll(scrollView)
+    }
 }
 
 /// PUSH & POP
@@ -114,14 +118,14 @@ extension CiaoTransition: UIViewControllerTransitioningDelegate {
     }
 }
 
-extension CiaoTransition: UIScrollViewDelegate {
-    
-    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        interactor.scrollViewDidScroll(scrollView)
-    }
-    
-    public func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
-        interactor.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
-    }
-}
+//extension CiaoTransition: UIScrollViewDelegate {
+//
+//    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+//
+//    }
+//
+//    public func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+//        interactor.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
+//    }
+//}
 

Example/CiaoTransitions/Controllers/AppStore/AppStoreCardsViewController.swift

@@ -12,6 +12,7 @@ import CiaoTransitions
 class AppStoreCardsViewController: UIViewController {
 
     @IBOutlet weak var collectionView: UICollectionView!
+    var ciaoTransition: CiaoTransition?
 
     var cards = [[
         CardContentView.ViewModel(image: UIImage(named: "Image1"), title: "Best latest\nphotos sample 1", subtitle: "FEATURED IMAGES"),
@@ -103,9 +104,6 @@ extension AppStoreCardsViewController: UICollectionViewDataSource, UICollectionV
         header.viewModel = TodayHeaderReusableView.ViewModel(title: "Today", subtitle: "APPSTORE CARDS TRANSITION", image: UIImage(named: "Profile"))
         return header
     }
-}
-
-extension AppStoreCardsViewController: UICollectionViewDelegate {
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
 
@@ -131,3 +129,11 @@ extension AppStoreCardsViewController: UICollectionViewDelegate {
         present(presentViewController, animated: true, completion: nil)
     }
 }
+    
+extension AppStoreCardsViewController: UIScrollViewDelegate {
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        ciaoTransition?.didScroll(scrollView)
+    }
+}
+

Example/CiaoTransitions/Controllers/Detail/AppStoreCardDetailViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import CiaoTransitions
 
-class AppStoreCardDetailViewController: UIViewController {
+class AppStoreCardDetailViewController: UIViewController, UIScrollViewDelegate {
 
     @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var cardContentView: CardContentView!
@@ -22,6 +22,10 @@ class AppStoreCardDetailViewController: UIViewController {
         super.viewDidLoad()
         view.clipsToBounds = true
         cardContentView.viewModel = viewModel
-        scrollView.delegate = ciaoTransition
+        scrollView.delegate = self
+    }
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        ciaoTransition?.didScroll(scrollView)
     }
 }

Example/CiaoTransitions/Controllers/Detail/AppStoreCardDetailViewController.xib

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,14 +20,14 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="nrq-2g-nW4">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="994"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nKp-Rh-3Iv">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="994"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Scs-Vr-84v">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="994"/>
                             <subviews>
                                 <view tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="she-Df-Y1g" customClass="CardContentView" customModule="CiaoTransitions_Example" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="350"/>
@@ -36,11 +37,19 @@
                                     </constraints>
                                 </view>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="top" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rte-LT-cFZ">
-                                    <rect key="frame" x="8" y="358" width="359" height="184"/>
-                                    <string key="text">Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. 
+                                    <rect key="frame" x="8" y="358" width="359" height="585"/>
+                                    <mutableString key="text">Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. 
 
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
 
-Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. 
+
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
+
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. 
+
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
+
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</mutableString>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.23137254900000001" green="0.2156862745" blue="0.21960784310000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
@@ -74,8 +83,9 @@ Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deseru
                 <constraint firstItem="nKp-Rh-3Iv" firstAttribute="top" secondItem="nrq-2g-nW4" secondAttribute="top" id="n7y-o7-Glk"/>
                 <constraint firstItem="nKp-Rh-3Iv" firstAttribute="trailing" secondItem="atI-P0-WL4" secondAttribute="trailing" id="uJW-S5-EbU"/>
             </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="atI-P0-WL4"/>
-            <point key="canvasLocation" x="33.5" y="53.5"/>
+            <point key="canvasLocation" x="32.799999999999997" y="199.70014992503749"/>
         </view>
     </objects>
 </document>

Example/CiaoTransitions/Controllers/Detail/ScrollFadeViewController.swift

@@ -9,19 +9,19 @@
 import UIKit
 import CiaoTransitions
 
-class ScrollFadeViewController: UIViewController {
+class ScrollFadeViewController: UIViewController, UIScrollViewDelegate {
 
     @IBOutlet weak var scrollView: UIScrollView!
     var ciaoTransition: CiaoTransition?
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        scrollView.delegate = ciaoTransition
+        scrollView.delegate = self
     }
 
-//    func scrollViewDidScroll(_ scrollView: UIScrollView) {
-//        transition?.didScroll(scrollView: scrollView)
-//    }
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        ciaoTransition?.didScroll(scrollView)
+    }
 }
 
 

Example/CiaoTransitions/Controllers/Items/Routing/ItemsRouting.swift

@@ -63,19 +63,22 @@ extension ItemsRouting: ItemsRoutingInterface {
         case .appStore:
 
             configurator.lateralTranslationEnabled = true
-            configurator.dragDownEnabled = false
-            configurator.dragLateralEnabled = true
+            configurator.dragDownEnabled = true
+            configurator.dragLateralEnabled = false
             presentViewController = AppStoreCardsViewController()
         }
 
         if style == .appStore {
-            style = .lateral
+            style = .vertical
         }
         transition = CiaoTransition(style: style, configurator: configurator, scaleConfigurator: scaleConfigurator)
 
         if let presentViewController = presentViewController as? ScrollFadeViewController {
             presentViewController.ciaoTransition = transition
         }
+        if let presentViewController = presentViewController as? AppStoreCardsViewController {
+            presentViewController.ciaoTransition = transition
+        }
         presentViewController?.transitioningDelegate = transition
 
         switch item {

README.md

@@ -65,23 +65,27 @@ In the example you will see some custom transitions that can be used in your pro
 
 ### 1. Add CiaoTransition to your presented view controller
 
-Add `CiaoTransition` to your presented view controller. This is neccessary to save your retain your transition for dismissed interaction. Also you could need it if have some scroll view. In this case, you should set scroll view delegate to your `CiaoTransition`
+Add `CiaoTransition` to your presented view controller. This is neccessary to save your retain your transition for dismissed interaction. Also you could need it if have some scroll view. In this case, you should call  `didScroll` method when the view is scrolled
 
 ```swift
-class DetailViewController: CiaoBaseViewController {
+class DetailViewController: CiaoBaseViewController, UIScrollViewDelegate {
 
     @IBOutlet weak var scrollView: UIScrollView!
 
     var ciaoTransition: CiaoTransition?
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        scrollView.delegate = ciaoTransition
+        scrollView.delegate = self
+    }
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        ciaoTransition?.didScroll(scrollView)
     }
 }
 ```
 
-> Important: If the view have some **Scroll View**, you must set his delegate to your transition object once view is loaded. This is needed by `CiaoTransition` to manage interactive transitions.
+> Important: If the view have some **Scroll View**, you must implement UIScrollViewDelegate protocol and call  `didScroll` method when the view is scrolled. This is needed by `CiaoTransition` to manage interactive transitions.
 
 ### 2. Instace CiaoTransition with your values