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
175f214b
Commit
175f214b
authored
Feb 17, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated ***Preset properties
parent
030d3fb7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
527 additions
and
112 deletions
+527
-112
Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedViewController.swift
+2
-2
Sources/MaterialButton.swift
+11
-15
Sources/MaterialLayer.swift
+25
-8
Sources/MaterialTableViewCell.swift
+456
-51
Sources/MaterialView.swift
+11
-12
Sources/TextField.swift
+11
-12
Sources/TextView.swift
+11
-12
No files found.
Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedViewController.swift
View file @
175f214b
...
...
@@ -78,7 +78,7 @@ class FeedViewController: UIViewController {
/// Prepares the tableView.
private
func
prepareTableView
()
{
tableView
.
registerClass
(
UITableViewCell
.
self
,
forCellReuseIdentifier
:
"
Cell"
)
tableView
.
registerClass
(
MaterialTableViewCell
.
self
,
forCellReuseIdentifier
:
"MaterialTableView
Cell"
)
tableView
.
dataSource
=
self
tableView
.
delegate
=
self
...
...
@@ -103,7 +103,7 @@ extension FeedViewController: UITableViewDataSource {
/// Prepares the cells within the tableView.
func
tableView
(
tableView
:
UITableView
,
cellForRowAtIndexPath
indexPath
:
NSIndexPath
)
->
UITableViewCell
{
let
cell
:
UITableViewCell
=
UITableViewCell
(
style
:
.
Subtitle
,
reuseIdentifier
:
"
Cell"
)
let
cell
:
MaterialTableViewCell
=
MaterialTableViewCell
(
style
:
.
Subtitle
,
reuseIdentifier
:
"MaterialTableView
Cell"
)
let
item
:
Item
=
items
[
indexPath
.
row
]
cell
.
selectionStyle
=
.
None
...
...
Sources/MaterialButton.swift
View file @
175f214b
...
...
@@ -174,7 +174,7 @@ public class MaterialButton : UIButton {
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
{
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
...
...
@@ -188,7 +188,7 @@ public class MaterialButton : UIButton {
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
{
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
...
...
@@ -211,7 +211,7 @@ public class MaterialButton : UIButton {
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
{
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
...
...
@@ -223,8 +223,15 @@ public class MaterialButton : UIButton {
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/// A property that accesses the layer.borderWith.
public
var
borderWidth
:
CGFloat
{
public
var
borderWidth
:
CGFloat
=
0
{
didSet
{
layer
.
borderWidth
=
borderWidth
}
...
...
@@ -270,10 +277,6 @@ public class MaterialButton : UIButton {
- Parameter aDecoder: A NSCoder instance.
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
contentEdgeInsetsPreset
=
.
None
super
.
init
(
coder
:
aDecoder
)
prepareView
()
...
...
@@ -286,10 +289,6 @@ public class MaterialButton : UIButton {
- Parameter frame: A CGRect instance.
*/
public
override
init
(
frame
:
CGRect
)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
contentEdgeInsetsPreset
=
.
None
super
.
init
(
frame
:
frame
)
prepareView
()
...
...
@@ -415,10 +414,7 @@ public class MaterialButton : UIButton {
*/
public
func
prepareView
()
{
prepareVisualLayer
()
shadowColor
=
MaterialColor
.
black
borderColor
=
MaterialColor
.
black
pulseColor
=
MaterialColor
.
white
pulseColorOpacity
=
0.25
}
/// Prepares the visualLayer property.
...
...
Sources/MaterialLayer.swift
View file @
175f214b
...
...
@@ -159,7 +159,7 @@ public class MaterialLayer : CAShapeLayer {
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
{
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
...
...
@@ -173,6 +173,22 @@ public class MaterialLayer : CAShapeLayer {
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
if
.
Circle
==
shape
{
shape
=
.
None
}
}
}
}
/**
A property that sets the cornerRadius of the backing layer. If the shape
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
override
var
cornerRadius
:
CGFloat
{
didSet
{
if
.
Circle
==
shape
{
...
...
@@ -186,7 +202,7 @@ public class MaterialLayer : CAShapeLayer {
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
{
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
...
...
@@ -198,13 +214,18 @@ public class MaterialLayer : CAShapeLayer {
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
shape
=
.
None
depth
=
.
None
super
.
init
(
coder
:
aDecoder
)
prepareVisualLayer
()
}
...
...
@@ -215,16 +236,12 @@ public class MaterialLayer : CAShapeLayer {
- Parameter layer: AnyObject.
*/
public
override
init
(
layer
:
AnyObject
)
{
shape
=
.
None
depth
=
.
None
super
.
init
()
prepareVisualLayer
()
}
/// A convenience initializer.
public
override
init
()
{
shape
=
.
None
depth
=
.
None
super
.
init
()
prepareVisualLayer
()
}
...
...
Sources/MaterialTableViewCell.swift
View file @
175f214b
...
...
@@ -31,55 +31,460 @@
import
UIKit
public
class
MaterialTableViewCell
:
UITableViewCell
{
public
lazy
var
pulseView
:
MaterialPulseView
=
MaterialPulseView
()
/**
:name: initWithCoder:
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
super
.
init
(
coder
:
aDecoder
)
}
/**
:name: initWithStyle:
*/
public
override
init
(
style
:
UITableViewCellStyle
,
reuseIdentifier
:
String
!
)
{
super
.
init
(
style
:
style
,
reuseIdentifier
:
reuseIdentifier
)
prepare
()
preparePulseView
()
}
/**
:name: layoutSubviews
*/
public
override
func
layoutSubviews
()
{
super
.
layoutSubviews
()
layoutPulseView
()
}
/**
:name: prepare
*/
public
func
prepare
()
{
selectionStyle
=
.
None
imageView
?
.
userInteractionEnabled
=
false
textLabel
?
.
userInteractionEnabled
=
false
detailTextLabel
?
.
userInteractionEnabled
=
false
}
/**
:name: preparePulseView
*/
public
func
preparePulseView
()
{
pulseView
.
pulseColor
=
MaterialColor
.
blue
.
accent3
contentView
.
insertSubview
(
pulseView
,
atIndex
:
0
)
}
/**
:name: layoutPulseView
*/
public
func
layoutPulseView
()
{
pulseView
.
frame
=
contentView
.
bounds
}
/**
A CAShapeLayer used to manage elements that would be affected by
the clipToBounds property of the backing layer. For example, this
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
*/
public
private(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
A base delegate reference used when subclassing MaterialView.
*/
public
weak
var
delegate
:
MaterialDelegate
?
/// Sets whether the scaling animation should be used.
public
lazy
var
pulseScale
:
Bool
=
true
/// The opcaity value for the pulse animation.
public
var
pulseColorOpacity
:
CGFloat
=
0.25
/// The color of the pulse effect.
public
var
pulseColor
:
UIColor
?
/**
This property is the same as clipsToBounds. It crops any of the view's
contents from bleeding past the view's frame. If an image is set using
the image property, then this value does not need to be set, since the
visualLayer's maskToBounds is set to true by default.
*/
public
var
masksToBounds
:
Bool
{
get
{
return
layer
.
masksToBounds
}
set
(
value
)
{
layer
.
masksToBounds
=
value
}
}
/// A property that accesses the backing layer's backgroundColor.
public
override
var
backgroundColor
:
UIColor
?
{
didSet
{
layer
.
backgroundColor
=
backgroundColor
?
.
CGColor
}
}
/// A property that accesses the layer.frame.origin.x property.
public
var
x
:
CGFloat
{
get
{
return
layer
.
frame
.
origin
.
x
}
set
(
value
)
{
layer
.
frame
.
origin
.
x
=
value
}
}
/// A property that accesses the layer.frame.origin.y property.
public
var
y
:
CGFloat
{
get
{
return
layer
.
frame
.
origin
.
y
}
set
(
value
)
{
layer
.
frame
.
origin
.
y
=
value
}
}
/**
A property that accesses the layer.frame.origin.width property.
When setting this property in conjunction with the shape property having a
value that is not .None, the height will be adjusted to maintain the correct
shape.
*/
public
var
width
:
CGFloat
{
get
{
return
layer
.
frame
.
size
.
width
}
set
(
value
)
{
layer
.
frame
.
size
.
width
=
value
if
.
None
!=
shape
{
layer
.
frame
.
size
.
height
=
value
}
}
}
/**
A property that accesses the layer.frame.origin.height property.
When setting this property in conjunction with the shape property having a
value that is not .None, the width will be adjusted to maintain the correct
shape.
*/
public
var
height
:
CGFloat
{
get
{
return
layer
.
frame
.
size
.
height
}
set
(
value
)
{
layer
.
frame
.
size
.
height
=
value
if
.
None
!=
shape
{
layer
.
frame
.
size
.
width
=
value
}
}
}
/// A property that accesses the backing layer's shadowColor.
public
var
shadowColor
:
UIColor
?
{
didSet
{
layer
.
shadowColor
=
shadowColor
?
.
CGColor
}
}
/// A property that accesses the backing layer's shadowOffset.
public
var
shadowOffset
:
CGSize
{
get
{
return
layer
.
shadowOffset
}
set
(
value
)
{
layer
.
shadowOffset
=
value
}
}
/// A property that accesses the backing layer's shadowOpacity.
public
var
shadowOpacity
:
Float
{
get
{
return
layer
.
shadowOpacity
}
set
(
value
)
{
layer
.
shadowOpacity
=
value
}
}
/// A property that accesses the backing layer's shadowRadius.
public
var
shadowRadius
:
CGFloat
{
get
{
return
layer
.
shadowRadius
}
set
(
value
)
{
layer
.
shadowRadius
=
value
}
}
/**
A property that sets the shadowOffset, shadowOpacity, and shadowRadius
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
shadowOpacity
=
value
.
opacity
shadowRadius
=
value
.
radius
}
}
/**
A property that sets the cornerRadius of the backing layer. If the shape
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
if
.
Circle
==
shape
{
shape
=
.
None
}
}
}
}
/// A property that accesses the layer.cornerRadius.
public
var
cornerRadius
:
CGFloat
=
0
{
didSet
{
layer
.
cornerRadius
=
cornerRadius
}
}
/**
A property that manages the overall shape for the object. If either the
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
frame
.
size
.
width
=
height
}
else
{
frame
.
size
.
height
=
width
}
}
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/// A property that accesses the layer.borderWith.
public
var
borderWidth
:
CGFloat
=
0
{
didSet
{
layer
.
borderWidth
=
borderWidth
}
}
/// A property that accesses the layer.borderColor property.
public
var
borderColor
:
UIColor
?
{
didSet
{
layer
.
borderColor
=
borderColor
?
.
CGColor
}
}
/// A property that accesses the layer.position property.
public
var
position
:
CGPoint
{
get
{
return
layer
.
position
}
set
(
value
)
{
layer
.
position
=
value
}
}
/// A property that accesses the layer.zPosition property.
public
var
zPosition
:
CGFloat
{
get
{
return
layer
.
zPosition
}
set
(
value
)
{
layer
.
zPosition
=
value
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
super
.
init
(
coder
:
aDecoder
)
prepareView
()
}
/**
:name: initWithStyle:
*/
public
override
init
(
style
:
UITableViewCellStyle
,
reuseIdentifier
:
String
!
)
{
super
.
init
(
style
:
style
,
reuseIdentifier
:
reuseIdentifier
)
prepareView
()
}
/// Overriding the layout callback for sublayers.
public
override
func
layoutSublayersOfLayer
(
layer
:
CALayer
)
{
super
.
layoutSublayersOfLayer
(
layer
)
if
self
.
layer
==
layer
{
layoutShape
()
layoutVisualLayer
()
}
}
/**
A method that accepts CAAnimation objects and executes them on the
view's backing layer.
- Parameter animation: A CAAnimation instance.
*/
public
func
animate
(
animation
:
CAAnimation
)
{
animation
.
delegate
=
self
if
let
a
:
CABasicAnimation
=
animation
as?
CABasicAnimation
{
a
.
fromValue
=
(
nil
==
layer
.
presentationLayer
()
?
layer
:
layer
.
presentationLayer
()
as!
CALayer
)
.
valueForKeyPath
(
a
.
keyPath
!
)
}
if
let
a
:
CAPropertyAnimation
=
animation
as?
CAPropertyAnimation
{
layer
.
addAnimation
(
a
,
forKey
:
a
.
keyPath
!
)
}
else
if
let
a
:
CAAnimationGroup
=
animation
as?
CAAnimationGroup
{
layer
.
addAnimation
(
a
,
forKey
:
nil
)
}
else
if
let
a
:
CATransition
=
animation
as?
CATransition
{
layer
.
addAnimation
(
a
,
forKey
:
kCATransition
)
}
}
/**
A delegation method that is executed when the backing layer starts
running an animation.
- Parameter anim: The currently running CAAnimation instance.
*/
public
override
func
animationDidStart
(
anim
:
CAAnimation
)
{
(
delegate
as?
MaterialAnimationDelegate
)?
.
materialAnimationDidStart
?(
anim
)
}
/**
A delegation method that is executed when the backing layer stops
running an animation.
- Parameter anim: The CAAnimation instance that stopped running.
- Parameter flag: A boolean that indicates if the animation stopped
because it was completed or interrupted. True if completed, false
if interrupted.
*/
public
override
func
animationDidStop
(
anim
:
CAAnimation
,
finished
flag
:
Bool
)
{
if
anim
is
CAPropertyAnimation
{
(
delegate
as?
MaterialAnimationDelegate
)?
.
materialAnimationDidStop
?(
anim
,
finished
:
flag
)
}
else
if
let
a
:
CAAnimationGroup
=
anim
as?
CAAnimationGroup
{
for
x
in
a
.
animations
!
{
animationDidStop
(
x
,
finished
:
true
)
}
}
layoutVisualLayer
()
}
/**
A delegation method that is executed when the view has began a
touch event.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public
override
func
touchesBegan
(
touches
:
Set
<
UITouch
>
,
withEvent
event
:
UIEvent
?)
{
super
.
touchesBegan
(
touches
,
withEvent
:
event
)
pulseAnimation
(
layer
.
convertPoint
(
touches
.
first
!.
locationInView
(
self
),
fromLayer
:
layer
))
}
/**
A delegation method that is executed when the view touch event has
ended.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public
override
func
touchesEnded
(
touches
:
Set
<
UITouch
>
,
withEvent
event
:
UIEvent
?)
{
super
.
touchesEnded
(
touches
,
withEvent
:
event
)
shrinkAnimation
()
}
/**
A delegation method that is executed when the view touch event has
been cancelled.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public
override
func
touchesCancelled
(
touches
:
Set
<
UITouch
>
?,
withEvent
event
:
UIEvent
?)
{
super
.
touchesCancelled
(
touches
,
withEvent
:
event
)
shrinkAnimation
()
}
/**
Triggers the pulse animation.
- Parameter point: A Optional point to pulse from, otherwise pulses
from the center.
*/
public
func
pulse
(
var
point
:
CGPoint
?
=
nil
)
{
if
nil
==
point
{
point
=
CGPointMake
(
CGFloat
(
width
/
2
),
CGFloat
(
height
/
2
))
}
if
let
v
:
CFTimeInterval
=
pulseAnimation
(
point
!
)
{
MaterialAnimation
.
delay
(
v
)
{
[
weak
self
]
in
self
?
.
shrinkAnimation
()
}
}
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepareView method
to initialize property values and other setup operations.
The super.prepareView method should always be called immediately
when subclassing.
*/
public
func
prepareView
()
{
prepareVisualLayer
()
selectionStyle
=
.
None
imageView
?
.
userInteractionEnabled
=
false
textLabel
?
.
userInteractionEnabled
=
false
detailTextLabel
?
.
userInteractionEnabled
=
false
}
/// Prepares the visualLayer property.
internal
func
prepareVisualLayer
()
{
visualLayer
.
zPosition
=
0
visualLayer
.
masksToBounds
=
true
layer
.
addSublayer
(
visualLayer
)
}
/// Manages the layout for the visualLayer property.
internal
func
layoutVisualLayer
()
{
visualLayer
.
frame
=
bounds
visualLayer
.
position
=
CGPointMake
(
width
/
2
,
height
/
2
)
visualLayer
.
cornerRadius
=
layer
.
cornerRadius
}
/// Manages the layout for the shape of the view instance.
internal
func
layoutShape
()
{
if
.
Circle
==
shape
{
layer
.
cornerRadius
=
width
/
2
}
}
/**
Triggers the pulse animation.
- Parameter point: A point to pulse from.
- Returns: A Ooptional CFTimeInternal if the point exists within
the view. The time internal represents the animation time.
*/
internal
func
pulseAnimation
(
point
:
CGPoint
)
->
CFTimeInterval
?
{
if
true
==
layer
.
containsPoint
(
point
)
{
let
r
:
CGFloat
=
(
width
<
height
?
height
:
width
)
/
2
let
f
:
CGFloat
=
3
let
v
:
CGFloat
=
r
/
f
let
d
:
CGFloat
=
2
*
f
let
s
:
CGFloat
=
1.05
var
t
:
CFTimeInterval
=
CFTimeInterval
(
1.5
*
width
/
UIScreen
.
mainScreen
()
.
bounds
.
width
)
if
0.55
<
t
||
0.25
>
t
{
t
=
0.55
}
t
/=
1.3
if
nil
!=
pulseColor
&&
0
<
pulseColorOpacity
{
let
pulseLayer
:
CAShapeLayer
=
CAShapeLayer
()
pulseLayer
.
hidden
=
true
pulseLayer
.
zPosition
=
1
pulseLayer
.
backgroundColor
=
pulseColor
?
.
colorWithAlphaComponent
(
pulseColorOpacity
)
.
CGColor
visualLayer
.
addSublayer
(
pulseLayer
)
MaterialAnimation
.
animationDisabled
{
pulseLayer
.
bounds
=
CGRectMake
(
0
,
0
,
v
,
v
)
pulseLayer
.
position
=
point
pulseLayer
.
cornerRadius
=
r
/
d
pulseLayer
.
hidden
=
false
}
pulseLayer
.
addAnimation
(
MaterialAnimation
.
scale
(
3
*
d
,
duration
:
t
),
forKey
:
nil
)
MaterialAnimation
.
delay
(
t
)
{
[
weak
self
]
in
if
nil
!=
self
&&
nil
!=
self
!.
pulseColor
&&
0
<
self
!.
pulseColorOpacity
{
MaterialAnimation
.
animateWithDuration
(
t
,
animations
:
{
pulseLayer
.
hidden
=
true
})
{
pulseLayer
.
removeFromSuperlayer
()
}
}
}
}
if
pulseScale
{
layer
.
addAnimation
(
MaterialAnimation
.
scale
(
s
,
duration
:
t
),
forKey
:
nil
)
return
t
}
}
return
nil
}
/// Executes the shrink animation for the pulse effect.
internal
func
shrinkAnimation
()
{
if
pulseScale
{
var
t
:
CFTimeInterval
=
CFTimeInterval
(
1.5
*
width
/
UIScreen
.
mainScreen
()
.
bounds
.
width
)
if
0.55
<
t
||
0.25
>
t
{
t
=
0.55
}
t
/=
1.3
layer
.
addAnimation
(
MaterialAnimation
.
scale
(
1
,
duration
:
t
),
forKey
:
nil
)
}
}
}
Sources/MaterialView.swift
View file @
175f214b
...
...
@@ -217,7 +217,7 @@ public class MaterialView : UIView {
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
{
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
...
...
@@ -231,7 +231,7 @@ public class MaterialView : UIView {
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
{
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
...
...
@@ -254,7 +254,7 @@ public class MaterialView : UIView {
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
{
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
...
...
@@ -266,8 +266,15 @@ public class MaterialView : UIView {
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/// A property that accesses the layer.borderWith.
public
var
borderWidth
:
CGFloat
{
public
var
borderWidth
:
CGFloat
=
0
{
didSet
{
layer
.
borderWidth
=
borderWidth
}
...
...
@@ -309,10 +316,6 @@ public class MaterialView : UIView {
contentsCenter
=
CGRectMake
(
0
,
0
,
1
,
1
)
contentsScale
=
UIScreen
.
mainScreen
()
.
scale
contentsGravity
=
.
ResizeAspectFill
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
coder
:
aDecoder
)
prepareView
()
}
...
...
@@ -328,10 +331,6 @@ public class MaterialView : UIView {
contentsCenter
=
CGRectMake
(
0
,
0
,
1
,
1
)
contentsScale
=
UIScreen
.
mainScreen
()
.
scale
contentsGravity
=
.
ResizeAspectFill
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
frame
:
frame
)
prepareView
()
}
...
...
Sources/TextField.swift
View file @
175f214b
...
...
@@ -153,7 +153,7 @@ public class TextField : UITextField {
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
{
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
...
...
@@ -167,7 +167,7 @@ public class TextField : UITextField {
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
{
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
...
...
@@ -190,7 +190,7 @@ public class TextField : UITextField {
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
{
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
...
...
@@ -202,8 +202,15 @@ public class TextField : UITextField {
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/// A property that accesses the layer.borderWith.
public
var
borderWidth
:
CGFloat
{
public
var
borderWidth
:
CGFloat
=
0
{
didSet
{
layer
.
borderWidth
=
borderWidth
}
...
...
@@ -339,10 +346,6 @@ public class TextField : UITextField {
- Parameter aDecoder: A NSCoder instance.
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
coder
:
aDecoder
)
prepareView
()
}
...
...
@@ -354,10 +357,6 @@ public class TextField : UITextField {
- Parameter frame: A CGRect instance.
*/
public
override
init
(
frame
:
CGRect
)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
frame
:
frame
)
prepareView
()
}
...
...
Sources/TextView.swift
View file @
175f214b
...
...
@@ -155,7 +155,7 @@ public class TextView: UITextView {
for the backing layer. This is the preferred method of setting depth
in order to maintain consitency across UI objects.
*/
public
var
depth
:
MaterialDepth
{
public
var
depth
:
MaterialDepth
=
.
None
{
didSet
{
let
value
:
MaterialDepthType
=
MaterialDepthToValue
(
depth
)
shadowOffset
=
value
.
offset
...
...
@@ -169,7 +169,7 @@ public class TextView: UITextView {
property has a value of .Circle when the cornerRadius is set, it will
become .None, as it no longer maintains its circle shape.
*/
public
var
cornerRadiusPreset
:
MaterialRadius
{
public
var
cornerRadiusPreset
:
MaterialRadius
=
.
None
{
didSet
{
if
let
v
:
MaterialRadius
=
cornerRadiusPreset
{
cornerRadius
=
MaterialRadiusToValue
(
v
)
...
...
@@ -192,7 +192,7 @@ public class TextView: UITextView {
width or height property is set, the other will be automatically adjusted
to maintain the shape of the object.
*/
public
var
shape
:
MaterialShape
{
public
var
shape
:
MaterialShape
=
.
None
{
didSet
{
if
.
None
!=
shape
{
if
width
<
height
{
...
...
@@ -204,8 +204,15 @@ public class TextView: UITextView {
}
}
/// A preset property to set the borderWidth.
public
var
borderWidthPreset
:
MaterialBorder
=
.
None
{
didSet
{
borderWidth
=
MaterialBorderToValue
(
borderWidthPreset
)
}
}
/// A property that accesses the layer.borderWith.
public
var
borderWidth
:
CGFloat
{
public
var
borderWidth
:
CGFloat
=
0
{
didSet
{
layer
.
borderWidth
=
borderWidth
}
...
...
@@ -308,10 +315,6 @@ public class TextView: UITextView {
- Parameter aDecoder: A NSCoder instance.
*/
public
required
init
?(
coder
aDecoder
:
NSCoder
)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
coder
:
aDecoder
)
prepareView
()
}
...
...
@@ -324,10 +327,6 @@ public class TextView: UITextView {
- Parameter textContainer: A NSTextContainer instance.
*/
public
override
init
(
frame
:
CGRect
,
textContainer
:
NSTextContainer
?)
{
depth
=
.
None
cornerRadiusPreset
=
.
None
shape
=
.
None
borderWidth
=
0
super
.
init
(
frame
:
frame
,
textContainer
:
textContainer
)
prepareView
()
}
...
...
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