Skip to content

M
Material
Commit 9875036d by Daniel Dahan
Options

development: rename to Motion classes, where adding Motion as a suffix rather than a prefix

parent 63d8d3af
Showing with 105 additions and 104 deletions
Material.xcodeproj/project.pbxproj
......@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
961730361E0E156400A9A297 /* MotionSpring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961730351E0E156400A9A297 /* MotionSpring.swift */; };
961730361E0E156400A9A297 /* SpringMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961730351E0E156400A9A297 /* SpringMotion.swift */; };
9617B07D1DFCA8CF00410F8F /* Application.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961E6BDE1DDA2A95004E6C93 /* Application.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9617B07E1DFCA8CF00410F8F /* Card.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75D1CB40DC500C806FE /* Card.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9617B07F1DFCA8CF00410F8F /* ImageCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7621CB40DC500C806FE /* ImageCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -44,9 +44,9 @@
96334EF61C8B84660083986B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96334EF51C8B84660083986B /* Assets.xcassets */; };
963832421B88DFD80015F710 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963832361B88DFD80015F710 /* Material.framework */; };
965E80C81DD4C50600D61E4B /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB76D1CB40DC500C806FE /* Motion.swift */; };
965E80C91DD4C50600D61E4B /* MotionTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB78B1CB40DC500C806FE /* MotionTransition.swift */; };
965E80CA1DD4C50600D61E4B /* MotionKeyframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB77E1CB40DC500C806FE /* MotionKeyframe.swift */; };
965E80CB1DD4C50600D61E4B /* MotionBasic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E3C39D1D3A1D0C0086A024 /* MotionBasic.swift */; };
965E80C91DD4C50600D61E4B /* TransitionMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB78B1CB40DC500C806FE /* TransitionMotion.swift */; };
965E80CA1DD4C50600D61E4B /* KeyframeMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB77E1CB40DC500C806FE /* KeyframeMotion.swift */; };
965E80CB1DD4C50600D61E4B /* BasicMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E3C39D1D3A1D0C0086A024 /* BasicMotion.swift */; };
965E80CC1DD4C50600D61E4B /* Bar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7981CB40DC500C806FE /* Bar.swift */; };
965E80CD1DD4C50600D61E4B /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7701CB40DC500C806FE /* Button.swift */; };
965E80CE1DD4C50600D61E4B /* FABButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB75F1CB40DC500C806FE /* FABButton.swift */; };
......@@ -71,7 +71,7 @@
965E80E11DD4C50600D61E4B /* Offset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 968C99461D377849000074FF /* Offset.swift */; };
965E80E21DD4C50600D61E4B /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB78C1CB40DC500C806FE /* View.swift */; };
965E80E41DD4C53300D61E4B /* PulseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7841CB40DC500C806FE /* PulseView.swift */; };
965E80E51DD4C53300D61E4B /* MotionPulse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7821CB40DC500C806FE /* MotionPulse.swift */; };
965E80E51DD4C53300D61E4B /* PulseMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7821CB40DC500C806FE /* PulseMotion.swift */; };
965E80E61DD4C55200D61E4B /* Material+Obj-C.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7631CB40DC500C806FE /* Material+Obj-C.swift */; };
965E80E71DD4C55200D61E4B /* Material+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E3C3931D397AE90086A024 /* Material+UIView.swift */; };
965E80E81DD4C55200D61E4B /* Material+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F1DC871D654FDF0025F925 /* Material+CALayer.swift */; };
......@@ -129,7 +129,7 @@
9660162A1CB2F04E00AAB661 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C091C1328D800B91418 /* Material.h */; settings = {ATTRIBUTES = (Public, ); }; };
9661222E1D3EC414008BB4CB /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9661222D1D3EC414008BB4CB /* Color.swift */; };
96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; };
9697F7BC1D8F2572004741EC /* MotionBasic.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E3C39D1D3A1D0C0086A024 /* MotionBasic.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9697F7BC1D8F2572004741EC /* BasicMotion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E3C39D1D3A1D0C0086A024 /* BasicMotion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9697F7BF1D8F2572004741EC /* Divider.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96230AB71D6A520C00AF47DC /* Divider.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9697F7C01D8F2572004741EC /* Material+CALayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96F1DC871D654FDF0025F925 /* Material+CALayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9697F7C11D8F2572004741EC /* Material+Array.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96C1C8801D42C62800E6608F /* Material+Array.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -152,10 +152,10 @@
96BCB7FA1CB40DE900C806FE /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96BCB7F11CB40DE900C806FE /* Roboto-Regular.ttf */; };
96BCB7FB1CB40DE900C806FE /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96BCB7F21CB40DE900C806FE /* Roboto-Thin.ttf */; };
96BCB7FC1CB40DE900C806FE /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96BCB7F21CB40DE900C806FE /* Roboto-Thin.ttf */; };
96BCB8101CB4115200C806FE /* MotionTransition.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB78B1CB40DC500C806FE /* MotionTransition.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8101CB4115200C806FE /* TransitionMotion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB78B1CB40DC500C806FE /* TransitionMotion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8111CB4115200C806FE /* Motion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB76D1CB40DC500C806FE /* Motion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8131CB4115200C806FE /* MotionKeyframe.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB77E1CB40DC500C806FE /* MotionKeyframe.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8141CB4115200C806FE /* MotionPulse.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7821CB40DC500C806FE /* MotionPulse.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8131CB4115200C806FE /* KeyframeMotion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB77E1CB40DC500C806FE /* KeyframeMotion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8141CB4115200C806FE /* PulseMotion.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7821CB40DC500C806FE /* PulseMotion.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8151CB4115200C806FE /* FABButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75F1CB40DC500C806FE /* FABButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8161CB4115200C806FE /* FlatButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7601CB40DC500C806FE /* FlatButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8171CB4115200C806FE /* Button.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7701CB40DC500C806FE /* Button.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -229,7 +229,7 @@
/* Begin PBXFileReference section */
961276621DCD8B1800A7D920 /* CharacterAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterAttribute.swift; sourceTree = "<group>"; };
961730351E0E156400A9A297 /* MotionSpring.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionSpring.swift; sourceTree = "<group>"; };
961730351E0E156400A9A297 /* SpringMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpringMotion.swift; sourceTree = "<group>"; };
961DED451DCC40C500F425B6 /* Editor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Editor.swift; sourceTree = "<group>"; };
961DED4A1DCC546100F425B6 /* EditorController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorController.swift; sourceTree = "<group>"; };
961E6BDE1DDA2A95004E6C93 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
......@@ -295,17 +295,17 @@
96BCB77B1CB40DC500C806FE /* Font.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
96BCB77C1CB40DC500C806FE /* Gravity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Gravity.swift; sourceTree = "<group>"; };
96BCB77D1CB40DC500C806FE /* Icon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Icon.swift; sourceTree = "<group>"; };
96BCB77E1CB40DC500C806FE /* MotionKeyframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionKeyframe.swift; sourceTree = "<group>"; };
96BCB77E1CB40DC500C806FE /* KeyframeMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyframeMotion.swift; sourceTree = "<group>"; };
96BCB7801CB40DC500C806FE /* Layer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Layer.swift; sourceTree = "<group>"; };
96BCB7811CB40DC500C806FE /* Layout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
96BCB7821CB40DC500C806FE /* MotionPulse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPulse.swift; sourceTree = "<group>"; };
96BCB7821CB40DC500C806FE /* PulseMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PulseMotion.swift; sourceTree = "<group>"; };
96BCB7841CB40DC500C806FE /* PulseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PulseView.swift; sourceTree = "<group>"; };
96BCB7851CB40DC500C806FE /* CornerRadius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CornerRadius.swift; sourceTree = "<group>"; };
96BCB7861CB40DC500C806FE /* Shape.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Shape.swift; sourceTree = "<group>"; };
96BCB7871CB40DC500C806FE /* InterimSpace.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterimSpace.swift; sourceTree = "<group>"; };
96BCB7881CB40DC500C806FE /* Switch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Switch.swift; sourceTree = "<group>"; };
96BCB7891CB40DC500C806FE /* TableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
96BCB78B1CB40DC500C806FE /* MotionTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransition.swift; sourceTree = "<group>"; };
96BCB78B1CB40DC500C806FE /* TransitionMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionMotion.swift; sourceTree = "<group>"; };
96BCB78C1CB40DC500C806FE /* View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
96BCB78E1CB40DC500C806FE /* Menu.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = Menu.swift; sourceTree = "<group>"; tabWidth = 4; };
96BCB78F1CB40DC500C806FE /* MenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuController.swift; sourceTree = "<group>"; };
......@@ -335,7 +335,7 @@
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>"; };
96E3C39D1D3A1D0C0086A024 /* MotionBasic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionBasic.swift; sourceTree = "<group>"; };
96E3C39D1D3A1D0C0086A024 /* BasicMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicMotion.swift; sourceTree = "<group>"; };
96F1DC871D654FDF0025F925 /* Material+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+CALayer.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -791,11 +791,11 @@
isa = PBXGroup;
children = (
96BCB76D1CB40DC500C806FE /* Motion.swift */,
96BCB78B1CB40DC500C806FE /* MotionTransition.swift */,
96BCB77E1CB40DC500C806FE /* MotionKeyframe.swift */,
96E3C39D1D3A1D0C0086A024 /* MotionBasic.swift */,
96BCB7821CB40DC500C806FE /* MotionPulse.swift */,
961730351E0E156400A9A297 /* MotionSpring.swift */,
96BCB78B1CB40DC500C806FE /* TransitionMotion.swift */,
96BCB77E1CB40DC500C806FE /* KeyframeMotion.swift */,
96E3C39D1D3A1D0C0086A024 /* BasicMotion.swift */,
96BCB7821CB40DC500C806FE /* PulseMotion.swift */,
961730351E0E156400A9A297 /* SpringMotion.swift */,
);
name = Motion;
sourceTree = "<group>";
......@@ -872,10 +872,10 @@
buildActionMask = 2147483647;
files = (
96D88C321C1328D800B91418 /* Material.h in Headers */,
96BCB8101CB4115200C806FE /* MotionTransition.swift in Headers */,
96BCB8101CB4115200C806FE /* TransitionMotion.swift in Headers */,
96BCB8111CB4115200C806FE /* Motion.swift in Headers */,
96BCB8131CB4115200C806FE /* MotionKeyframe.swift in Headers */,
96BCB8141CB4115200C806FE /* MotionPulse.swift in Headers */,
96BCB8131CB4115200C806FE /* KeyframeMotion.swift in Headers */,
96BCB8141CB4115200C806FE /* PulseMotion.swift in Headers */,
96BCB8151CB4115200C806FE /* FABButton.swift in Headers */,
96BCB8161CB4115200C806FE /* FlatButton.swift in Headers */,
96BCB8171CB4115200C806FE /* Button.swift in Headers */,
......@@ -926,7 +926,7 @@
96E3C3991D3A1CC20086A024 /* StatusBarController.swift in Headers */,
96E3C39A1D3A1CC20086A024 /* ErrorTextField.swift in Headers */,
96E3C39C1D3A1CC20086A024 /* Offset.swift in Headers */,
9697F7BC1D8F2572004741EC /* MotionBasic.swift in Headers */,
9697F7BC1D8F2572004741EC /* BasicMotion.swift in Headers */,
9697F7BF1D8F2572004741EC /* Divider.swift in Headers */,
9697F7C01D8F2572004741EC /* Material+CALayer.swift in Headers */,
9697F7C11D8F2572004741EC /* Material+Array.swift in Headers */,
......@@ -1164,7 +1164,7 @@
965E81031DD4D5C800D61E4B /* CollectionView.swift in Sources */,
965E81041DD4D5C800D61E4B /* CollectionViewCell.swift in Sources */,
965E81071DD4D5C800D61E4B /* CollectionViewLayout.swift in Sources */,
961730361E0E156400A9A297 /* MotionSpring.swift in Sources */,
961730361E0E156400A9A297 /* SpringMotion.swift in Sources */,
965E81081DD4D5C800D61E4B /* CollectionReusableView.swift in Sources */,
965E81091DD4D5C800D61E4B /* DataSourceItem.swift in Sources */,
965E810A1DD4D5C800D61E4B /* Font.swift in Sources */,
......@@ -1206,16 +1206,16 @@
965E80EC1DD4C55200D61E4B /* Material+Array.swift in Sources */,
965E80ED1DD4C55200D61E4B /* Material+UIWindow.swift in Sources */,
965E80E41DD4C53300D61E4B /* PulseView.swift in Sources */,
965E80E51DD4C53300D61E4B /* MotionPulse.swift in Sources */,
965E80E51DD4C53300D61E4B /* PulseMotion.swift in Sources */,
965E80FE1DD4D59500D61E4B /* ToolbarController.swift in Sources */,
96328B971E05C0BB009A4C90 /* TableView.swift in Sources */,
965E80C81DD4C50600D61E4B /* Motion.swift in Sources */,
965E80C91DD4C50600D61E4B /* MotionTransition.swift in Sources */,
965E80CA1DD4C50600D61E4B /* MotionKeyframe.swift in Sources */,
965E80C91DD4C50600D61E4B /* TransitionMotion.swift in Sources */,
965E80CA1DD4C50600D61E4B /* KeyframeMotion.swift in Sources */,
965E80F81DD4D59500D61E4B /* ImageCard.swift in Sources */,
96328B991E05C0CE009A4C90 /* TableViewController.swift in Sources */,
965E80F91DD4D59500D61E4B /* PresenterCard.swift in Sources */,
965E80CB1DD4C50600D61E4B /* MotionBasic.swift in Sources */,
965E80CB1DD4C50600D61E4B /* BasicMotion.swift in Sources */,
965E80CC1DD4C50600D61E4B /* Bar.swift in Sources */,
965E80CD1DD4C50600D61E4B /* Button.swift in Sources */,
965E80CE1DD4C50600D61E4B /* FABButton.swift in Sources */,
......
Sources/iOS/Button.swift
......@@ -30,7 +30,7 @@
import UIKit
open class Button: UIButton, MotionPulseable {
open class Button: UIButton, PulseableMotion {
/**
A CAShapeLayer used to manage elements that would be affected by
the clipToBounds property of the backing layer. For example, this
......@@ -40,10 +40,10 @@ open class Button: UIButton, MotionPulseable {
open let visualLayer = CAShapeLayer()
/// A Pulse reference.
fileprivate var pulse: MotionPulse!
fileprivate var pulse: PulseMotion!
/// MotionPulseAnimation value.
open var pulseAnimation: MotionPulseAnimation {
/// PulseMotionAnimation value.
open var pulseAnimation: PulseMotionAnimation {
get {
return pulse.animation
}
......@@ -52,7 +52,7 @@ open class Button: UIButton, MotionPulseable {
}
}
/// MotionPulseAnimation color.
/// PulseMotionAnimation color.
@IBInspectable
open var pulseColor: UIColor {
get {
......@@ -261,7 +261,7 @@ extension Button {
/// Prepares the pulse motion.
fileprivate func preparePulse() {
pulse = MotionPulse(pulseView: self, pulseLayer: visualLayer)
pulse = PulseMotion(pulseView: self, pulseLayer: visualLayer)
}
/**
......
Sources/iOS/CollectionReusableView.swift
......@@ -31,7 +31,7 @@
import UIKit
@objc(CollectionReusableView)
open class CollectionReusableView: UICollectionReusableView, MotionPulseable {
open class CollectionReusableView: UICollectionReusableView, PulseableMotion {
/**
A CAShapeLayer used to manage elements that would be affected by
the clipToBounds property of the backing layer. For example, this
......@@ -41,10 +41,10 @@ open class CollectionReusableView: UICollectionReusableView, MotionPulseable {
open let visualLayer = CAShapeLayer()
/// A Pulse reference.
fileprivate var pulse: MotionPulse!
fileprivate var pulse: PulseMotion!
/// MotionPulseAnimation value.
open var pulseAnimation: MotionPulseAnimation {
/// PulseMotionAnimation value.
open var pulseAnimation: PulseMotionAnimation {
get {
return pulse.animation
}
......@@ -53,7 +53,7 @@ open class CollectionReusableView: UICollectionReusableView, MotionPulseable {
}
}
/// MotionPulseAnimation color.
/// PulseMotionAnimation color.
@IBInspectable
open var pulseColor: UIColor {
get {
......@@ -295,7 +295,7 @@ open class CollectionReusableView: UICollectionReusableView, MotionPulseable {
extension CollectionReusableView {
/// Prepares the pulse motion.
fileprivate func preparePulse() {
pulse = MotionPulse(pulseView: self, pulseLayer: visualLayer)
pulse = PulseMotion(pulseView: self, pulseLayer: visualLayer)
pulseAnimation = .none
}
......
Sources/iOS/CollectionViewCell.swift
......@@ -31,7 +31,7 @@
import UIKit
@objc(CollectionViewCell)
open class CollectionViewCell: UICollectionViewCell, MotionPulseable {
open class CollectionViewCell: UICollectionViewCell, PulseableMotion {
/**
A CAShapeLayer used to manage elements that would be affected by
the clipToBounds property of the backing layer. For example, this
......@@ -41,10 +41,10 @@ open class CollectionViewCell: UICollectionViewCell, MotionPulseable {
open let visualLayer = CAShapeLayer()
/// A Pulse reference.
fileprivate var pulse: MotionPulse!
fileprivate var pulse: PulseMotion!
/// MotionPulseAnimation value.
open var pulseAnimation: MotionPulseAnimation {
/// PulseMotionAnimation value.
open var pulseAnimation: PulseMotionAnimation {
get {
return pulse.animation
}
......@@ -53,7 +53,7 @@ open class CollectionViewCell: UICollectionViewCell, MotionPulseable {
}
}
/// MotionPulseAnimation color.
/// PulseMotionAnimation color.
@IBInspectable
open var pulseColor: UIColor {
get {
......@@ -256,7 +256,7 @@ open class CollectionViewCell: UICollectionViewCell, MotionPulseable {
extension CollectionViewCell {
/// Prepares the pulse motion.
fileprivate func preparePulse() {
pulse = MotionPulse(pulseView: self, pulseLayer: visualLayer)
pulse = PulseMotion(pulseView: self, pulseLayer: visualLayer)
}
/// Prepares the visualLayer property.
......
Sources/iOS/FABMenu.swift
......@@ -53,12 +53,12 @@ public protocol FABMenuDelegate {
@objc(FABMenu)
open class FABMenu: View, MotionSpringable {
/// A reference to the MotionSpring object.
internal let spring = MotionSpring()
open class FABMenu: View, SpringableMotion {
/// A reference to the SpringMotion object.
internal let spring = SpringMotion()
/// The direction in which the animation opens the menu.
open var springDirection = MotionSpringDirection.up {
open var springDirection = SpringMotionDirection.up {
didSet {
layoutSubviews()
}
......
Sources/iOS/MotionKeyframe.swift → Sources/iOS/KeyframeMotion.swift
......@@ -66,6 +66,7 @@ extension Motion {
animation.keyPath = AnimationKeyPath.position.rawValue
animation.path = bezierPath.cgPath
animation.rotationMode = AnimationRotationModeToValue(mode: mode)
if let v = duration {
animation.duration = v
}
......
Sources/iOS/Menu.swift
......@@ -53,15 +53,15 @@ public protocol MenuDelegate {
@objc(Menu)
open class Menu: View, MotionSpringable {
/// A reference to the MotionSpring object.
internal let spring = MotionSpring()
open class Menu: View, SpringableMotion {
/// A reference to the SpringMotion object.
internal let spring = SpringMotion()
/// An optional delegation handler.
open weak var delegate: MenuDelegate?
/// The direction in which the animation opens the menu.
open var springDirection = MotionSpringDirection.up {
open var springDirection = SpringMotionDirection.up {
didSet {
layoutSubviews()
}
......
Sources/iOS/MotionPulse.swift → Sources/iOS/PulseMotion.swift
......@@ -30,8 +30,8 @@
import UIKit
@objc(MotionPulseAnimation)
public enum MotionPulseAnimation: Int {
@objc(PulseMotionAnimation)
public enum PulseMotionAnimation: Int {
case none
case center
case centerWithBacking
......@@ -42,9 +42,9 @@ public enum MotionPulseAnimation: Int {
case pointWithBacking
}
public protocol MotionPulseable {
/// A reference to the MotionPulseAnimation.
var pulseAnimation: MotionPulseAnimation { get set }
public protocol PulseableMotion {
/// A reference to the PulseMotionAnimation.
var pulseAnimation: PulseMotionAnimation { get set }
/// A UIColor.
var pulseColor: UIColor { get set }
......@@ -53,8 +53,8 @@ public protocol MotionPulseable {
var pulseOpacity: CGFloat { get set }
}
public struct MotionPulse {
/// A UIView that is MotionPulseable.
public struct PulseMotion {
/// A UIView that is PulseableMotion.
fileprivate weak var pulseView: UIView?
/// The layer the pulse layers are added to.
......@@ -63,8 +63,8 @@ public struct MotionPulse {
/// Pulse layers.
fileprivate var layers = [CAShapeLayer]()
/// A reference to the MotionPulseAnimation.
public var animation = MotionPulseAnimation.pointWithBacking
/// A reference to the PulseMotionAnimation.
public var animation = PulseMotionAnimation.pointWithBacking
/// A UIColor.
public var color = Color.grey.base
......@@ -83,7 +83,7 @@ public struct MotionPulse {
}
}
extension MotionPulse {
extension PulseMotion {
/**
Triggers the expanding animation.
- Parameter point: A point to pulse from.
......@@ -161,7 +161,7 @@ extension MotionPulse {
}
}
extension MotionPulse {
extension PulseMotion {
/// Triggers the contracting animation.
public mutating func contract() {
guard let bLayer = layers.popLast() else {
......
Sources/iOS/PulseView.swift
......@@ -30,12 +30,12 @@
import UIKit
open class PulseView: View, MotionPulseable {
open class PulseView: View, PulseableMotion {
/// A Pulse reference.
fileprivate var pulse: MotionPulse!
fileprivate var pulse: PulseMotion!
/// MotionPulseAnimation value.
open var pulseAnimation: MotionPulseAnimation {
/// PulseMotionAnimation value.
open var pulseAnimation: PulseMotionAnimation {
get {
return pulse.animation
}
......@@ -44,7 +44,7 @@ open class PulseView: View, MotionPulseable {
}
}
/// MotionPulseAnimation color.
/// PulseMotionAnimation color.
@IBInspectable
open var pulseColor: UIColor {
get {
......@@ -129,6 +129,6 @@ open class PulseView: View, MotionPulseable {
extension PulseView {
/// Prepares the pulse motion.
fileprivate func preparePulse() {
pulse = MotionPulse(pulseView: self, pulseLayer: visualLayer)
pulse = PulseMotion(pulseView: self, pulseLayer: visualLayer)
}
}
Sources/iOS/MotionSpring.swift → Sources/iOS/SpringMotion.swift
......@@ -30,22 +30,22 @@
import UIKit
@objc(MotionSpringDirection)
public enum MotionSpringDirection: Int {
@objc(SpringMotionDirection)
public enum SpringMotionDirection: Int {
case up
case down
case left
case right
}
public protocol MotionSpringable {
/// A MotionSpringDirection value.
var springDirection: MotionSpringDirection { get set }
public protocol SpringableMotion {
/// A SpringMotionDirection value.
var springDirection: SpringMotionDirection { get set }
}
open class MotionSpring {
/// A MotionSpringDirection value.
open var direction = MotionSpringDirection.up
open class SpringMotion {
/// A SpringMotionDirection value.
open var direction = SpringMotionDirection.up
/// A Boolean that indicates if the menu is open or not.
open var isOpened = false
......@@ -111,7 +111,7 @@ open class MotionSpring {
}
}
extension MotionSpring {
extension SpringMotion {
/// Disable the Menu if views exist.
fileprivate func disable() {
guard 0 < views.count else {
......@@ -134,7 +134,7 @@ extension MotionSpring {
}
}
extension MotionSpring {
extension SpringMotion {
/**
Expands the Spring component with animation options.
- Parameter duration: The time for each view's animation.
......@@ -194,7 +194,7 @@ extension MotionSpring {
}
}
extension MotionSpring {
extension SpringMotion {
/**
Handles the animation open completion.
- Parameter view: A UIView.
......@@ -227,7 +227,7 @@ extension MotionSpring {
}
}
extension MotionSpring {
extension SpringMotion {
/**
Open the Menu component with animation options in the Up direction.
- Parameter duration: The time for each view's animation.
......
Sources/iOS/TableViewCell.swift
......@@ -30,7 +30,7 @@
import UIKit
open class TableViewCell: UITableViewCell, MotionPulseable {
open class TableViewCell: UITableViewCell, PulseableMotion {
/**
A CAShapeLayer used to manage elements that would be affected by
the clipToBounds property of the backing layer. For example, this
......@@ -40,10 +40,10 @@ open class TableViewCell: UITableViewCell, MotionPulseable {
open let visualLayer = CAShapeLayer()
/// A Pulse reference.
fileprivate var pulse: MotionPulse!
fileprivate var pulse: PulseMotion!
/// MotionPulseAnimation value.
open var pulseAnimation: MotionPulseAnimation {
/// PulseMotionAnimation value.
open var pulseAnimation: PulseMotionAnimation {
get {
return pulse.animation
}
......@@ -52,7 +52,7 @@ open class TableViewCell: UITableViewCell, MotionPulseable {
}
}
/// MotionPulseAnimation color.
/// PulseMotionAnimation color.
@IBInspectable
open var pulseColor: UIColor {
get {
......@@ -177,7 +177,7 @@ open class TableViewCell: UITableViewCell, MotionPulseable {
extension TableViewCell {
/// Prepares the pulse motion.
fileprivate func preparePulse() {
pulse = MotionPulse(pulseView: self, pulseLayer: visualLayer)
pulse = PulseMotion(pulseView: self, pulseLayer: visualLayer)
}
/// Prepares the visualLayer property.
......
Sources/iOS/MotionTransition.swift → Sources/iOS/TransitionMotion.swift
......@@ -30,16 +30,16 @@
import UIKit
@objc(AnimationTransition)
public enum AnimationTransition: Int {
@objc(TransitionMotion)
public enum TransitionMotion: Int {
case fade
case moveIn
case push
case reveal
}
@objc(AnimationTransitionDirection)
public enum AnimationTransitionDirection: Int {
@objc(TransitionMotionDirection)
public enum TransitionMotionDirection: Int {
case `default`
case right
case left
......@@ -48,11 +48,11 @@ public enum AnimationTransitionDirection: Int {
}
/**
Converts an AnimationTransition to a corresponding CATransition key.
- Parameter transition: An AnimationTransition.
Converts an TransitionMotion to a corresponding CATransition key.
- Parameter transition: An TransitionMotion.
- Returns: A CATransition key String.
*/
public func AnimationTransitionToValue(transition type: AnimationTransition) -> String {
public func TransitionMotionToValue(transition type: TransitionMotion) -> String {
switch type {
case .fade:
return kCATransitionFade
......@@ -66,11 +66,11 @@ public func AnimationTransitionToValue(transition type: AnimationTransition) ->
}
/**
Converts an AnimationTransitionDirection to a corresponding CATransition direction key.
- Parameter direction: An AnimationTransitionDirection.
Converts an TransitionMotionDirection to a corresponding CATransition direction key.
- Parameter direction: An TransitionMotionDirection.
- Returns: An optional CATransition direction key String.
*/
public func AnimationTransitionDirectionToValue(direction: AnimationTransitionDirection) -> String? {
public func TransitionMotionDirectionToValue(direction: TransitionMotionDirection) -> String? {
switch direction {
case .default:
return nil
......@@ -88,15 +88,15 @@ public func AnimationTransitionDirectionToValue(direction: AnimationTransitionDi
extension Motion {
/**
Creates a CATransition animation.
- Parameter type: An AnimationTransition.
- Parameter direction: An optional AnimationTransitionDirection.
- Parameter type: An TransitionMotion.
- Parameter direction: An optional TransitionMotionDirection.
- Parameter duration: An optional duration time.
- Returns: A CATransition.
*/
public static func transition(type: AnimationTransition, direction: AnimationTransitionDirection = .default, duration: CFTimeInterval? = nil) -> CATransition {
public static func transition(type: TransitionMotion, direction: TransitionMotionDirection = .default, duration: CFTimeInterval? = nil) -> CATransition {
let animation = CATransition()
animation.type = AnimationTransitionToValue(transition: type)
animation.subtype = AnimationTransitionDirectionToValue(direction: direction)
animation.type = TransitionMotionToValue(transition: type)
animation.subtype = TransitionMotionDirectionToValue(direction: direction)
if let v = duration {
animation.duration = v
......
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