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
2904209e
Commit
2904209e
authored
Sep 23, 2015
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: added ability to reloadView with autolayout constraints manually
parent
947a6214
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
140 additions
and
147 deletions
+140
-147
Source/BasicCardView.swift
+53
-54
Source/ImageCardView.swift
+57
-58
Source/MaterialCardView.swift
+0
-6
Source/NavigationBarView.swift
+30
-29
No files found.
Source/BasicCardView.swift
View file @
2904209e
...
@@ -39,7 +39,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -39,7 +39,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
titleLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -48,7 +48,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -48,7 +48,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
titleLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -67,7 +67,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -67,7 +67,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
titleLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -76,7 +76,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -76,7 +76,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
titleLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -95,7 +95,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -95,7 +95,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
detailLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -104,7 +104,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -104,7 +104,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
detailLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -123,7 +123,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -123,7 +123,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
detailLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -132,7 +132,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -132,7 +132,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
detailLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -151,7 +151,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -151,7 +151,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
public
var
buttonTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -160,7 +160,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -160,7 +160,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
public
var
buttonBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -179,7 +179,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -179,7 +179,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
public
var
buttonLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -188,7 +188,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -188,7 +188,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
public
var
buttonRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -198,7 +198,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -198,7 +198,7 @@ public class BasicCardView : MaterialCardView, Comparable {
public
var
shadow
:
Bool
=
true
{
public
var
shadow
:
Bool
=
true
{
didSet
{
didSet
{
false
==
shadow
?
removeShadow
()
:
prepareShadow
()
false
==
shadow
?
removeShadow
()
:
prepareShadow
()
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -207,7 +207,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -207,7 +207,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
maximumTitleLabelHeight
:
CGFloat
=
0
{
public
var
maximumTitleLabelHeight
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -242,7 +242,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -242,7 +242,7 @@ public class BasicCardView : MaterialCardView, Comparable {
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
=
nil
titleLabelContainer
=
nil
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -251,7 +251,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -251,7 +251,7 @@ public class BasicCardView : MaterialCardView, Comparable {
*/
*/
public
var
maximumDetailLabelHeight
:
CGFloat
=
0
{
public
var
maximumDetailLabelHeight
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -286,7 +286,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -286,7 +286,7 @@ public class BasicCardView : MaterialCardView, Comparable {
detailLabelContainer
?
.
removeFromSuperview
()
detailLabelContainer
?
.
removeFromSuperview
()
detailLabelContainer
=
nil
detailLabelContainer
=
nil
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -302,7 +302,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -302,7 +302,7 @@ public class BasicCardView : MaterialCardView, Comparable {
}
else
{
}
else
{
divider
?
.
removeFromSuperview
()
divider
?
.
removeFromSuperview
()
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -325,7 +325,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -325,7 +325,7 @@ public class BasicCardView : MaterialCardView, Comparable {
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
buttonsContainer
!
)
addSubview
(
buttonsContainer
!
)
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -343,7 +343,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -343,7 +343,7 @@ public class BasicCardView : MaterialCardView, Comparable {
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
buttonsContainer
!
)
addSubview
(
buttonsContainer
!
)
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -368,32 +368,21 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -368,32 +368,21 @@ public class BasicCardView : MaterialCardView, Comparable {
public
required
init
(
frame
:
CGRect
)
{
public
required
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
CGRectZero
)
super
.
init
(
frame
:
CGRectZero
)
}
}
//
/**
// :name: prepareProperties
:name: isEqual
//
*/
internal
func
prepareProperties
(
titleLabel
:
UILabel
?,
detailLabel
:
UILabel
?,
divider
:
UIView
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
public
override
func
isEqual
(
object
:
AnyObject
?)
->
Bool
{
self
.
titleLabel
=
titleLabel
if
let
rhs
=
object
as?
BasicCardView
{
self
.
detailLabel
=
detailLabel
return
tag
==
rhs
.
tag
self
.
divider
=
divider
}
self
.
leftButtons
=
leftButtons
return
false
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
internal
override
func
prepareView
()
{
super
.
prepareView
()
prepareShadow
()
backgroundColor
=
MaterialTheme
.
blueGrey
.
color
}
}
//
/**
// :name: prepareCard
:name: reloadView
//
*/
internal
override
func
prepareCard
()
{
public
func
reloadView
()
{
super
.
prepareCard
()
// clear all constraints
// clear all constraints
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
...
@@ -411,7 +400,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -411,7 +400,7 @@ public class BasicCardView : MaterialCardView, Comparable {
layoutConstraints
+=
Layout
.
constraint
(
"H:|[titleLabelContainer]|"
,
options
:
[],
metrics
:
nil
,
views
:
[
"titleLabelContainer"
:
titleLabelContainer
!
])
layoutConstraints
+=
Layout
.
constraint
(
"H:|[titleLabelContainer]|"
,
options
:
[],
metrics
:
nil
,
views
:
[
"titleLabelContainer"
:
titleLabelContainer
!
])
verticalFormat
+=
"[titleLabelContainer]"
verticalFormat
+=
"[titleLabelContainer]"
views
[
"titleLabelContainer"
]
=
titleLabelContainer
!
views
[
"titleLabelContainer"
]
=
titleLabelContainer
!
// common text
// common text
if
0
==
maximumTitleLabelHeight
{
if
0
==
maximumTitleLabelHeight
{
Layout
.
expandToParentWithPad
(
titleLabelContainer
!
,
child
:
titleLabel
!
,
top
:
titleLabelTopInset
,
left
:
titleLabelLeftInset
,
bottom
:
titleLabelBottomInset
,
right
:
titleLabelRightInset
)
Layout
.
expandToParentWithPad
(
titleLabelContainer
!
,
child
:
titleLabel
!
,
top
:
titleLabelTopInset
,
left
:
titleLabelLeftInset
,
bottom
:
titleLabelBottomInset
,
right
:
titleLabelRightInset
)
...
@@ -430,7 +419,7 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -430,7 +419,7 @@ public class BasicCardView : MaterialCardView, Comparable {
layoutConstraints
+=
Layout
.
constraint
(
"H:|[detailLabelContainer]|"
,
options
:
[],
metrics
:
nil
,
views
:
[
"detailLabelContainer"
:
detailLabelContainer
!
])
layoutConstraints
+=
Layout
.
constraint
(
"H:|[detailLabelContainer]|"
,
options
:
[],
metrics
:
nil
,
views
:
[
"detailLabelContainer"
:
detailLabelContainer
!
])
verticalFormat
+=
"[detailLabelContainer]"
verticalFormat
+=
"[detailLabelContainer]"
views
[
"detailLabelContainer"
]
=
detailLabelContainer
!
views
[
"detailLabelContainer"
]
=
detailLabelContainer
!
if
0
==
maximumDetailLabelHeight
{
if
0
==
maximumDetailLabelHeight
{
Layout
.
expandToParentWithPad
(
detailLabelContainer
!
,
child
:
detailLabel
!
,
top
:
detailLabelTopInset
,
left
:
detailLabelLeftInset
,
bottom
:
detailLabelBottomInset
,
right
:
detailLabelRightInset
)
Layout
.
expandToParentWithPad
(
detailLabelContainer
!
,
child
:
detailLabel
!
,
top
:
detailLabelTopInset
,
left
:
detailLabelLeftInset
,
bottom
:
detailLabelBottomInset
,
right
:
detailLabelRightInset
)
}
else
{
}
else
{
...
@@ -494,14 +483,24 @@ public class BasicCardView : MaterialCardView, Comparable {
...
@@ -494,14 +483,24 @@ public class BasicCardView : MaterialCardView, Comparable {
}
}
}
}
/**
//
:name: isEqual
// :name: prepareProperties
*/
//
public
override
func
isEqual
(
object
:
AnyObject
?)
->
Bool
{
internal
func
prepareProperties
(
titleLabel
:
UILabel
?,
detailLabel
:
UILabel
?,
divider
:
UIView
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
if
let
rhs
=
object
as?
BasicCardView
{
self
.
titleLabel
=
titleLabel
return
tag
==
rhs
.
tag
self
.
detailLabel
=
detailLabel
}
self
.
divider
=
divider
return
false
self
.
leftButtons
=
leftButtons
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
internal
override
func
prepareView
()
{
super
.
prepareView
()
prepareShadow
()
backgroundColor
=
MaterialTheme
.
blueGrey
.
color
}
}
}
}
...
...
Source/ImageCardView.swift
View file @
2904209e
...
@@ -39,7 +39,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -39,7 +39,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
imageViewTopInset
:
CGFloat
=
0
{
public
var
imageViewTopInset
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -48,7 +48,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -48,7 +48,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
imageViewBottomInset
:
CGFloat
=
0
{
public
var
imageViewBottomInset
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -67,7 +67,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -67,7 +67,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
imageViewLeftInset
:
CGFloat
=
0
{
public
var
imageViewLeftInset
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -76,7 +76,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -76,7 +76,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
imageViewRightInset
:
CGFloat
=
0
{
public
var
imageViewRightInset
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -95,7 +95,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -95,7 +95,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
titleLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -104,7 +104,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -104,7 +104,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
titleLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -123,7 +123,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -123,7 +123,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
titleLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -132,7 +132,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -132,7 +132,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
titleLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
titleLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -151,7 +151,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -151,7 +151,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
detailLabelTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -160,7 +160,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -160,7 +160,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
public
var
detailLabelBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -179,7 +179,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -179,7 +179,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
detailLabelLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -188,7 +188,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -188,7 +188,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
detailLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
public
var
detailLabelRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -207,7 +207,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -207,7 +207,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
public
var
buttonTopInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -216,7 +216,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -216,7 +216,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
public
var
buttonBottomInset
:
CGFloat
=
MaterialTheme
.
cardVerticalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -235,7 +235,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -235,7 +235,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
public
var
buttonLeftInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -244,7 +244,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -244,7 +244,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
buttonRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
public
var
buttonRightInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -254,7 +254,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -254,7 +254,7 @@ public class ImageCardView : MaterialCardView, Comparable {
public
var
shadow
:
Bool
=
true
{
public
var
shadow
:
Bool
=
true
{
didSet
{
didSet
{
false
==
shadow
?
removeShadow
()
:
prepareShadow
()
false
==
shadow
?
removeShadow
()
:
prepareShadow
()
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -263,7 +263,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -263,7 +263,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
maximumImageViewHeight
:
CGFloat
=
200
{
public
var
maximumImageViewHeight
:
CGFloat
=
200
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -302,7 +302,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -302,7 +302,7 @@ public class ImageCardView : MaterialCardView, Comparable {
imageViewContainer
?
.
removeFromSuperview
()
imageViewContainer
?
.
removeFromSuperview
()
imageViewContainer
=
nil
imageViewContainer
=
nil
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -311,7 +311,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -311,7 +311,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
maximumTitleLabelHeight
:
CGFloat
=
0
{
public
var
maximumTitleLabelHeight
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -353,7 +353,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -353,7 +353,7 @@ public class ImageCardView : MaterialCardView, Comparable {
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
=
nil
titleLabelContainer
=
nil
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -362,7 +362,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -362,7 +362,7 @@ public class ImageCardView : MaterialCardView, Comparable {
*/
*/
public
var
maximumDetailLabelHeight
:
CGFloat
=
0
{
public
var
maximumDetailLabelHeight
:
CGFloat
=
0
{
didSet
{
didSet
{
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -397,7 +397,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -397,7 +397,7 @@ public class ImageCardView : MaterialCardView, Comparable {
detailLabelContainer
?
.
removeFromSuperview
()
detailLabelContainer
?
.
removeFromSuperview
()
detailLabelContainer
=
nil
detailLabelContainer
=
nil
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -413,7 +413,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -413,7 +413,7 @@ public class ImageCardView : MaterialCardView, Comparable {
}
else
{
}
else
{
divider
?
.
removeFromSuperview
()
divider
?
.
removeFromSuperview
()
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -436,7 +436,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -436,7 +436,7 @@ public class ImageCardView : MaterialCardView, Comparable {
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
buttonsContainer
!
)
addSubview
(
buttonsContainer
!
)
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -454,7 +454,7 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -454,7 +454,7 @@ public class ImageCardView : MaterialCardView, Comparable {
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
buttonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
buttonsContainer
!
)
addSubview
(
buttonsContainer
!
)
}
}
prepareCard
()
reloadView
()
}
}
}
}
...
@@ -480,32 +480,20 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -480,32 +480,20 @@ public class ImageCardView : MaterialCardView, Comparable {
super
.
init
(
frame
:
CGRectZero
)
super
.
init
(
frame
:
CGRectZero
)
}
}
//
/**
// :name: prepareProperties
:name: isEqual
//
*/
internal
func
prepareProperties
(
imageView
:
UIImageView
?,
titleLabel
:
UILabel
?,
detailLabel
:
UILabel
?,
divider
:
UIView
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
public
override
func
isEqual
(
object
:
AnyObject
?)
->
Bool
{
self
.
imageView
=
imageView
if
let
rhs
=
object
as?
ImageCardView
{
self
.
titleLabel
=
titleLabel
return
tag
==
rhs
.
tag
self
.
detailLabel
=
detailLabel
}
self
.
divider
=
divider
return
false
self
.
leftButtons
=
leftButtons
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
internal
override
func
prepareView
()
{
super
.
prepareView
()
prepareShadow
()
backgroundColor
=
MaterialTheme
.
white
.
color
}
}
//
/**
// :name: prepareCard
:name: reloadView
//
*/
internal
override
func
prepareCard
()
{
public
func
reloadView
()
{
super
.
prepareCard
()
// clear all constraints
// clear all constraints
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
...
@@ -628,14 +616,25 @@ public class ImageCardView : MaterialCardView, Comparable {
...
@@ -628,14 +616,25 @@ public class ImageCardView : MaterialCardView, Comparable {
}
}
}
}
/**
//
:name: isEqual
// :name: prepareProperties
*/
//
public
override
func
isEqual
(
object
:
AnyObject
?)
->
Bool
{
internal
func
prepareProperties
(
imageView
:
UIImageView
?,
titleLabel
:
UILabel
?,
detailLabel
:
UILabel
?,
divider
:
UIView
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
if
let
rhs
=
object
as?
ImageCardView
{
self
.
imageView
=
imageView
return
tag
==
rhs
.
tag
self
.
titleLabel
=
titleLabel
}
self
.
detailLabel
=
detailLabel
return
false
self
.
divider
=
divider
self
.
leftButtons
=
leftButtons
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
internal
override
func
prepareView
()
{
super
.
prepareView
()
prepareShadow
()
backgroundColor
=
MaterialTheme
.
white
.
color
}
}
}
}
...
...
Source/MaterialCardView.swift
View file @
2904209e
...
@@ -107,15 +107,9 @@ public class MaterialCardView : UIView {
...
@@ -107,15 +107,9 @@ public class MaterialCardView : UIView {
translatesAutoresizingMaskIntoConstraints
=
false
translatesAutoresizingMaskIntoConstraints
=
false
prepareBackgroundColorView
()
prepareBackgroundColorView
()
preparePulseViewContainer
()
preparePulseViewContainer
()
prepareCard
()
}
}
//
//
// :name: prepareCard
//
internal
func
prepareCard
()
{}
//
// :name: prepareShadow
// :name: prepareShadow
//
//
internal
func
prepareShadow
()
{
internal
func
prepareShadow
()
{
...
...
Source/NavigationBarView.swift
View file @
2904209e
...
@@ -29,7 +29,7 @@ public class NavigationBarView: UIView {
...
@@ -29,7 +29,7 @@ public class NavigationBarView: UIView {
//
//
public
var
horizontalInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
public
var
horizontalInset
:
CGFloat
=
MaterialTheme
.
cardHorizontalInset
/
2
{
didSet
{
didSet
{
prepareNavigation
()
reloadView
()
}
}
}
}
...
@@ -64,7 +64,7 @@ public class NavigationBarView: UIView {
...
@@ -64,7 +64,7 @@ public class NavigationBarView: UIView {
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
?
.
removeFromSuperview
()
titleLabelContainer
=
nil
titleLabelContainer
=
nil
}
}
prepareNavigation
()
reloadView
()
}
}
}
}
...
@@ -87,7 +87,7 @@ public class NavigationBarView: UIView {
...
@@ -87,7 +87,7 @@ public class NavigationBarView: UIView {
leftButtonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
leftButtonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
leftButtonsContainer
!
)
addSubview
(
leftButtonsContainer
!
)
}
}
prepareNavigation
()
reloadView
()
}
}
}
}
...
@@ -110,7 +110,7 @@ public class NavigationBarView: UIView {
...
@@ -110,7 +110,7 @@ public class NavigationBarView: UIView {
rightButtonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
rightButtonsContainer
!.
backgroundColor
=
MaterialTheme
.
clear
.
color
addSubview
(
rightButtonsContainer
!
)
addSubview
(
rightButtonsContainer
!
)
}
}
prepareNavigation
()
reloadView
()
}
}
}
}
...
@@ -144,31 +144,10 @@ public class NavigationBarView: UIView {
...
@@ -144,31 +144,10 @@ public class NavigationBarView: UIView {
prepareProperties
(
titleLabel
,
leftButtons
:
leftButtons
,
rightButtons
:
rightButtons
)
prepareProperties
(
titleLabel
,
leftButtons
:
leftButtons
,
rightButtons
:
rightButtons
)
}
}
//
/**
// :name: prepareProperties
:name: reloadView
//
*/
internal
func
prepareProperties
(
titleLabel
:
UILabel
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
public
func
reloadView
()
{
self
.
titleLabel
=
titleLabel
self
.
leftButtons
=
leftButtons
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
private
func
prepareView
()
{
translatesAutoresizingMaskIntoConstraints
=
false
layer
.
shadowColor
=
MaterialTheme
.
blueGrey
.
darken4
.
CGColor
layer
.
shadowOffset
=
CGSizeMake
(
0.2
,
0.2
)
layer
.
shadowOpacity
=
0.5
layer
.
shadowRadius
=
1
clipsToBounds
=
false
}
//
// :name: prepareNavigation
//
internal
func
prepareNavigation
()
{
// clear all constraints
// clear all constraints
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
NSLayoutConstraint
.
deactivateConstraints
(
layoutConstraints
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
layoutConstraints
.
removeAll
(
keepCapacity
:
false
)
...
@@ -251,4 +230,25 @@ public class NavigationBarView: UIView {
...
@@ -251,4 +230,25 @@ public class NavigationBarView: UIView {
// constraints
// constraints
NSLayoutConstraint
.
activateConstraints
(
layoutConstraints
)
NSLayoutConstraint
.
activateConstraints
(
layoutConstraints
)
}
}
//
// :name: prepareProperties
//
internal
func
prepareProperties
(
titleLabel
:
UILabel
?,
leftButtons
:
Array
<
MaterialButton
>
?,
rightButtons
:
Array
<
MaterialButton
>
?)
{
self
.
titleLabel
=
titleLabel
self
.
leftButtons
=
leftButtons
self
.
rightButtons
=
rightButtons
}
//
// :name: prepareView
//
private
func
prepareView
()
{
translatesAutoresizingMaskIntoConstraints
=
false
layer
.
shadowColor
=
MaterialTheme
.
blueGrey
.
darken4
.
CGColor
layer
.
shadowOffset
=
CGSizeMake
(
0.2
,
0.2
)
layer
.
shadowOpacity
=
0.5
layer
.
shadowRadius
=
1
clipsToBounds
=
false
}
}
}
\ No newline at end of file
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