Skip to content

M
Material
Commit c90a4289 by Daniel Dahan
Options

development: fixed pulse animation - double pulse issue

parent 465bebcd
Showing with 182 additions and 239 deletions
Motion @ 18169434
Subproject commit a26c532b1146fc5012b47db271c2af849df73547
Subproject commit 1816943409577cabc9f4711272bc8fca16ac543b
Material.xcodeproj/project.pbxproj
......@@ -169,63 +169,48 @@
96E3C3991D3A1CC20086A024 /* StatusBarController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 967A48181D0F425A00B8CEB7 /* StatusBarController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96E3C39A1D3A1CC20086A024 /* ErrorTextField.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961F18E71CD93E3E008927C5 /* ErrorTextField.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96E3C39C1D3A1CC20086A024 /* Offset.swift in Headers */ = {isa = PBXBuildFile; fileRef = 968C99461D377849000074FF /* Offset.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96E5F3321F153C64004D045B /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 96E5F2FF1F153C64004D045B /* .gitignore */; };
96E5F3331F153C64004D045B /* .swift-version in Resources */ = {isa = PBXBuildFile; fileRef = 96E5F3001F153C64004D045B /* .swift-version */; };
96E5F3341F153C64004D045B /* CONTRIBUTING.md in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3011F153C64004D045B /* CONTRIBUTING.md */; };
96E5F3351F153C64004D045B /* LICENSE.md in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3021F153C64004D045B /* LICENSE.md */; };
96E5F3361F153C64004D045B /* Motion.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 96E5F3031F153C64004D045B /* Motion.podspec */; };
96E5F3371F153C64004D045B /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3071F153C64004D045B /* README.md */; };
96E5F3381F153C64004D045B /* MotionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30A1F153C64004D045B /* MotionAnimator.swift */; };
96E5F3391F153C64004D045B /* MotionAnimatorViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30B1F153C64004D045B /* MotionAnimatorViewContext.swift */; };
96E5F33A1F153C64004D045B /* MotionCoreAnimationViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30C1F153C64004D045B /* MotionCoreAnimationViewContext.swift */; };
96E5F33B1F153C64004D045B /* MotionDefaultAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30D1F153C64004D045B /* MotionDefaultAnimator.swift */; };
96E5F33C1F153C64004D045B /* MotionHasInsertOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30E1F153C64004D045B /* MotionHasInsertOrder.swift */; };
96E5F33D1F153C64004D045B /* MotionViewPropertyViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F30F1F153C64004D045B /* MotionViewPropertyViewContext.swift */; };
96E5F33E1F153C64004D045B /* Motion+Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3111F153C64004D045B /* Motion+Array.swift */; };
96E5F33F1F153C64004D045B /* Motion+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3121F153C64004D045B /* Motion+CALayer.swift */; };
96E5F3401F153C64004D045B /* Motion+CAMediaTimingFunction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3131F153C64004D045B /* Motion+CAMediaTimingFunction.swift */; };
96E5F3411F153C64004D045B /* Motion+CG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3141F153C64004D045B /* Motion+CG.swift */; };
96E5F3421F153C64004D045B /* Motion+Obj-C.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3151F153C64004D045B /* Motion+Obj-C.swift */; };
96E5F3431F153C64004D045B /* Motion+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3161F153C64004D045B /* Motion+UIKit.swift */; };
96E5F3441F153C64004D045B /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3171F153C64004D045B /* Motion+UIView.swift */; };
96E5F3451F153C64004D045B /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3181F153C64004D045B /* Motion+UIViewController.swift */; };
96E5F3461F153C64004D045B /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3191F153C64004D045B /* MotionAnimationFillMode.swift */; };
96E5F3471F153C64004D045B /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96E5F31A1F153C64004D045B /* Info.plist */; };
96E5F3481F153C64004D045B /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 96E5F31B1F153C64004D045B /* LICENSE */; };
96E5F3491F153C64004D045B /* Motion.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5F31C1F153C64004D045B /* Motion.h */; };
96E5F34A1F153C64004D045B /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F31D1F153C64004D045B /* Motion.swift */; };
96E5F34B1F153C64004D045B /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F31E1F153C64004D045B /* MotionAnimation.swift */; };
96E5F34C1F153C64004D045B /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F31F1F153C64004D045B /* MotionAnimationState.swift */; };
96E5F34D1F153C64004D045B /* MotionCAAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3201F153C64004D045B /* MotionCAAnimation.swift */; };
96E5F34E1F153C64004D045B /* MotionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3211F153C64004D045B /* MotionContext.swift */; };
96E5F34F1F153C64004D045B /* MotionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3221F153C64004D045B /* MotionController.swift */; };
96E5F3501F153C64004D045B /* MotionCoordinateSpace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3231F153C64004D045B /* MotionCoordinateSpace.swift */; };
96E5F3511F153C64004D045B /* MotionIndependentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3241F153C64004D045B /* MotionIndependentController.swift */; };
96E5F3521F153C64004D045B /* MotionPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3251F153C64004D045B /* MotionPlugin.swift */; };
96E5F3531F153C64004D045B /* MotionSnapshotType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3261F153C64004D045B /* MotionSnapshotType.swift */; };
96E5F3541F153C64004D045B /* MotionTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3271F153C64004D045B /* MotionTransition.swift */; };
96E5F3551F153C64004D045B /* MotionTransitionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3281F153C64004D045B /* MotionTransitionObserver.swift */; };
96E5F3561F153C64004D045B /* MotionTransitionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3291F153C64004D045B /* MotionTransitionState.swift */; };
96E5F3571F153C64004D045B /* CascadePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F32B1F153C64004D045B /* CascadePreprocessor.swift */; };
96E5F3581F153C64004D045B /* DurationPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F32C1F153C64004D045B /* DurationPreprocessor.swift */; };
96E5F3591F153C64004D045B /* IgnoreSubviewModifiersPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F32D1F153C64004D045B /* IgnoreSubviewModifiersPreprocessor.swift */; };
96E5F35A1F153C64004D045B /* MatchPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F32E1F153C64004D045B /* MatchPreprocessor.swift */; };
96E5F35B1F153C64004D045B /* MotionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F32F1F153C64004D045B /* MotionPreprocessor.swift */; };
96E5F35C1F153C64004D045B /* SourcePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3301F153C64004D045B /* SourcePreprocessor.swift */; };
96E5F35D1F153C64004D045B /* TransitionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5F3311F153C64004D045B /* TransitionPreprocessor.swift */; };
96F3451E1F1960A300EE27C9 /* LICENSE.md in Sources */ = {isa = PBXBuildFile; fileRef = 96F344F31F1960A300EE27C9 /* LICENSE.md */; };
96F3451F1F1960A300EE27C9 /* MotionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344F61F1960A300EE27C9 /* MotionAnimator.swift */; };
96F345201F1960A300EE27C9 /* MotionAnimatorViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344F71F1960A300EE27C9 /* MotionAnimatorViewContext.swift */; };
96F345211F1960A300EE27C9 /* MotionCoreAnimationViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344F81F1960A300EE27C9 /* MotionCoreAnimationViewContext.swift */; };
96F345221F1960A300EE27C9 /* MotionTransitionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344F91F1960A300EE27C9 /* MotionTransitionAnimator.swift */; };
96F345231F1960A300EE27C9 /* MotionHasInsertOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344FA1F1960A300EE27C9 /* MotionHasInsertOrder.swift */; };
96F345241F1960A300EE27C9 /* MotionViewPropertyViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344FB1F1960A300EE27C9 /* MotionViewPropertyViewContext.swift */; };
96F345251F1960A300EE27C9 /* Motion+Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344FD1F1960A300EE27C9 /* Motion+Array.swift */; };
96F345261F1960A300EE27C9 /* Motion+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344FE1F1960A300EE27C9 /* Motion+CALayer.swift */; };
96F345271F1960A300EE27C9 /* Motion+CAMediaTimingFunction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F344FF1F1960A300EE27C9 /* Motion+CAMediaTimingFunction.swift */; };
96F345281F1960A300EE27C9 /* Motion+CG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345001F1960A300EE27C9 /* Motion+CG.swift */; };
96F345291F1960A300EE27C9 /* Motion+Obj-C.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345011F1960A300EE27C9 /* Motion+Obj-C.swift */; };
96F3452A1F1960A300EE27C9 /* Motion+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345021F1960A300EE27C9 /* Motion+UIKit.swift */; };
96F3452B1F1960A300EE27C9 /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345031F1960A300EE27C9 /* Motion+UIView.swift */; };
96F3452C1F1960A300EE27C9 /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345041F1960A300EE27C9 /* Motion+UIViewController.swift */; };
96F3452D1F1960A300EE27C9 /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345051F1960A300EE27C9 /* MotionAnimationFillMode.swift */; };
96F3452E1F1960A300EE27C9 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96F345061F1960A300EE27C9 /* Info.plist */; };
96F3452F1F1960A300EE27C9 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 96F345071F1960A300EE27C9 /* LICENSE */; };
96F345301F1960A300EE27C9 /* Motion.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F345081F1960A300EE27C9 /* Motion.h */; };
96F345311F1960A300EE27C9 /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345091F1960A300EE27C9 /* Motion.swift */; };
96F345321F1960A300EE27C9 /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */; };
96F345331F1960A300EE27C9 /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */; };
96F345341F1960A300EE27C9 /* MotionCAAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450C1F1960A300EE27C9 /* MotionCAAnimation.swift */; };
96F345351F1960A300EE27C9 /* MotionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450D1F1960A300EE27C9 /* MotionContext.swift */; };
96F345361F1960A300EE27C9 /* MotionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450E1F1960A300EE27C9 /* MotionController.swift */; };
96F345371F1960A300EE27C9 /* MotionCoordinateSpace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450F1F1960A300EE27C9 /* MotionCoordinateSpace.swift */; };
96F345381F1960A300EE27C9 /* MotionIndependentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345101F1960A300EE27C9 /* MotionIndependentController.swift */; };
96F345391F1960A300EE27C9 /* MotionPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345111F1960A300EE27C9 /* MotionPlugin.swift */; };
96F3453A1F1960A300EE27C9 /* MotionSnapshotType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345121F1960A300EE27C9 /* MotionSnapshotType.swift */; };
96F3453B1F1960A300EE27C9 /* MotionTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345131F1960A300EE27C9 /* MotionTransition.swift */; };
96F3453C1F1960A300EE27C9 /* MotionTransitionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345141F1960A300EE27C9 /* MotionTransitionObserver.swift */; };
96F3453D1F1960A300EE27C9 /* MotionTransitionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345151F1960A300EE27C9 /* MotionTransitionState.swift */; };
96F3453E1F1960A300EE27C9 /* CascadePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345171F1960A300EE27C9 /* CascadePreprocessor.swift */; };
96F3453F1F1960A300EE27C9 /* DurationPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345181F1960A300EE27C9 /* DurationPreprocessor.swift */; };
96F345401F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345191F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift */; };
96F345411F1960A300EE27C9 /* MatchPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3451A1F1960A300EE27C9 /* MatchPreprocessor.swift */; };
96F345421F1960A300EE27C9 /* MotionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3451B1F1960A300EE27C9 /* MotionPreprocessor.swift */; };
96F345431F1960A300EE27C9 /* SourcePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3451C1F1960A300EE27C9 /* SourcePreprocessor.swift */; };
96F345461F1961ED00EE27C9 /* TransitionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345451F1961ED00EE27C9 /* TransitionPreprocessor.swift */; };
96FE06C71F15348400E34953 /* PageTabBarController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 966995481F1433C30064E7E4 /* PageTabBarController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
96E5F35F1F153C64004D045B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 96E5F3041F153C64004D045B /* Motion.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 96C98DD11E424AB000B22906;
remoteInfo = "Motion iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
961276621DCD8B1800A7D920 /* CharacterAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterAttribute.swift; sourceTree = "<group>"; };
961E6BDE1DDA2A95004E6C93 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
......@@ -314,52 +299,46 @@
96D88BFD1C1328D800B91418 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
96D88C091C1328D800B91418 /* Material.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Material.h; sourceTree = "<group>"; };
96E3C3931D397AE90086A024 /* Material+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIView.swift"; sourceTree = "<group>"; };
96E5F2FF1F153C64004D045B /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
96E5F3001F153C64004D045B /* .swift-version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
96E5F3011F153C64004D045B /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
96E5F3021F153C64004D045B /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
96E5F3031F153C64004D045B /* Motion.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Motion.podspec; sourceTree = "<group>"; };
96E5F3041F153C64004D045B /* Motion.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Motion.xcodeproj; sourceTree = "<group>"; };
96E5F3071F153C64004D045B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
96E5F30A1F153C64004D045B /* MotionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimator.swift; sourceTree = "<group>"; };
96E5F30B1F153C64004D045B /* MotionAnimatorViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimatorViewContext.swift; sourceTree = "<group>"; };
96E5F30C1F153C64004D045B /* MotionCoreAnimationViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCoreAnimationViewContext.swift; sourceTree = "<group>"; };
96E5F30D1F153C64004D045B /* MotionDefaultAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionDefaultAnimator.swift; sourceTree = "<group>"; };
96E5F30E1F153C64004D045B /* MotionHasInsertOrder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionHasInsertOrder.swift; sourceTree = "<group>"; };
96E5F30F1F153C64004D045B /* MotionViewPropertyViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionViewPropertyViewContext.swift; sourceTree = "<group>"; };
96E5F3111F153C64004D045B /* Motion+Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+Array.swift"; sourceTree = "<group>"; };
96E5F3121F153C64004D045B /* Motion+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CALayer.swift"; sourceTree = "<group>"; };
96E5F3131F153C64004D045B /* Motion+CAMediaTimingFunction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CAMediaTimingFunction.swift"; sourceTree = "<group>"; };
96E5F3141F153C64004D045B /* Motion+CG.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CG.swift"; sourceTree = "<group>"; };
96E5F3151F153C64004D045B /* Motion+Obj-C.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+Obj-C.swift"; sourceTree = "<group>"; };
96E5F3161F153C64004D045B /* Motion+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIKit.swift"; sourceTree = "<group>"; };
96E5F3171F153C64004D045B /* Motion+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIView.swift"; sourceTree = "<group>"; };
96E5F3181F153C64004D045B /* Motion+UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIViewController.swift"; sourceTree = "<group>"; };
96E5F3191F153C64004D045B /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; };
96E5F31A1F153C64004D045B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96E5F31B1F153C64004D045B /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
96E5F31C1F153C64004D045B /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
96E5F31D1F153C64004D045B /* Motion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Motion.swift; sourceTree = "<group>"; };
96E5F31E1F153C64004D045B /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; };
96E5F31F1F153C64004D045B /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; };
96E5F3201F153C64004D045B /* MotionCAAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCAAnimation.swift; sourceTree = "<group>"; };
96E5F3211F153C64004D045B /* MotionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionContext.swift; sourceTree = "<group>"; };
96E5F3221F153C64004D045B /* MotionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionController.swift; sourceTree = "<group>"; };
96E5F3231F153C64004D045B /* MotionCoordinateSpace.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCoordinateSpace.swift; sourceTree = "<group>"; };
96E5F3241F153C64004D045B /* MotionIndependentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionIndependentController.swift; sourceTree = "<group>"; };
96E5F3251F153C64004D045B /* MotionPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPlugin.swift; sourceTree = "<group>"; };
96E5F3261F153C64004D045B /* MotionSnapshotType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionSnapshotType.swift; sourceTree = "<group>"; };
96E5F3271F153C64004D045B /* MotionTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransition.swift; sourceTree = "<group>"; };
96E5F3281F153C64004D045B /* MotionTransitionObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionObserver.swift; sourceTree = "<group>"; };
96E5F3291F153C64004D045B /* MotionTransitionState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionState.swift; sourceTree = "<group>"; };
96E5F32B1F153C64004D045B /* CascadePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CascadePreprocessor.swift; sourceTree = "<group>"; };
96E5F32C1F153C64004D045B /* DurationPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DurationPreprocessor.swift; sourceTree = "<group>"; };
96E5F32D1F153C64004D045B /* IgnoreSubviewModifiersPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IgnoreSubviewModifiersPreprocessor.swift; sourceTree = "<group>"; };
96E5F32E1F153C64004D045B /* MatchPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatchPreprocessor.swift; sourceTree = "<group>"; };
96E5F32F1F153C64004D045B /* MotionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPreprocessor.swift; sourceTree = "<group>"; };
96E5F3301F153C64004D045B /* SourcePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SourcePreprocessor.swift; sourceTree = "<group>"; };
96E5F3311F153C64004D045B /* TransitionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionPreprocessor.swift; sourceTree = "<group>"; };
96F1DC871D654FDF0025F925 /* Material+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+CALayer.swift"; sourceTree = "<group>"; };
96F344F31F1960A300EE27C9 /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
96F344F61F1960A300EE27C9 /* MotionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimator.swift; sourceTree = "<group>"; };
96F344F71F1960A300EE27C9 /* MotionAnimatorViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimatorViewContext.swift; sourceTree = "<group>"; };
96F344F81F1960A300EE27C9 /* MotionCoreAnimationViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCoreAnimationViewContext.swift; sourceTree = "<group>"; };
96F344F91F1960A300EE27C9 /* MotionTransitionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionAnimator.swift; sourceTree = "<group>"; };
96F344FA1F1960A300EE27C9 /* MotionHasInsertOrder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionHasInsertOrder.swift; sourceTree = "<group>"; };
96F344FB1F1960A300EE27C9 /* MotionViewPropertyViewContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionViewPropertyViewContext.swift; sourceTree = "<group>"; };
96F344FD1F1960A300EE27C9 /* Motion+Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+Array.swift"; sourceTree = "<group>"; };
96F344FE1F1960A300EE27C9 /* Motion+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CALayer.swift"; sourceTree = "<group>"; };
96F344FF1F1960A300EE27C9 /* Motion+CAMediaTimingFunction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CAMediaTimingFunction.swift"; sourceTree = "<group>"; };
96F345001F1960A300EE27C9 /* Motion+CG.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+CG.swift"; sourceTree = "<group>"; };
96F345011F1960A300EE27C9 /* Motion+Obj-C.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+Obj-C.swift"; sourceTree = "<group>"; };
96F345021F1960A300EE27C9 /* Motion+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIKit.swift"; sourceTree = "<group>"; };
96F345031F1960A300EE27C9 /* Motion+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIView.swift"; sourceTree = "<group>"; };
96F345041F1960A300EE27C9 /* Motion+UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIViewController.swift"; sourceTree = "<group>"; };
96F345051F1960A300EE27C9 /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; };
96F345061F1960A300EE27C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96F345071F1960A300EE27C9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
96F345081F1960A300EE27C9 /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
96F345091F1960A300EE27C9 /* Motion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Motion.swift; sourceTree = "<group>"; };
96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; };
96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; };
96F3450C1F1960A300EE27C9 /* MotionCAAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCAAnimation.swift; sourceTree = "<group>"; };
96F3450D1F1960A300EE27C9 /* MotionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionContext.swift; sourceTree = "<group>"; };
96F3450E1F1960A300EE27C9 /* MotionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionController.swift; sourceTree = "<group>"; };
96F3450F1F1960A300EE27C9 /* MotionCoordinateSpace.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionCoordinateSpace.swift; sourceTree = "<group>"; };
96F345101F1960A300EE27C9 /* MotionIndependentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionIndependentController.swift; sourceTree = "<group>"; };
96F345111F1960A300EE27C9 /* MotionPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPlugin.swift; sourceTree = "<group>"; };
96F345121F1960A300EE27C9 /* MotionSnapshotType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionSnapshotType.swift; sourceTree = "<group>"; };
96F345131F1960A300EE27C9 /* MotionTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransition.swift; sourceTree = "<group>"; };
96F345141F1960A300EE27C9 /* MotionTransitionObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionObserver.swift; sourceTree = "<group>"; };
96F345151F1960A300EE27C9 /* MotionTransitionState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionState.swift; sourceTree = "<group>"; };
96F345171F1960A300EE27C9 /* CascadePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CascadePreprocessor.swift; sourceTree = "<group>"; };
96F345181F1960A300EE27C9 /* DurationPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DurationPreprocessor.swift; sourceTree = "<group>"; };
96F345191F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IgnoreSubviewModifiersPreprocessor.swift; sourceTree = "<group>"; };
96F3451A1F1960A300EE27C9 /* MatchPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatchPreprocessor.swift; sourceTree = "<group>"; };
96F3451B1F1960A300EE27C9 /* MotionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPreprocessor.swift; sourceTree = "<group>"; };
96F3451C1F1960A300EE27C9 /* SourcePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SourcePreprocessor.swift; sourceTree = "<group>"; };
96F345451F1961ED00EE27C9 /* TransitionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionPreprocessor.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
......@@ -788,105 +767,91 @@
96E5F2FE1F153C64004D045B /* Motion */ = {
isa = PBXGroup;
children = (
96E5F2FF1F153C64004D045B /* .gitignore */,
96E5F3001F153C64004D045B /* .swift-version */,
96E5F3011F153C64004D045B /* CONTRIBUTING.md */,
96E5F3021F153C64004D045B /* LICENSE.md */,
96E5F3031F153C64004D045B /* Motion.podspec */,
96E5F3041F153C64004D045B /* Motion.xcodeproj */,
96E5F3071F153C64004D045B /* README.md */,
96E5F3081F153C64004D045B /* Sources */,
96F344F31F1960A300EE27C9 /* LICENSE.md */,
96F344F41F1960A300EE27C9 /* Sources */,
);
name = Motion;
path = Frameworks/Motion;
sourceTree = "<group>";
};
96E5F3051F153C64004D045B /* Products */ = {
96EF418E1E835E850012CA1C /* Animation */ = {
isa = PBXGroup;
children = (
96E5F3601F153C64004D045B /* Motion.framework */,
96BCB7821CB40DC500C806FE /* PulseAnimation.swift */,
965532281E47E388005C2792 /* SpringAnimation.swift */,
);
name = Products;
name = Animation;
sourceTree = "<group>";
};
96E5F3081F153C64004D045B /* Sources */ = {
96F344F41F1960A300EE27C9 /* Sources */ = {
isa = PBXGroup;
children = (
96E5F3091F153C64004D045B /* Animator */,
96E5F3101F153C64004D045B /* Extensions */,
96E5F31A1F153C64004D045B /* Info.plist */,
96E5F31B1F153C64004D045B /* LICENSE */,
96E5F31C1F153C64004D045B /* Motion.h */,
96E5F31D1F153C64004D045B /* Motion.swift */,
96E5F31E1F153C64004D045B /* MotionAnimation.swift */,
96E5F31F1F153C64004D045B /* MotionAnimationState.swift */,
96E5F3201F153C64004D045B /* MotionCAAnimation.swift */,
96E5F3211F153C64004D045B /* MotionContext.swift */,
96E5F3221F153C64004D045B /* MotionController.swift */,
96E5F3231F153C64004D045B /* MotionCoordinateSpace.swift */,
96E5F3241F153C64004D045B /* MotionIndependentController.swift */,
96E5F3251F153C64004D045B /* MotionPlugin.swift */,
96E5F3261F153C64004D045B /* MotionSnapshotType.swift */,
96E5F3271F153C64004D045B /* MotionTransition.swift */,
96E5F3281F153C64004D045B /* MotionTransitionObserver.swift */,
96E5F3291F153C64004D045B /* MotionTransitionState.swift */,
96E5F32A1F153C64004D045B /* Preprocessors */,
96E5F3311F153C64004D045B /* TransitionPreprocessor.swift */,
96F344F51F1960A300EE27C9 /* Animator */,
96F344FC1F1960A300EE27C9 /* Extensions */,
96F345061F1960A300EE27C9 /* Info.plist */,
96F345071F1960A300EE27C9 /* LICENSE */,
96F345081F1960A300EE27C9 /* Motion.h */,
96F345091F1960A300EE27C9 /* Motion.swift */,
96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */,
96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */,
96F3450C1F1960A300EE27C9 /* MotionCAAnimation.swift */,
96F3450D1F1960A300EE27C9 /* MotionContext.swift */,
96F3450E1F1960A300EE27C9 /* MotionController.swift */,
96F3450F1F1960A300EE27C9 /* MotionCoordinateSpace.swift */,
96F345101F1960A300EE27C9 /* MotionIndependentController.swift */,
96F345111F1960A300EE27C9 /* MotionPlugin.swift */,
96F345121F1960A300EE27C9 /* MotionSnapshotType.swift */,
96F345131F1960A300EE27C9 /* MotionTransition.swift */,
96F345141F1960A300EE27C9 /* MotionTransitionObserver.swift */,
96F345151F1960A300EE27C9 /* MotionTransitionState.swift */,
96F345161F1960A300EE27C9 /* Preprocessors */,
);
path = Sources;
sourceTree = "<group>";
};
96E5F3091F153C64004D045B /* Animator */ = {
96F344F51F1960A300EE27C9 /* Animator */ = {
isa = PBXGroup;
children = (
96E5F30A1F153C64004D045B /* MotionAnimator.swift */,
96E5F30B1F153C64004D045B /* MotionAnimatorViewContext.swift */,
96E5F30C1F153C64004D045B /* MotionCoreAnimationViewContext.swift */,
96E5F30D1F153C64004D045B /* MotionDefaultAnimator.swift */,
96E5F30E1F153C64004D045B /* MotionHasInsertOrder.swift */,
96E5F30F1F153C64004D045B /* MotionViewPropertyViewContext.swift */,
96F344F61F1960A300EE27C9 /* MotionAnimator.swift */,
96F344F71F1960A300EE27C9 /* MotionAnimatorViewContext.swift */,
96F344F81F1960A300EE27C9 /* MotionCoreAnimationViewContext.swift */,
96F344F91F1960A300EE27C9 /* MotionTransitionAnimator.swift */,
96F344FA1F1960A300EE27C9 /* MotionHasInsertOrder.swift */,
96F344FB1F1960A300EE27C9 /* MotionViewPropertyViewContext.swift */,
);
path = Animator;
sourceTree = "<group>";
};
96E5F3101F153C64004D045B /* Extensions */ = {
96F344FC1F1960A300EE27C9 /* Extensions */ = {
isa = PBXGroup;
children = (
96E5F3111F153C64004D045B /* Motion+Array.swift */,
96E5F3121F153C64004D045B /* Motion+CALayer.swift */,
96E5F3131F153C64004D045B /* Motion+CAMediaTimingFunction.swift */,
96E5F3141F153C64004D045B /* Motion+CG.swift */,
96E5F3151F153C64004D045B /* Motion+Obj-C.swift */,
96E5F3161F153C64004D045B /* Motion+UIKit.swift */,
96E5F3171F153C64004D045B /* Motion+UIView.swift */,
96E5F3181F153C64004D045B /* Motion+UIViewController.swift */,
96E5F3191F153C64004D045B /* MotionAnimationFillMode.swift */,
96F344FD1F1960A300EE27C9 /* Motion+Array.swift */,
96F344FE1F1960A300EE27C9 /* Motion+CALayer.swift */,
96F344FF1F1960A300EE27C9 /* Motion+CAMediaTimingFunction.swift */,
96F345001F1960A300EE27C9 /* Motion+CG.swift */,
96F345011F1960A300EE27C9 /* Motion+Obj-C.swift */,
96F345021F1960A300EE27C9 /* Motion+UIKit.swift */,
96F345031F1960A300EE27C9 /* Motion+UIView.swift */,
96F345041F1960A300EE27C9 /* Motion+UIViewController.swift */,
96F345051F1960A300EE27C9 /* MotionAnimationFillMode.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
96E5F32A1F153C64004D045B /* Preprocessors */ = {
96F345161F1960A300EE27C9 /* Preprocessors */ = {
isa = PBXGroup;
children = (
96E5F32B1F153C64004D045B /* CascadePreprocessor.swift */,
96E5F32C1F153C64004D045B /* DurationPreprocessor.swift */,
96E5F32D1F153C64004D045B /* IgnoreSubviewModifiersPreprocessor.swift */,
96E5F32E1F153C64004D045B /* MatchPreprocessor.swift */,
96E5F32F1F153C64004D045B /* MotionPreprocessor.swift */,
96E5F3301F153C64004D045B /* SourcePreprocessor.swift */,
96F345171F1960A300EE27C9 /* CascadePreprocessor.swift */,
96F345181F1960A300EE27C9 /* DurationPreprocessor.swift */,
96F345191F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift */,
96F3451A1F1960A300EE27C9 /* MatchPreprocessor.swift */,
96F3451B1F1960A300EE27C9 /* MotionPreprocessor.swift */,
96F3451C1F1960A300EE27C9 /* SourcePreprocessor.swift */,
96F345451F1961ED00EE27C9 /* TransitionPreprocessor.swift */,
);
path = Preprocessors;
sourceTree = "<group>";
};
96EF418E1E835E850012CA1C /* Animation */ = {
isa = PBXGroup;
children = (
96BCB7821CB40DC500C806FE /* PulseAnimation.swift */,
965532281E47E388005C2792 /* SpringAnimation.swift */,
);
name = Animation;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
......@@ -946,7 +911,7 @@
9697F7BF1D8F2572004741EC /* Divider.swift in Headers */,
9697F7C01D8F2572004741EC /* Material+CALayer.swift in Headers */,
9697F7C11D8F2572004741EC /* Material+Array.swift in Headers */,
96E5F3491F153C64004D045B /* Motion.h in Headers */,
96F345301F1960A300EE27C9 /* Motion.h in Headers */,
9697F7C21D8F2572004741EC /* Material+UIWindow.swift in Headers */,
9697F7C31D8F2572004741EC /* DynamicFontType.swift in Headers */,
9697F7CB1D8F2573004741EC /* Snackbar.swift in Headers */,
......@@ -1028,12 +993,6 @@
mainGroup = 9638322C1B88DFD80015F710;
productRefGroup = 963832371B88DFD80015F710 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 96E5F3051F153C64004D045B /* Products */;
ProjectRef = 96E5F3041F153C64004D045B /* Motion.xcodeproj */;
},
);
projectRoot = "";
targets = (
963832351B88DFD80015F710 /* Material */,
......@@ -1041,32 +1000,19 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
96E5F3601F153C64004D045B /* Motion.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Motion.framework;
remoteRef = 96E5F35F1F153C64004D045B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
963832341B88DFD80015F710 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
96334EF61C8B84660083986B /* Assets.xcassets in Resources */,
96E5F3361F153C64004D045B /* Motion.podspec in Resources */,
96E5F3321F153C64004D045B /* .gitignore in Resources */,
96BCB7F71CB40DE900C806FE /* Roboto-Medium.ttf in Resources */,
96F3452F1F1960A300EE27C9 /* LICENSE in Resources */,
96BCB7F31CB40DE900C806FE /* Roboto-Bold.ttf in Resources */,
96E5F3481F153C64004D045B /* LICENSE in Resources */,
96E5F3331F153C64004D045B /* .swift-version in Resources */,
96BCB7FB1CB40DE900C806FE /* Roboto-Thin.ttf in Resources */,
96BCB7F91CB40DE900C806FE /* Roboto-Regular.ttf in Resources */,
96E5F3471F153C64004D045B /* Info.plist in Resources */,
96BCB7F51CB40DE900C806FE /* Roboto-Light.ttf in Resources */,
96F3452E1F1960A300EE27C9 /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -1094,121 +1040,119 @@
buildActionMask = 2147483647;
files = (
965E81231DD4D7C800D61E4B /* BottomTabBar.swift in Sources */,
96F345391F1960A300EE27C9 /* MotionPlugin.swift in Sources */,
961E6BE21DDA2AF3004E6C93 /* Screen.swift in Sources */,
96E5F3581F153C64004D045B /* DurationPreprocessor.swift in Sources */,
96F345401F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift in Sources */,
965E81261DD4D7C800D61E4B /* CharacterAttribute.swift in Sources */,
96E5F3571F153C64004D045B /* CascadePreprocessor.swift in Sources */,
965E80FF1DD4D5C800D61E4B /* BottomNavigationController.swift in Sources */,
965E81031DD4D5C800D61E4B /* CollectionView.swift in Sources */,
965E81041DD4D5C800D61E4B /* CollectionViewCell.swift in Sources */,
96F345321F1960A300EE27C9 /* MotionAnimation.swift in Sources */,
965E81071DD4D5C800D61E4B /* CollectionViewLayout.swift in Sources */,
965E81081DD4D5C800D61E4B /* CollectionReusableView.swift in Sources */,
96E5F34C1F153C64004D045B /* MotionAnimationState.swift in Sources */,
965E81091DD4D5C800D61E4B /* DataSourceItem.swift in Sources */,
96F345221F1960A300EE27C9 /* MotionTransitionAnimator.swift in Sources */,
965E810A1DD4D5C800D61E4B /* Font.swift in Sources */,
96E5F33D1F153C64004D045B /* MotionViewPropertyViewContext.swift in Sources */,
96F345291F1960A300EE27C9 /* Motion+Obj-C.swift in Sources */,
965E810B1DD4D5C800D61E4B /* RobotoFont.swift in Sources */,
965E810C1DD4D5C800D61E4B /* DynamicFontType.swift in Sources */,
96A183651E0C6DD400083C30 /* FABMenuController.swift in Sources */,
965E81101DD4D5C800D61E4B /* NavigationBar.swift in Sources */,
965E81111DD4D5C800D61E4B /* NavigationController.swift in Sources */,
96F3453D1F1960A300EE27C9 /* MotionTransitionState.swift in Sources */,
965E81121DD4D5C800D61E4B /* NavigationItem.swift in Sources */,
96F345251F1960A300EE27C9 /* Motion+Array.swift in Sources */,
96F3451F1F1960A300EE27C9 /* MotionAnimator.swift in Sources */,
96F3452B1F1960A300EE27C9 /* Motion+UIView.swift in Sources */,
965E81131DD4D5C800D61E4B /* NavigationDrawerController.swift in Sources */,
9656895F1F002F16001C656D /* CardCollectionViewCell.swift in Sources */,
965E81161DD4D5C800D61E4B /* DisplayStyle.swift in Sources */,
96E5F34B1F153C64004D045B /* MotionAnimation.swift in Sources */,
96F3453E1F1960A300EE27C9 /* CascadePreprocessor.swift in Sources */,
965E81171DD4D5C800D61E4B /* RootController.swift in Sources */,
965E81181DD4D5C800D61E4B /* Snackbar.swift in Sources */,
96F345271F1960A300EE27C9 /* Motion+CAMediaTimingFunction.swift in Sources */,
965E81191DD4D5C800D61E4B /* SnackbarController.swift in Sources */,
96E5F33C1F153C64004D045B /* MotionHasInsertOrder.swift in Sources */,
965E811A1DD4D5C800D61E4B /* StatusBarController.swift in Sources */,
965E811B1DD4D5C800D61E4B /* Switch.swift in Sources */,
96E5F3511F153C64004D045B /* MotionIndependentController.swift in Sources */,
965E811C1DD4D5C800D61E4B /* TabBar.swift in Sources */,
965E811D1DD4D5C800D61E4B /* TableViewCell.swift in Sources */,
96E5F3561F153C64004D045B /* MotionTransitionState.swift in Sources */,
965E811E1DD4D5C800D61E4B /* TextField.swift in Sources */,
965E811F1DD4D5C800D61E4B /* ErrorTextField.swift in Sources */,
96E5F3531F153C64004D045B /* MotionSnapshotType.swift in Sources */,
965E81211DD4D5C800D61E4B /* TextStorage.swift in Sources */,
965E81221DD4D5C800D61E4B /* TextView.swift in Sources */,
96E5F3401F153C64004D045B /* Motion+CAMediaTimingFunction.swift in Sources */,
966995491F1433C30064E7E4 /* PageTabBarController.swift in Sources */,
96F345241F1960A300EE27C9 /* MotionViewPropertyViewContext.swift in Sources */,
965E80E71DD4C55200D61E4B /* Material+UIView.swift in Sources */,
965E80E81DD4C55200D61E4B /* Material+CALayer.swift in Sources */,
96E5F3391F153C64004D045B /* MotionAnimatorViewContext.swift in Sources */,
965E80E91DD4C55200D61E4B /* Material+String.swift in Sources */,
965E80F71DD4D59500D61E4B /* Card.swift in Sources */,
965E80EA1DD4C55200D61E4B /* Material+UIFont.swift in Sources */,
965E80EB1DD4C55200D61E4B /* Material+UIImage.swift in Sources */,
96F3453C1F1960A300EE27C9 /* MotionTransitionObserver.swift in Sources */,
96F3453F1F1960A300EE27C9 /* DurationPreprocessor.swift in Sources */,
965E80EC1DD4C55200D61E4B /* Material+Array.swift in Sources */,
965E80ED1DD4C55200D61E4B /* Material+UIWindow.swift in Sources */,
965E80E41DD4C53300D61E4B /* PulseView.swift in Sources */,
966C17731F0439F600D3E83C /* Material+MotionAnimation.swift in Sources */,
965E80E51DD4C53300D61E4B /* PulseAnimation.swift in Sources */,
965E80FE1DD4D59500D61E4B /* ToolbarController.swift in Sources */,
96E5F33F1F153C64004D045B /* Motion+CALayer.swift in Sources */,
96328B971E05C0BB009A4C90 /* TableView.swift in Sources */,
96E5F3541F153C64004D045B /* MotionTransition.swift in Sources */,
965E80F81DD4D59500D61E4B /* ImageCard.swift in Sources */,
96328B991E05C0CE009A4C90 /* TableViewController.swift in Sources */,
96E5F33B1F153C64004D045B /* MotionDefaultAnimator.swift in Sources */,
965E80F91DD4D59500D61E4B /* PresenterCard.swift in Sources */,
96F3453B1F1960A300EE27C9 /* MotionTransition.swift in Sources */,
965689611F002F4C001C656D /* CardCollectionViewController.swift in Sources */,
96E5F3381F153C64004D045B /* MotionAnimator.swift in Sources */,
96E5F3451F153C64004D045B /* Motion+UIViewController.swift in Sources */,
96E5F33E1F153C64004D045B /* Motion+Array.swift in Sources */,
96E5F3551F153C64004D045B /* MotionTransitionObserver.swift in Sources */,
965E80CC1DD4C50600D61E4B /* Bar.swift in Sources */,
96E5F35C1F153C64004D045B /* SourcePreprocessor.swift in Sources */,
96E5F3501F153C64004D045B /* MotionCoordinateSpace.swift in Sources */,
96E5F3521F153C64004D045B /* MotionPlugin.swift in Sources */,
965E80CD1DD4C50600D61E4B /* Button.swift in Sources */,
96F345281F1960A300EE27C9 /* Motion+CG.swift in Sources */,
96F3452C1F1960A300EE27C9 /* Motion+UIViewController.swift in Sources */,
96F345341F1960A300EE27C9 /* MotionCAAnimation.swift in Sources */,
965E80CE1DD4C50600D61E4B /* FABButton.swift in Sources */,
96E5F3431F153C64004D045B /* Motion+UIKit.swift in Sources */,
965E80CF1DD4C50600D61E4B /* FlatButton.swift in Sources */,
96F345361F1960A300EE27C9 /* MotionController.swift in Sources */,
965E80D01DD4C50600D61E4B /* RaisedButton.swift in Sources */,
96E5F35B1F153C64004D045B /* MotionPreprocessor.swift in Sources */,
96A183631E0C6CE200083C30 /* FABMenu.swift in Sources */,
96F345311F1960A300EE27C9 /* Motion.swift in Sources */,
96F345231F1960A300EE27C9 /* MotionHasInsertOrder.swift in Sources */,
965E80D11DD4C50600D61E4B /* IconButton.swift in Sources */,
96F345211F1960A300EE27C9 /* MotionCoreAnimationViewContext.swift in Sources */,
965E80D21DD4C50600D61E4B /* Color.swift in Sources */,
96BFC1541E5E486F0075DE1F /* SpringAnimation.swift in Sources */,
96F345461F1961ED00EE27C9 /* TransitionPreprocessor.swift in Sources */,
96F345381F1960A300EE27C9 /* MotionIndependentController.swift in Sources */,
96F345421F1960A300EE27C9 /* MotionPreprocessor.swift in Sources */,
965E80D31DD4C50600D61E4B /* Device.swift in Sources */,
96E5F3341F153C64004D045B /* CONTRIBUTING.md in Sources */,
965E80FD1DD4D59500D61E4B /* Toolbar.swift in Sources */,
96E5F3351F153C64004D045B /* LICENSE.md in Sources */,
96E5F34E1F153C64004D045B /* MotionContext.swift in Sources */,
96E5F3441F153C64004D045B /* Motion+UIView.swift in Sources */,
965E80D41DD4C50600D61E4B /* Divider.swift in Sources */,
96E5F3591F153C64004D045B /* IgnoreSubviewModifiersPreprocessor.swift in Sources */,
96E5F3411F153C64004D045B /* Motion+CG.swift in Sources */,
96E5F34D1F153C64004D045B /* MotionCAAnimation.swift in Sources */,
96F345331F1960A300EE27C9 /* MotionAnimationState.swift in Sources */,
96F345411F1960A300EE27C9 /* MatchPreprocessor.swift in Sources */,
965E80D51DD4C50600D61E4B /* Grid.swift in Sources */,
96E5F34F1F153C64004D045B /* MotionController.swift in Sources */,
965E80D61DD4C50600D61E4B /* HeightPreset.swift in Sources */,
96E5F35D1F153C64004D045B /* TransitionPreprocessor.swift in Sources */,
961E6BDF1DDA2A95004E6C93 /* Application.swift in Sources */,
96F345351F1960A300EE27C9 /* MotionContext.swift in Sources */,
96F345431F1960A300EE27C9 /* SourcePreprocessor.swift in Sources */,
96F345261F1960A300EE27C9 /* Motion+CALayer.swift in Sources */,
965E80D71DD4C50600D61E4B /* Icon.swift in Sources */,
965E80FC1DD4D59500D61E4B /* SearchBarController.swift in Sources */,
96E5F34A1F153C64004D045B /* Motion.swift in Sources */,
965E80D81DD4C50600D61E4B /* Layer.swift in Sources */,
965E80D91DD4C50600D61E4B /* Layout.swift in Sources */,
96E5F3371F153C64004D045B /* README.md in Sources */,
965E80DA1DD4C50600D61E4B /* Border.swift in Sources */,
965E80DB1DD4C50600D61E4B /* InterimSpace.swift in Sources */,
965E80DC1DD4C50600D61E4B /* Depth.swift in Sources */,
965E80DD1DD4C50600D61E4B /* EdgeInsets.swift in Sources */,
96F3453A1F1960A300EE27C9 /* MotionSnapshotType.swift in Sources */,
965E80DE1DD4C50600D61E4B /* Gravity.swift in Sources */,
96F3452D1F1960A300EE27C9 /* MotionAnimationFillMode.swift in Sources */,
96F3452A1F1960A300EE27C9 /* Motion+UIKit.swift in Sources */,
965E80DF1DD4C50600D61E4B /* CornerRadius.swift in Sources */,
96E5F3421F153C64004D045B /* Motion+Obj-C.swift in Sources */,
965E80FB1DD4D59500D61E4B /* SearchBar.swift in Sources */,
96E5F3461F153C64004D045B /* MotionAnimationFillMode.swift in Sources */,
965E80E01DD4C50600D61E4B /* Shape.swift in Sources */,
965E80E11DD4C50600D61E4B /* Offset.swift in Sources */,
965E80E21DD4C50600D61E4B /* View.swift in Sources */,
96E5F33A1F153C64004D045B /* MotionCoreAnimationViewContext.swift in Sources */,
96F3451E1F1960A300EE27C9 /* LICENSE.md in Sources */,
96F345201F1960A300EE27C9 /* MotionAnimatorViewContext.swift in Sources */,
96F345371F1960A300EE27C9 /* MotionCoordinateSpace.swift in Sources */,
96328B7A1E020A41009A4C90 /* CollectionViewController.swift in Sources */,
96E5F35A1F153C64004D045B /* MatchPreprocessor.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Sources/iOS/PulseAnimation.swift
......@@ -128,7 +128,7 @@ public struct Pulse {
] in
bLayer.frame = bounds
pLayer.bounds = CGRect(x: 0, y: 0, width: n, height: n)
pLayer.frame = CGRect(x: 0, y: 0, width: n, height: n)
switch animation {
case .center, .centerWithBacking, .centerRadialBeyondBounds:
......@@ -146,15 +146,15 @@ public struct Pulse {
let t: TimeInterval = .center == animation ? 0.16125 : 0.325
// switch animation {
// case .centerWithBacking, .backing, .pointWithBacking:
// bLayer.animate(.duration(t))
// default:break
// }
switch animation {
case .centerWithBacking, .backing, .pointWithBacking:
bLayer.animate(.background(color: color.withAlphaComponent(opacity / 2)), .duration(t))
default:break
}
switch animation {
case .center, .centerWithBacking, .centerRadialBeyondBounds, .radialBeyondBounds, .point, .pointWithBacking:
pLayer.animate(.scale(), .background(color: color.withAlphaComponent(opacity / 2)), .duration(t))
pLayer.animate(.scale(1), .duration(t))
default:break
}
......@@ -180,16 +180,15 @@ public struct Pulse {
let t: TimeInterval = 0.325
// switch animation {
// case .centerWithBacking, .backing, .pointWithBacking:
// bLayer.animate(.background(color: color.withAlphaComponent(0)), .duration(t))
// default:break
// }
switch animation {
case .centerWithBacking, .backing, .pointWithBacking:
bLayer.animate(.background(color: color.withAlphaComponent(0)), .duration(t))
default:break
}
switch animation {
case .center, .centerWithBacking, .centerRadialBeyondBounds, .radialBeyondBounds, .point, .pointWithBacking:
let v: CGFloat = .center == animation ? 1 : 1.325
pLayer.animate(.scale(x: v, y: v, z: v), .background(color: color.withAlphaComponent(0)))
pLayer.animate(.background(color: color.withAlphaComponent(0)))
default:break
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment