Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Motion
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Motion
Commits
4a1008d8
Unverified
Commit
4a1008d8
authored
Jul 11, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed enum CAMediaTimingFunctionType
parent
b969bc18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
67 deletions
+8
-67
Motion.xcodeproj/project.pbxproj
+0
-0
Sources/Animator/MotionCoreAnimationViewContext.swift
+1
-1
Sources/Extensions/Motion+CAMediaTimingFunction.swift
+0
-41
Sources/Motion.swift
+6
-6
Sources/MotionAnimation.swift
+0
-9
Sources/MotionAnimationState.swift
+1
-1
Sources/MotionTransition.swift
+0
-9
No files found.
Motion.xcodeproj/project.pbxproj
View file @
4a1008d8
This diff is collapsed.
Click to expand it.
Sources/Animator/MotionCoreAnimationViewContext.swift
View file @
4a1008d8
...
...
@@ -33,7 +33,7 @@ internal class MotionCoreAnimationViewContext: MotionAnimatorViewContext {
fileprivate
var
transitionStates
=
[
String
:
(
Any
?,
Any
?)]()
/// A reference to the animation timing function.
fileprivate
var
timingFunction
=
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
.
standard
)
fileprivate
var
timingFunction
=
CAMediaTimingFunction
.
standard
/// Layer which holds the content.
fileprivate
var
contentLayer
:
CALayer
?
{
...
...
Sources/Extensions/Motion+CAMediaTimingFunction.swift
View file @
4a1008d8
...
...
@@ -28,18 +28,6 @@
import
UIKit
public
enum
CAMediaTimingFunctionType
{
case
linear
case
easeIn
case
easeOut
case
easeInOut
case
standard
case
deceleration
case
acceleration
case
sharp
case
easeOutBack
}
public
extension
CAMediaTimingFunction
{
// default
static
let
linear
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionLinear
)
...
...
@@ -56,32 +44,3 @@ public extension CAMediaTimingFunction {
// easing.net
static
let
easeOutBack
=
CAMediaTimingFunction
(
controlPoints
:
0.175
,
0.885
,
0.32
,
1.75
)
}
public
extension
CAMediaTimingFunction
{
/**
Converts a CAMediaTimingFunctionType to a CAMediaTimingFunction value.
- Parameter mediaTimingFunctionType: A CAMediaTimingFunctionType.
*/
static
func
from
(
mediaTimingFunctionType
:
CAMediaTimingFunctionType
)
->
CAMediaTimingFunction
{
switch
mediaTimingFunctionType
{
case
.
linear
:
return
.
linear
case
.
easeIn
:
return
.
easeIn
case
.
easeOut
:
return
.
easeOut
case
.
easeInOut
:
return
.
easeInOut
case
.
standard
:
return
.
standard
case
.
deceleration
:
return
.
deceleration
case
.
acceleration
:
return
.
acceleration
case
.
sharp
:
return
.
sharp
case
.
easeOutBack
:
return
.
easeOutBack
}
}
}
Sources/Motion.swift
View file @
4a1008d8
...
...
@@ -820,15 +820,15 @@ extension Motion {
Runs an animation with a specified duration.
- Parameter duration: An animation duration time.
- Parameter animations: An animation block.
- Parameter
mediaTimingFunctionType: An CAMediaTimingFunctionType value
.
- Parameter
timingFunction: A CAMediaTimingFunction
.
- Parameter completion: A completion block that is executed once
the animations have completed.
*/
public
class
func
animate
(
duration
:
CFTimeInterval
,
mediaTimingFunctionType
:
CAMediaTimingFunctionType
=
.
easeInOut
,
animations
:
(()
->
Void
),
completion
:
(()
->
Void
)?
=
nil
)
{
public
class
func
animate
(
duration
:
CFTimeInterval
,
timingFunction
:
CAMediaTimingFunction
=
.
easeInOut
,
animations
:
(()
->
Void
),
completion
:
(()
->
Void
)?
=
nil
)
{
CATransaction
.
begin
()
CATransaction
.
setAnimationDuration
(
duration
)
CATransaction
.
setCompletionBlock
(
completion
)
CATransaction
.
setAnimationTimingFunction
(
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
mediaTimingFunctionType
)
)
CATransaction
.
setAnimationTimingFunction
(
timingFunction
)
animations
()
CATransaction
.
commit
()
}
...
...
@@ -836,17 +836,17 @@ extension Motion {
/**
Creates a CAAnimationGroup.
- Parameter animations: An Array of CAAnimation objects.
- Parameter
mediaTimingFunctionType: An CAMediaTimingFunctionType value
.
- Parameter
timingFunction: A CAMediaTimingFunction
.
- Parameter duration: An animation duration time for the group.
- Returns: A CAAnimationGroup.
*/
public
class
func
animate
(
group
animations
:
[
CAAnimation
],
mediaTimingFunctionType
:
CAMediaTimingFunctionType
=
.
easeInOut
,
duration
:
CFTimeInterval
=
0.5
)
->
CAAnimationGroup
{
public
class
func
animate
(
group
animations
:
[
CAAnimation
],
timingFunction
:
CAMediaTimingFunction
=
.
easeInOut
,
duration
:
CFTimeInterval
=
0.5
)
->
CAAnimationGroup
{
let
group
=
CAAnimationGroup
()
group
.
fillMode
=
MotionAnimationFillModeToValue
(
mode
:
.
both
)
group
.
isRemovedOnCompletion
=
false
group
.
animations
=
animations
group
.
duration
=
duration
group
.
timingFunction
=
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
mediaTimingFunctionType
)
group
.
timingFunction
=
timingFunction
return
group
}
}
Sources/MotionAnimation.swift
View file @
4a1008d8
...
...
@@ -380,15 +380,6 @@ public extension MotionAnimation {
}
/**
Sets the view's timing function for the animation.
- Parameter type: A CAMediaTimingFunctionType.
- Returns: A MotionAnimation.
*/
static
func
timingFunction
(
type
:
CAMediaTimingFunctionType
)
->
MotionAnimation
{
return
.
timingFunction
(
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
type
))
}
/**
Available in iOS 9+, animates a view using the spring API,
given a stiffness and damping.
- Parameter stiffness: A CGFlloat.
...
...
Sources/MotionAnimationState.swift
View file @
4a1008d8
...
...
@@ -84,7 +84,7 @@ public struct MotionAnimationState {
public
var
duration
:
TimeInterval
=
0.35
/// The timing function value of the animation.
public
var
timingFunction
=
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
.
easeInOut
)
public
var
timingFunction
=
CAMediaTimingFunction
.
easeInOut
/// Custom target states.
public
var
custom
:
[
String
:
Any
]?
...
...
Sources/MotionTransition.swift
View file @
4a1008d8
...
...
@@ -395,15 +395,6 @@ public extension MotionTransition {
}
/**
Sets the view's timing function for the transition.
- Parameter type: A CAMediaTimingFunctionType.
- Returns: A MotionAnimation.
*/
static
func
timingFunction
(
type
:
CAMediaTimingFunctionType
)
->
MotionTransition
{
return
.
timingFunction
(
CAMediaTimingFunction
.
from
(
mediaTimingFunctionType
:
type
))
}
/**
Available in iOS 9+, animates a view using the spring API,
given a stiffness and damping.
- Parameter stiffness: A CGFlloat.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment