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
24dc7615
Unverified
Commit
24dc7615
authored
Jun 27, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: updated Motion framework and API internally in Material
parent
9b77130d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Frameworks/Motion
+1
-1
Sources/iOS/Material+CALayer.swift
+1
-1
Sources/iOS/PulseAnimation.swift
+4
-4
No files found.
Motion
@
67550d30
Subproject commit 6
1eb033d2629a1a65bc5a8123bc3cbd527387eb2
Subproject commit 6
7550d30d5162f59d958c6866e99a91bab158197
Sources/iOS/Material+CALayer.swift
View file @
24dc7615
...
...
@@ -285,7 +285,7 @@ extension CALayer {
}
else
if
nil
==
shadowPath
{
shadowPath
=
UIBezierPath
(
roundedRect
:
bounds
,
cornerRadius
:
cornerRadius
)
.
cgPath
}
else
{
motion
(
.
shadowPath
(
UIBezierPath
(
roundedRect
:
bounds
,
cornerRadius
:
cornerRadius
)
.
cgPath
))
animate
(
.
shadowPath
(
UIBezierPath
(
roundedRect
:
bounds
,
cornerRadius
:
cornerRadius
)
.
cgPath
))
}
}
}
Sources/iOS/PulseAnimation.swift
View file @
24dc7615
...
...
@@ -149,13 +149,13 @@ public struct Pulse {
switch
animation
{
case
.
centerWithBacking
,
.
backing
,
.
pointWithBacking
:
bLayer
.
motion
(
.
backgroundColor
(
color
.
withAlphaComponent
(
opacity
/
2
)),
.
duration
(
duration
))
bLayer
.
animate
(
.
backgroundColor
(
color
.
withAlphaComponent
(
opacity
/
2
)),
.
duration
(
duration
))
default
:
break
}
switch
animation
{
case
.
center
,
.
centerWithBacking
,
.
centerRadialBeyondBounds
,
.
radialBeyondBounds
,
.
point
,
.
pointWithBacking
:
pLayer
.
motion
(
.
scale
(
1
),
.
duration
(
duration
))
pLayer
.
animate
(
.
scale
(
1
),
.
duration
(
duration
))
default
:
break
}
...
...
@@ -183,13 +183,13 @@ public struct Pulse {
switch
animation
{
case
.
centerWithBacking
,
.
backing
,
.
pointWithBacking
:
bLayer
.
motion
(
.
backgroundColor
(
color
.
withAlphaComponent
(
0
)),
.
duration
(
duration
))
bLayer
.
animate
(
.
backgroundColor
(
color
.
withAlphaComponent
(
0
)),
.
duration
(
duration
))
default
:
break
}
switch
animation
{
case
.
center
,
.
centerWithBacking
,
.
centerRadialBeyondBounds
,
.
radialBeyondBounds
,
.
point
,
.
pointWithBacking
:
pLayer
.
motion
(
.
scale
(
.
center
==
animation
?
1
:
1.325
),
.
backgroundColor
(
color
.
withAlphaComponent
(
0
)))
pLayer
.
animate
(
.
scale
(
.
center
==
animation
?
1
:
1.325
),
.
backgroundColor
(
color
.
withAlphaComponent
(
0
)))
default
:
break
}
...
...
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