Skip to content

Commit 1ff72c9

Browse files
committed
Visibility adjustments
1 parent 5bf2497 commit 1ff72c9

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

Source/NovaMenuViewController.swift

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import Cartography
99
import NovaLines
1010

1111

12-
1312
public struct NovaMenuStyle {
1413
public var itemHeight: CGFloat = 44
1514
public var topMargin: CGFloat = 100
@@ -75,11 +74,11 @@ public class NovaMenuItem {
7574

7675

7776
// Changing this will require redoing the Expand Button Animation ... so don't.
78-
private let NovaMenuHeight: CGFloat = 44
77+
private let NovaMenuHeight: CGFloat = 52
7978
private let NovaMenuDefaultFontName = "AvenirNextCondensed-DemiBold"
8079

8180

82-
public class NovaMenuViewController: UIViewController {
81+
@objc public class NovaMenuViewController: UIViewController {
8382

8483
public var dataSource: NovaMenuDataSource? {
8584
didSet {
@@ -89,7 +88,7 @@ public class NovaMenuViewController: UIViewController {
8988
public var delegate: NovaMenuDelegate?
9089

9190

92-
private(set) var rootViewController: UIViewController!
91+
public private(set) var rootViewController: UIViewController!
9392
private var style: NovaMenuStyle = NovaMenuStyle()
9493

9594
private let menuView = NovaMenuView(frame: CGRect.zero)
@@ -172,7 +171,9 @@ public class NovaMenuViewController: UIViewController {
172171
// TODO: animate the expand button
173172
}
174173

175-
174+
public var contentView: UIView {
175+
return menuView.contentContainer
176+
}
176177

177178

178179

@@ -366,7 +367,7 @@ class NovaMenuView: UIView {
366367
addSubview(contentContainer)
367368

368369
contentContainer.clipsToBounds = true
369-
contentContainer.backgroundColor = .yellowColor()
370+
contentContainer.backgroundColor = .clearColor()
370371

371372
tableView.backgroundColor = .clearColor()
372373
tableView.clipsToBounds = true
@@ -537,19 +538,3 @@ class NovaMenuNavigationBar: UIView {
537538
fatalError("init(coder:) has not been implemented")
538539
}
539540
}
540-
541-
542-
extension UIViewController {
543-
544-
public var novaMenuController: NovaMenuViewController? {
545-
var parent = self.parentViewController
546-
while let p = parent {
547-
if p is NovaMenuViewController {
548-
return (p as! NovaMenuViewController)
549-
}
550-
parent = p.parentViewController
551-
}
552-
return nil
553-
}
554-
555-
}

0 commit comments

Comments
 (0)