Skip to content

Commit

Permalink
Readme file updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Alberto Aznar committed Sep 20, 2018
1 parent 293c55d commit 1dcb82c
Show file tree
Hide file tree
Showing 34 changed files with 231 additions and 57 deletions.
2 changes: 1 addition & 1 deletion CiaoTransitions.podspec
View file
Expand Up @@ -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.1.0"
s.version = "0.1.1"

# ――― Spec License ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

Expand Down
24 changes: 12 additions & 12 deletions CiaoTransitions/CiaoTransitionType.swift
View file
Expand Up @@ -12,51 +12,51 @@ public enum CiaoTransitionType {

public enum Push {

case pushLateral
case pushVertical
case pushScaleImage
case lateral
case vertical
case scaleImage

func animatorController(direction: CiaoTransitionDirection, params: CiaoTransition.Params, scaleParams: CiaoTransition.ScaleParams?) -> CiaoTransitionAnimator? {

switch self {
case .pushLateral:
case .lateral:

let swipeLateralAnimator = PushLateralTransitionAnimator(
direction: direction,
params: params)

return direction == .dismissal ? swipeLateralAnimator : nil

case .pushVertical: return PushVerticalTransitionAnimator(direction: direction, params: params)
case .pushScaleImage: return PushScaleTransitionAnimator(direction: direction, params: params, scaleParams: scaleParams)
case .vertical: return PushVerticalTransitionAnimator(direction: direction, params: params)
case .scaleImage: return PushScaleTransitionAnimator(direction: direction, params: params, scaleParams: scaleParams)
}
}

func interactorController(params: CiaoTransition.Params, navigationController: UINavigationController? = nil, presentedViewController: UIViewController? = nil) -> CiaoTransitionInteractor? {
switch self {

case .pushLateral: return PushLateralTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .pushVertical: return PushVerticalTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .pushScaleImage: return PushScaleTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .lateral: return PushLateralTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .vertical: return PushVerticalTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .scaleImage: return PushScaleTransitionInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
}
}
}

public enum Modal {

case modalAppStore
case appStore

func animatorController(direction: CiaoTransitionDirection, params: CiaoTransition.Params, scaleParams: CiaoTransition.ScaleParams?) -> CiaoTransitionAnimator? {

switch self {
case .modalAppStore: return nil
case .appStore: return nil
}
}

func interactorController(params: CiaoTransition.Params, navigationController: UINavigationController? = nil, presentedViewController: UIViewController? = nil) -> CiaoTransitionInteractor? {

switch self {
case .modalAppStore: return DismissAppStoreInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
case .appStore: return DismissAppStoreInteractor(params: params, navigationController: navigationController, presentedViewController: presentedViewController)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion CiaoTransitions/Globals.swift
View file
Expand Up @@ -29,7 +29,7 @@ enum Globals {
static let backLateralTranslationEnabled: Bool = false

/// Enable or disable lateral swipe to dismiss view
static let dragLateralEnabled: Bool = false
static let dragLateralEnabled: Bool = true

/// Enable or disable vertical swipe to dismiss view
static let dragDownEnabled: Bool = true
Expand Down
2 changes: 1 addition & 1 deletion CiaoTransitions/ModalAppStoreTransition/Dismiss/DismissAppStoreAnimator.swift
View file
Expand Up @@ -47,7 +47,7 @@ extension DismissAppStoreAnimator: UIViewControllerAnimatedTransitioning {
let container = ctx.containerView

guard
let detail = ctx.viewController(forKey: .from) as? CiaoBaseViewController,
let detail = ctx.viewController(forKey: .from),
let cardContentView = detail.view.viewWithTag(params.toViewTag)
else { return }

Expand Down
2 changes: 1 addition & 1 deletion CiaoTransitions/ModalAppStoreTransition/Present/PresentAppStoreTransitionDriver.swift
View file
Expand Up @@ -25,7 +25,7 @@ class PresentAppStoreTransitionDriver {
let container = ctx.containerView

guard
let detail = ctx.viewController(forKey: .to) as? CiaoBaseViewController,
let detail = ctx.viewController(forKey: .to),
let cardContentView = detail.view.viewWithTag(params.toViewTag)
else {
self.animator = baseAnimator
Expand Down
6 changes: 3 additions & 3 deletions Example/CiaoTransitions.xcodeproj/project.pbxproj
View file
Expand Up @@ -261,11 +261,11 @@
E37BB51B21531C61006450D2 /* Items */ = {
isa = PBXGroup;
children = (
E37BB51C21531C61006450D2 /* Presenter */,
E37BB52321531C61006450D2 /* View */,
E37BB53F21531C61006450D2 /* Factory */,
E37BB53721531C61006450D2 /* Routing */,
E37BB51C21531C61006450D2 /* Presenter */,
E37BB53A21531C61006450D2 /* Interactor */,
E37BB53F21531C61006450D2 /* Factory */,
E37BB52321531C61006450D2 /* View */,
);
path = Items;
sourceTree = "<group>";
Expand Down
2 changes: 1 addition & 1 deletion Example/CiaoTransitions/Controllers/AppStore/AppStoreCardsViewController.swift
View file
Expand Up @@ -117,7 +117,7 @@ extension AppStoreCardsViewController: UICollectionViewDelegate {
params.dragDownEnabled = true
params.dragLateralEnabled = false

let ciaoTransition = CiaoTransition(modalTransitionType: .modalAppStore, params: params, toViewTag: 100)
let ciaoTransition = CiaoTransition(modalTransitionType: .appStore, params: params, toViewTag: 100)
ciaoTransition.fromCell = cell
presentViewController.ciaoTransition = ciaoTransition
presentViewController.transitioningDelegate = ciaoTransition
Expand Down
5 changes: 2 additions & 3 deletions Example/CiaoTransitions/Controllers/AppStore/Cells/CardCollectionViewCell.xib
View file
Expand Up @@ -4,22 +4,21 @@
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" id="vPP-IZ-657" customClass="CardCollectionViewCell" customModule="CiaoExample" customModuleProvider="target">
<collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" id="vPP-IZ-657" customClass="CardCollectionViewCell" customModule="CiaoTransitions_Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="330" height="358"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="330" height="358"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i0d-w8-63e" customClass="CardContentView" customModule="CiaoExample" customModuleProvider="target">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i0d-w8-63e" customClass="CardContentView" customModule="CiaoTransitions_Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="330" height="358"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
Expand Down
7 changes: 4 additions & 3 deletions Example/CiaoTransitions/Controllers/AppStore/Cells/CardContentView.xib
View file
Expand Up @@ -4,13 +4,12 @@
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CardContentView" customModule="CiaoExample" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CardContentView" customModule="CiaoTransitions_Example" customModuleProvider="target">
<connections>
<outlet property="backdropImageView" destination="geY-pg-FHZ" id="jKN-cz-86U"/>
<outlet property="bottomImageConstraint" destination="ZV1-TE-ClR" id="gg8-q9-czq"/>
Expand Down Expand Up @@ -45,8 +44,10 @@
<color key="textColor" red="0.51764705879999995" green="0.51372549020000002" blue="0.54117647059999996" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Dinner at Your
Doorstep" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PDd-ZA-r5E">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PDd-ZA-r5E">
<rect key="frame" x="14" y="29" width="291" height="63"/>
<string key="text">Best latest
game releases</string>
<fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
<color key="textColor" red="0.1647058824" green="0.1647058824" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down
4 changes: 2 additions & 2 deletions Example/CiaoTransitions/Controllers/Detail/AppStoreCardDetailViewController.xib
View file
Expand Up @@ -9,7 +9,7 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AppStoreCardDetailViewController" customModule="Ciao_Example" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AppStoreCardDetailViewController" customModule="CiaoTransitions_Example" customModuleProvider="target">
<connections>
<outlet property="cardContentView" destination="she-Df-Y1g" id="ZLI-x5-mYA"/>
<outlet property="scrollView" destination="nKp-Rh-3Iv" id="JpO-MW-eum"/>
Expand All @@ -28,7 +28,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Scs-Vr-84v">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view tag="100" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="she-Df-Y1g" customClass="CardContentView" customModule="Ciao_Example" customModuleProvider="target">
<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"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
Expand Down
10 changes: 5 additions & 5 deletions Example/CiaoTransitions/Controllers/Items/Interactor/ItemsInteractor.swift
View file
Expand Up @@ -22,31 +22,31 @@ extension ItemsInteractor: ItemsInteractorInput {
image: UIImage(named: "Item1"),
title: "Swipe down fade transition with static view",
subtitle: "PUSH TRANSITION",
type: CiaoTransitionType.Push.pushVertical)
type: CiaoTransitionType.Push.vertical)

let item2 = Item.push(
image: UIImage(named: "Item2"),
title: "Swipe down fade transition with scroll view",
subtitle: "PUSH TRANSITION",
type: CiaoTransitionType.Push.pushVertical)
type: CiaoTransitionType.Push.vertical)

let item3 = Item.push(
image: UIImage(named: "Item3"),
title: "Swipe lateral dismiss transition with static view",
subtitle: "PUSH TRANSITION",
type: CiaoTransitionType.Push.pushLateral)
type: CiaoTransitionType.Push.lateral)

let item4 = Item.push(
image: UIImage(named: "Item4"),
title: "Scale transition & swipe down for dismiss",
subtitle: "PUSH TRANSITION",
type: CiaoTransitionType.Push.pushScaleImage)
type: CiaoTransitionType.Push.scaleImage)

let item5 = Item.modal(
image: UIImage(named: "Item5"),
title: "App Store transition for present app details",
subtitle: "MODAL TRANSITION",
type: CiaoTransitionType.Modal.modalAppStore)
type: CiaoTransitionType.Modal.appStore)

output?.didLoadItems(items: [[item1, item2, item3, item4], [item5]])
}
Expand Down
10 changes: 5 additions & 5 deletions Example/CiaoTransitions/Controllers/Items/Routing/ItemsRouting.swift
View file
Expand Up @@ -25,7 +25,7 @@ extension ItemsRouting: ItemsRoutingInterface {
if let type = type as? CiaoTransitionType.Push {

switch type {
case .pushVertical:
case .vertical:

params.backfadeEnabled = true
params.backScaleEnabled = true
Expand All @@ -34,7 +34,7 @@ extension ItemsRouting: ItemsRoutingInterface {
params.dragLateralEnabled = false
presentViewController = cell.tag == 0 ? StaticFadeViewController() : ScrollFadeViewController()

case .pushLateral:
case .lateral:

params.backfadeEnabled = true
params.backScaleEnabled = false
Expand All @@ -43,7 +43,7 @@ extension ItemsRouting: ItemsRoutingInterface {
params.dragLateralEnabled = true
presentViewController = LateralTranslationViewController()

case .pushScaleImage:
case .scaleImage:

params.backfadeEnabled = true
params.presentFadeEnabled = true
Expand All @@ -65,7 +65,7 @@ extension ItemsRouting: ItemsRoutingInterface {
if let type = type as? CiaoTransitionType.Modal {

switch type {
case .modalAppStore:
case .appStore:

params.backfadeEnabled = true
params.backScaleEnabled = false
Expand All @@ -75,7 +75,7 @@ extension ItemsRouting: ItemsRoutingInterface {
presentViewController = AppStoreCardsViewController()
}

ciaoTransition = CiaoTransition(pushTransitionType: CiaoTransitionType.Push.pushLateral, params: params, scaleParams: scaleParams)
ciaoTransition = CiaoTransition(pushTransitionType: CiaoTransitionType.Push.lateral, params: params, scaleParams: scaleParams)
presentViewController?.ciaoTransition = ciaoTransition!
}

Expand Down

0 comments on commit 1dcb82c

Please sign in to comment.