Commit 1fc740e4 by Daniel Dahan

storyboard-examples: initial changes to Switch

parent ddc4fd85
...@@ -36,6 +36,7 @@ class RootViewController: UIViewController { ...@@ -36,6 +36,7 @@ class RootViewController: UIViewController {
private var menuButton: IconButton! private var menuButton: IconButton!
private var starButton: IconButton! private var starButton: IconButton!
private var searchButton: IconButton! private var searchButton: IconButton!
private var switchControl: Switch!
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -74,8 +75,10 @@ class RootViewController: UIViewController { ...@@ -74,8 +75,10 @@ class RootViewController: UIViewController {
tc.toolbar.detail = "Build Beautiful Software" tc.toolbar.detail = "Build Beautiful Software"
tc.toolbar.detailLabel.textAlignment = .left tc.toolbar.detailLabel.textAlignment = .left
switchControl = Switch(state: .off, style:.light, size: .small)
tc.toolbar.leftViews = [menuButton] tc.toolbar.leftViews = [menuButton]
tc.toolbar.rightViews = [starButton, searchButton] tc.toolbar.rightViews = [switchControl, starButton, searchButton]
} }
} }
...@@ -94,7 +94,7 @@ open class Bar: View { ...@@ -94,7 +94,7 @@ open class Bar: View {
/// Grid cell factor. /// Grid cell factor.
@IBInspectable @IBInspectable
open var gridFactor: CGFloat = 24 { open var gridFactor: CGFloat = 12 {
didSet { didSet {
assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]") assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]")
layoutSubviews() layoutSubviews()
...@@ -242,8 +242,8 @@ open class Bar: View { ...@@ -242,8 +242,8 @@ open class Bar: View {
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
autoresizingMask = .flexibleWidth autoresizingMask = .flexibleWidth
interimSpacePreset = .interimSpace3 interimSpacePreset = .interimSpace4
contentEdgeInsetsPreset = .square1 contentEdgeInsetsPreset = .wideRectangle2
prepareContentView() prepareContentView()
} }
......
...@@ -92,7 +92,7 @@ open class NavigationBar: UINavigationBar { ...@@ -92,7 +92,7 @@ open class NavigationBar: UINavigationBar {
/// Grid cell factor. /// Grid cell factor.
@IBInspectable @IBInspectable
open var gridFactor: CGFloat = 24 { open var gridFactor: CGFloat = 12 {
didSet { didSet {
assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]") assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]")
layoutSubviews() layoutSubviews()
...@@ -294,9 +294,9 @@ open class NavigationBar: UINavigationBar { ...@@ -294,9 +294,9 @@ open class NavigationBar: UINavigationBar {
barStyle = .black barStyle = .black
isTranslucent = false isTranslucent = false
depthPreset = .depth1 depthPreset = .depth1
interimSpacePreset = .interimSpace3 interimSpacePreset = .interimSpace4
contentEdgeInsetsPreset = .square1 contentEdgeInsetsPreset = .wideRectangle2
contentScaleFactor = Device.scale contentScaleFactor = Device.scale
backButtonImage = Icon.cm.arrowBack backButtonImage = Icon.cm.arrowBack
let image = UIImage.imageWithColor(color: Color.clear, size: CGSize(width: 1, height: 1)) let image = UIImage.imageWithColor(color: Color.clear, size: CGSize(width: 1, height: 1))
shadowImage = image shadowImage = image
......
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