Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
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
Material
Commits
c96c6fd8
Commit
c96c6fd8
authored
Oct 25, 2016
by
shoheiyokoyama
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
define converts method for CAMediaTimingFunction
parent
75849afb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
19 deletions
+48
-19
Sources/iOS/Animation.swift
+31
-2
Sources/iOS/BasicAnimation.swift
+17
-17
No files found.
Sources/iOS/Animation.swift
View file @
c96c6fd8
...
...
@@ -55,6 +55,35 @@ public func AnimationFillModeToValue(mode: AnimationFillMode) -> String {
}
}
@objc(AnimationTimingFunction)
public
enum
AnimationTimingFunction
:
Int
{
case
liner
case
easeIn
case
easeOut
case
easeInEaseOut
case
systemDefault
}
/**
Converts the AnimationTimingFunction enum value to a corresponding CAMediaTimingFunction.
- Parameter function: An AnimationTimingFunction enum value.
*/
public
func
AnimationTimingFunctionToValue
(
function
:
AnimationTimingFunction
)
->
CAMediaTimingFunction
{
switch
function
{
case
.
liner
:
return
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionLinear
)
case
.
easeIn
:
return
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionEaseIn
)
case
.
easeOut
:
return
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionEaseOut
)
case
.
easeInEaseOut
:
return
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionEaseInEaseOut
)
case
.
systemDefault
:
return
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionDefault
)
}
}
public
typealias
AnimationDelayCancelBlock
=
(
Bool
)
->
Void
public
struct
Animation
{
...
...
@@ -106,7 +135,7 @@ public struct Animation {
CATransaction
.
begin
()
CATransaction
.
setAnimationDuration
(
duration
)
CATransaction
.
setCompletionBlock
(
completion
)
CATransaction
.
setAnimationTimingFunction
(
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
))
CATransaction
.
setAnimationTimingFunction
(
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
))
animations
()
CATransaction
.
commit
()
}
...
...
@@ -120,7 +149,7 @@ public struct Animation {
group
.
isRemovedOnCompletion
=
false
group
.
animations
=
animations
group
.
duration
=
duration
group
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
group
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
return
group
}
...
...
Sources/iOS/BasicAnimation.swift
View file @
c96c6fd8
...
...
@@ -39,7 +39,7 @@ extension Animation {
animation
.
toValue
=
color
.
cgColor
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -54,7 +54,7 @@ extension Animation {
animation
.
toValue
=
radius
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -69,7 +69,7 @@ extension Animation {
animation
.
toValue
=
NSValue
(
caTransform3D
:
transform
)
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -88,7 +88,7 @@ extension Animation {
}
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -107,7 +107,7 @@ extension Animation {
}
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -126,7 +126,7 @@ extension Animation {
}
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -145,7 +145,7 @@ extension Animation {
}
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -160,7 +160,7 @@ extension Animation {
animation
.
toValue
=
scale
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -175,7 +175,7 @@ extension Animation {
animation
.
toValue
=
scale
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -190,7 +190,7 @@ extension Animation {
animation
.
toValue
=
scale
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -205,7 +205,7 @@ extension Animation {
animation
.
toValue
=
scale
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -220,7 +220,7 @@ extension Animation {
animation
.
toValue
=
NSValue
(
cgSize
:
translation
)
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -235,7 +235,7 @@ extension Animation {
animation
.
toValue
=
translation
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -250,7 +250,7 @@ extension Animation {
animation
.
toValue
=
translation
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -265,7 +265,7 @@ extension Animation {
animation
.
toValue
=
translation
as
NSNumber
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -280,7 +280,7 @@ extension Animation {
animation
.
toValue
=
NSValue
(
cgPoint
:
point
)
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionE
aseInEaseOut
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
e
aseInEaseOut
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
@@ -292,7 +292,7 @@ extension Animation {
animation
.
toValue
=
path
animation
.
fillMode
=
AnimationFillModeToValue
(
mode
:
.
forwards
)
animation
.
isRemovedOnCompletion
=
false
animation
.
timingFunction
=
CAMediaTimingFunction
(
name
:
kCAMediaTimingFunctionLinea
r
)
animation
.
timingFunction
=
AnimationTimingFunctionToValue
(
function
:
.
line
r
)
if
let
v
=
duration
{
animation
.
duration
=
v
}
...
...
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