Skip to content

Commit

Permalink
update sample transition projects
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Dahan committed Sep 11, 2019
1 parent 8baa287 commit 26d65cd
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 118 deletions.
12 changes: 0 additions & 12 deletions Projects/Programmatic/Grid/Grid.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
964F88DD2329276C00387599 /* Motion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 964F88DC2329276C00387599 /* Motion.framework */; };
964F88DE2329276C00387599 /* Motion.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 964F88DC2329276C00387599 /* Motion.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
964F88E02329276C00387599 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 964F88DF2329276C00387599 /* Material.framework */; };
964F88E12329276C00387599 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 964F88DF2329276C00387599 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
965592191DEC9553001576E7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965592181DEC9553001576E7 /* AppDelegate.swift */; };
9655921B1DEC9553001576E7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9655921A1DEC9553001576E7 /* ViewController.swift */; };
965592201DEC9553001576E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9655921F1DEC9553001576E7 /* Assets.xcassets */; };
Expand All @@ -24,17 +20,13 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
964F88DE2329276C00387599 /* Motion.framework in Embed Frameworks */,
964F88E12329276C00387599 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
964F88DC2329276C00387599 /* Motion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Motion.framework; sourceTree = BUILT_PRODUCTS_DIR; };
964F88DF2329276C00387599 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
965592151DEC9553001576E7 /* Grid.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Grid.app; sourceTree = BUILT_PRODUCTS_DIR; };
965592181DEC9553001576E7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9655921A1DEC9553001576E7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -48,8 +40,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
964F88DD2329276C00387599 /* Motion.framework in Frameworks */,
964F88E02329276C00387599 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -59,8 +49,6 @@
9655920C1DEC9553001576E7 = {
isa = PBXGroup;
children = (
964F88DF2329276C00387599 /* Material.framework */,
964F88DC2329276C00387599 /* Motion.framework */,
965592171DEC9553001576E7 /* Grid */,
965592161DEC9553001576E7 /* Products */,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = {
96DCA8C21E6DC25C004EB173 = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 1030;
ProvisioningStyle = Automatic;
};
};
Expand All @@ -119,6 +120,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -173,6 +175,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -231,6 +234,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -287,7 +291,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Transitions;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -300,7 +304,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Transitions;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,142 +1,142 @@
/*
* Copyright (C) 2015 - 2018, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* Copyright (C) 2015 - 2018, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import UIKit
import Material
import Motion

class PurpleViewController: UIViewController {
fileprivate var label = UILabel()
open override func viewDidLoad() {
super.viewDidLoad()
prepareView()
prepareLabel()
prepareTransition()
Motion.delay(2) { [weak self] in
self?.dismiss(animated: true)
}
}
fileprivate var label = UILabel()
open override func viewDidLoad() {
super.viewDidLoad()
prepareView()
prepareLabel()
prepareTransition()
Motion.delay(2) { [weak self] in
self?.dismiss(animated: true)
}
}
}

extension PurpleViewController {
fileprivate func prepareView() {
isMotionEnabled = true
view.backgroundColor = Color.pink.base
}
fileprivate func prepareLabel() {
view.layout(label).edges()
label.text = "2"
label.textAlignment = .center
label.font = RobotoFont.medium(with: 400)
}
fileprivate func prepareTransition() {
// transitionPush()
// transitionPull()
// transitionCover()
// transitionUncover()
// transitionSlide()
// transitionZoomSlide()
// transitionPageIn()
// transitionPageOut()
// transitionFade()
// transitionZoom()
transitionZoomOut()
}
fileprivate func prepareView() {
isMotionEnabled = true
view.backgroundColor = Color.pink.base
}
fileprivate func prepareLabel() {
view.layout(label).edges()
label.text = "2"
label.textAlignment = .center
label.font = RobotoFont.medium(with: 400)
}
fileprivate func prepareTransition() {
// transitionPush()
// transitionPull()
// transitionCover()
// transitionUncover()
// transitionSlide()
// transitionZoomSlide()
// transitionPageIn()
// transitionPageOut()
// transitionFade()
// transitionZoom()
transitionZoomOut()
}
}

extension PurpleViewController {
fileprivate func transitionPush() {
motionTransitionType = .autoReverse(presenting: .push(direction: .left))
}
fileprivate func transitionPush() {
motionTransitionType = .autoReverse(presenting: .push(direction: .left))
}
}

extension PurpleViewController {
fileprivate func transitionPull() {
motionTransitionType = .autoReverse(presenting: .pull(direction: .right))
}
fileprivate func transitionPull() {
motionTransitionType = .autoReverse(presenting: .pull(direction: .right))
}
}

extension PurpleViewController {
fileprivate func transitionCover() {
motionTransitionType = .autoReverse(presenting: .cover(direction: .up))
}
fileprivate func transitionCover() {
motionTransitionType = .autoReverse(presenting: .cover(direction: .up))
}
}

extension PurpleViewController {
fileprivate func transitionUncover() {
motionTransitionType = .autoReverse(presenting: .uncover(direction: .down))
}
fileprivate func transitionUncover() {
motionTransitionType = .autoReverse(presenting: .uncover(direction: .down))
}
}

extension PurpleViewController {
fileprivate func transitionSlide() {
motionTransitionType = .autoReverse(presenting: .slide(direction: .right))
}
fileprivate func transitionSlide() {
motionTransitionType = .autoReverse(presenting: .slide(direction: .right))
}
}

extension PurpleViewController {
fileprivate func transitionZoomSlide() {
motionTransitionType = .autoReverse(presenting: .zoomSlide(direction: .right))
}
fileprivate func transitionZoomSlide() {
motionTransitionType = .autoReverse(presenting: .zoomSlide(direction: .right))
}
}

extension PurpleViewController {
fileprivate func transitionPageIn() {
motionTransitionType = .autoReverse(presenting: .pageIn(direction: .left))
}
fileprivate func transitionPageIn() {
motionTransitionType = .autoReverse(presenting: .pageIn(direction: .left))
}
}

extension PurpleViewController {
fileprivate func transitionPageOut() {
motionTransitionType = .autoReverse(presenting: .pageOut(direction: .right))
}
fileprivate func transitionPageOut() {
motionTransitionType = .autoReverse(presenting: .pageOut(direction: .right))
}
}

extension PurpleViewController {
fileprivate func transitionFade() {
motionTransitionType = .autoReverse(presenting: .fade)
}
fileprivate func transitionFade() {
motionTransitionType = .autoReverse(presenting: .fade)
}
}

extension PurpleViewController {
fileprivate func transitionZoom() {
motionTransitionType = .autoReverse(presenting: .zoom)
}
fileprivate func transitionZoom() {
motionTransitionType = .autoReverse(presenting: .zoom)
}
}

extension PurpleViewController {
fileprivate func transitionZoomOut() {
motionTransitionType = .autoReverse(presenting: .zoomOut)
}
fileprivate func transitionZoomOut() {
motionTransitionType = .autoReverse(presenting: .zoomOut)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = {
96F344D21F183E4400EE27C9 = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1030;
ProvisioningStyle = Automatic;
};
};
Expand All @@ -119,6 +120,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -173,6 +175,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -232,6 +235,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -293,7 +297,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.TransitionsWithIdentifier;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -310,7 +314,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.TransitionsWithIdentifier;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Loading

0 comments on commit 26d65cd

Please sign in to comment.