Skip to content

M
Material
Commit 5de32900 by Daniel Dahan
Options

updated projects in preparation to fix NavigationBar and StatusBar issue

parent 2be8f826
Showing with 22 additions and 26 deletions
Examples/Programmatic/App/App/AppBottomNavigationController.swift
...@@ -107,9 +107,7 @@ class AppBottomNavigationController: BottomNavigationController { ...@@ -107,9 +107,7 @@ class AppBottomNavigationController: BottomNavigationController {
/// Prepares the view controllers. /// Prepares the view controllers.
private func prepareViewControllers() { private func prepareViewControllers() {
let menuController: AppMenuController = AppMenuController(rootViewController: RecipesViewController()) viewControllers = [RecipesViewController(), VideoViewController(), PhotoViewController()]
menuController.edgesForExtendedLayout = .None
viewControllers = [menuController, VideoViewController(), PhotoViewController()]
selectedIndex = 0 selectedIndex = 0
} }
......
Examples/Programmatic/App/App/AppMenuController.swift
...@@ -43,15 +43,6 @@ class AppMenuController: MenuController { ...@@ -43,15 +43,6 @@ class AppMenuController: MenuController {
/// MenuView inset. /// MenuView inset.
private let menuViewInset: CGFloat = 16 private let menuViewInset: CGFloat = 16
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
override init(rootViewController: UIViewController) {
super.init(rootViewController: rootViewController)
prepareTabBarItem()
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
prepareMenuView() prepareMenuView()
...@@ -159,13 +150,6 @@ class AppMenuController: MenuController { ...@@ -159,13 +150,6 @@ class AppMenuController: MenuController {
view.layout(menuView).width(baseSize.width).height(baseSize.height).bottom(menuViewInset).right(menuViewInset) view.layout(menuView).width(baseSize.width).height(baseSize.height).bottom(menuViewInset).right(menuViewInset)
} }
/// Prepare tabBarItem.
private func prepareTabBarItem() {
tabBarItem.image = MaterialIcon.cm.photoLibrary
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected)
}
} }
/// MenuViewDelegate. /// MenuViewDelegate.
......
Examples/Programmatic/App/App/RecipesViewController.swift
...@@ -38,6 +38,19 @@ class RecipesViewController: UIViewController { ...@@ -38,6 +38,19 @@ class RecipesViewController: UIViewController {
/// A tableView used to display items. /// A tableView used to display items.
private var tableView: UITableView! private var tableView: UITableView!
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
}
init() {
super.init(nibName: nil, bundle: nil)
prepareTabBarItem()
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
prepareView() prepareView()
...@@ -48,7 +61,7 @@ class RecipesViewController: UIViewController { ...@@ -48,7 +61,7 @@ class RecipesViewController: UIViewController {
override func viewWillAppear(animated: Bool) { override func viewWillAppear(animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
// Stops the tableView contentInsets from being automatically adjusted. // Stops the tableView contentInsets from being automatically adjusted.
automaticallyAdjustsScrollViewInsets = true edgesForExtendedLayout = .None
// Enable the SideNavigation. // Enable the SideNavigation.
navigationDrawerController?.enabled = true navigationDrawerController?.enabled = true
...@@ -171,6 +184,13 @@ class RecipesViewController: UIViewController { ...@@ -171,6 +184,13 @@ class RecipesViewController: UIViewController {
// Use Layout to easily align the tableView. // Use Layout to easily align the tableView.
view.layout(tableView).edges() view.layout(tableView).edges()
} }
/// Prepare tabBarItem.
private func prepareTabBarItem() {
tabBarItem.image = MaterialIcon.cm.photoLibrary
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected)
}
} }
/// TableViewDataSource methods. /// TableViewDataSource methods.
......
Examples/Programmatic/NavigationDrawerController/NavigationDrawerController.xcodeproj/project.pbxproj
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
967A48071D0E0EA300B8CEB7 /* AppRightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967A48061D0E0EA300B8CEB7 /* AppRightViewController.swift */; }; 967A48071D0E0EA300B8CEB7 /* AppRightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967A48061D0E0EA300B8CEB7 /* AppRightViewController.swift */; };
967A48091D0E127200B8CEB7 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967A48081D0E127200B8CEB7 /* Material.framework */; };
967A480A1D0E127200B8CEB7 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 967A48081D0E127200B8CEB7 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96CB75011D0DFDBB0012D9F2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CB75001D0DFDBB0012D9F2 /* AppDelegate.swift */; }; 96CB75011D0DFDBB0012D9F2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CB75001D0DFDBB0012D9F2 /* AppDelegate.swift */; };
96CB75031D0DFDBB0012D9F2 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CB75021D0DFDBB0012D9F2 /* AppLeftViewController.swift */; }; 96CB75031D0DFDBB0012D9F2 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CB75021D0DFDBB0012D9F2 /* AppLeftViewController.swift */; };
96CB75081D0DFDBB0012D9F2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96CB75071D0DFDBB0012D9F2 /* Assets.xcassets */; }; 96CB75081D0DFDBB0012D9F2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96CB75071D0DFDBB0012D9F2 /* Assets.xcassets */; };
...@@ -28,7 +26,6 @@ ...@@ -28,7 +26,6 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
967A480A1D0E127200B8CEB7 /* Material.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -37,7 +34,6 @@ ...@@ -37,7 +34,6 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
967A48061D0E0EA300B8CEB7 /* AppRightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppRightViewController.swift; sourceTree = "<group>"; }; 967A48061D0E0EA300B8CEB7 /* AppRightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppRightViewController.swift; sourceTree = "<group>"; };
967A48081D0E127200B8CEB7 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-dciwtavdzrmtrifplxfnouazaqvx/Build/Products/Debug-iphoneos/Material.framework"; sourceTree = "<absolute>"; };
96CB74FD1D0DFDBB0012D9F2 /* NavigationDrawerController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationDrawerController.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96CB74FD1D0DFDBB0012D9F2 /* NavigationDrawerController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationDrawerController.app; sourceTree = BUILT_PRODUCTS_DIR; };
96CB75001D0DFDBB0012D9F2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 96CB75001D0DFDBB0012D9F2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
96CB75021D0DFDBB0012D9F2 /* AppLeftViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; }; 96CB75021D0DFDBB0012D9F2 /* AppLeftViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; };
...@@ -56,7 +52,6 @@ ...@@ -56,7 +52,6 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
967A48091D0E127200B8CEB7 /* Material.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -66,7 +61,6 @@ ...@@ -66,7 +61,6 @@
96CB74F41D0DFDBB0012D9F2 = { 96CB74F41D0DFDBB0012D9F2 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
967A48081D0E127200B8CEB7 /* Material.framework */,
96CB74FF1D0DFDBB0012D9F2 /* NavigationDrawerController */, 96CB74FF1D0DFDBB0012D9F2 /* NavigationDrawerController */,
96CB74FE1D0DFDBB0012D9F2 /* Products */, 96CB74FE1D0DFDBB0012D9F2 /* Products */,
); );
......
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