@@ -64,14 +64,13 @@ class EmptyDataView: UIView {
6464 var tapGesture : UITapGestureRecognizer !
6565 var customView : UIView ? {
6666 willSet {
67- if let _ = customView {
68- customView! . removeFromSuperview ( )
67+ if let customView = customView {
68+ customView. removeFromSuperview ( )
6969 }
7070 }
7171 didSet {
72- if let _ = customView {
73- customView!. translatesAutoresizingMaskIntoConstraints = false
74- contentView. addSubview ( customView!)
72+ if let customView = customView {
73+ contentView. addSubview ( customView)
7574 }
7675 }
7776 }
@@ -133,11 +132,22 @@ class EmptyDataView: UIView {
133132 addConstraints ( NSLayoutConstraint . constraintsWithVisualFormat ( " H:|[ \( ViewStrings . contentView) ]| " , options: [ ] , metrics: nil , views: [ ViewStrings . contentView : contentView] ) )
134133
135134 if let customView = customView {
136- contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . CenterX, relatedBy: . Equal, toItem: contentView, attribute: . CenterX, multiplier: 1 , constant: 0 ) )
137- contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . CenterY, relatedBy: . Equal, toItem: contentView, attribute: . CenterY, multiplier: 1 , constant: 0 ) )
138- contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Width, relatedBy: . Equal, toItem: . None, attribute: . NotAnAttribute, multiplier: 1 , constant: customView. frame. width) )
139- contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Height, relatedBy: . Equal, toItem: . None, attribute: . NotAnAttribute, multiplier: 1 , constant: customView. frame. height) )
140- contentView. addConstraints ( NSLayoutConstraint . constraintsWithVisualFormat ( " V:|[ \( ViewStrings . customView) ]| " , options: [ ] , metrics: nil , views: [ ViewStrings . customView: customView] ) )
135+ let translatesFrameIntoConstraints = customView. translatesAutoresizingMaskIntoConstraints
136+ customView. translatesAutoresizingMaskIntoConstraints = false
137+
138+ if translatesFrameIntoConstraints {
139+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Width, relatedBy: . Equal, toItem: . None, attribute: . NotAnAttribute, multiplier: 1 , constant: customView. frame. width) )
140+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Height, relatedBy: . Equal, toItem: . None, attribute: . NotAnAttribute, multiplier: 1 , constant: customView. frame. height) )
141+
142+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . CenterX, relatedBy: . Equal, toItem: contentView, attribute: . CenterX, multiplier: 1 , constant: 0 ) )
143+ contentView. addConstraints ( NSLayoutConstraint . constraintsWithVisualFormat ( " V:|[ \( ViewStrings . customView) ]| " , options: [ ] , metrics: nil , views: [ ViewStrings . customView: customView] ) )
144+ } else {
145+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . CenterX, relatedBy: . Equal, toItem: contentView, attribute: . CenterX, multiplier: 1 , constant: 0 ) )
146+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Leading, relatedBy: . GreaterThanOrEqual, toItem: contentView, attribute: . Leading, multiplier: 1 , constant: 0 ) )
147+ contentView. addConstraint ( NSLayoutConstraint ( item: customView, attribute: . Trailing, relatedBy: . LessThanOrEqual, toItem: contentView, attribute: . Trailing, multiplier: 1 , constant: 0 ) )
148+
149+ contentView. addConstraints ( NSLayoutConstraint . constraintsWithVisualFormat ( " V:|[ \( ViewStrings . customView) ]| " , options: [ ] , metrics: nil , views: [ ViewStrings . customView: customView] ) )
150+ }
141151 } else {
142152 var viewStrings = [ String] ( )
143153 var views = [ String: UIView] ( )
0 commit comments