Commit 270558a5 by Daniel Dahan

experimental: updated NavBar constraints

parent eef952ee
...@@ -19,11 +19,6 @@ ...@@ -19,11 +19,6 @@
import UIKit import UIKit
public class NavigationBarView: MaterialView { public class NavigationBarView: MaterialView {
//
// :name: isLoading
//
internal lazy var isLoading: Bool = false
/** /**
:name: statusBarStyle :name: statusBarStyle
*/ */
...@@ -38,7 +33,7 @@ public class NavigationBarView: MaterialView { ...@@ -38,7 +33,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var titleInsets: MaterialInsets? { public var titleInsets: MaterialInsets? {
didSet { didSet {
titleInsetsRef = MaterialInsetsToValue(nil == titleInsets ? .Inset0 : titleInsets!) titleInsetsRef = nil == titleInsets ? nil : MaterialInsetsToValue(titleInsets!)
} }
} }
...@@ -47,7 +42,7 @@ public class NavigationBarView: MaterialView { ...@@ -47,7 +42,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var titleInsetsRef: MaterialInsetsType! { public var titleInsetsRef: MaterialInsetsType! {
didSet { didSet {
titleInsetsRef = nil == titleInsetsRef ? MaterialTheme.navigation.titleInsetsRef : titleInsetsRef! titleInsetsRef = nil == titleInsetsRef ? (top: 0, left: 0, bottom: 0, right: 0) : titleInsetsRef!
reloadView() reloadView()
} }
} }
...@@ -69,7 +64,7 @@ public class NavigationBarView: MaterialView { ...@@ -69,7 +64,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var leftButtonsInsets: MaterialInsets? { public var leftButtonsInsets: MaterialInsets? {
didSet { didSet {
leftButtonsInsetsRef = MaterialInsetsToValue(nil == leftButtonsInsets ? .Inset0 : leftButtonsInsets!) leftButtonsInsetsRef = nil == leftButtonsInsets ? nil : MaterialInsetsToValue(leftButtonsInsets!)
} }
} }
...@@ -78,7 +73,7 @@ public class NavigationBarView: MaterialView { ...@@ -78,7 +73,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var leftButtonsInsetsRef: MaterialInsetsType! { public var leftButtonsInsetsRef: MaterialInsetsType! {
didSet { didSet {
leftButtonsInsetsRef = nil == leftButtonsInsetsRef ? MaterialTheme.navigation.leftButtonsInsetsRef : leftButtonsInsetsRef! leftButtonsInsetsRef = nil == leftButtonsInsetsRef ? (top: 0, left: 0, bottom: 0, right: 0) : leftButtonsInsetsRef!
reloadView() reloadView()
} }
} }
...@@ -102,7 +97,7 @@ public class NavigationBarView: MaterialView { ...@@ -102,7 +97,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var rightButtonsInsets: MaterialInsets? { public var rightButtonsInsets: MaterialInsets? {
didSet { didSet {
rightButtonsInsetsRef = MaterialInsetsToValue(nil == rightButtonsInsets ? .Inset0 : rightButtonsInsets!) rightButtonsInsetsRef = nil == rightButtonsInsets ? nil : MaterialInsetsToValue(rightButtonsInsets!)
} }
} }
...@@ -111,7 +106,7 @@ public class NavigationBarView: MaterialView { ...@@ -111,7 +106,7 @@ public class NavigationBarView: MaterialView {
*/ */
public var rightButtonsInsetsRef: MaterialInsetsType! { public var rightButtonsInsetsRef: MaterialInsetsType! {
didSet { didSet {
rightButtonsInsetsRef = nil == rightButtonsInsetsRef ? MaterialTheme.navigation.rightButtonsInsetsRef : rightButtonsInsetsRef! rightButtonsInsetsRef = nil == rightButtonsInsetsRef ? (top: 0, left: 0, bottom: 0, right: 0) : rightButtonsInsetsRef!
reloadView() reloadView()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment