initial pass to update SideNav with the addition of a right side view

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController.xcodeproj/project.pbxproj

@@ -11,7 +11,10 @@
 		9642FA1D1C1B50E700022BC6 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9642FA1C1C1B50E700022BC6 /* MainViewController.swift */; };
 		9642FA221C1B50E700022BC6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9642FA211C1B50E700022BC6 /* Assets.xcassets */; };
 		9642FA251C1B50E700022BC6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9642FA231C1B50E700022BC6 /* LaunchScreen.storyboard */; };
-		9642FA331C1B909700022BC6 /* SideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9642FA321C1B909700022BC6 /* SideViewController.swift */; };
+		9642FA331C1B909700022BC6 /* LeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9642FA321C1B909700022BC6 /* LeftViewController.swift */; };
+		967585351C5692A4001E4268 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967585341C5692A4001E4268 /* Material.framework */; };
+		967585361C5692A4001E4268 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 967585341C5692A4001E4268 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		967585381C569AA9001E4268 /* RightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967585371C569AA9001E4268 /* RightViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -21,6 +24,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				967585361C5692A4001E4268 /* Material.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -34,7 +38,9 @@
 		9642FA211C1B50E700022BC6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		9642FA241C1B50E700022BC6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		9642FA261C1B50E700022BC6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9642FA321C1B909700022BC6 /* SideViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideViewController.swift; sourceTree = "<group>"; };
+		9642FA321C1B909700022BC6 /* LeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeftViewController.swift; sourceTree = "<group>"; };
+		967585341C5692A4001E4268 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-hbpnflxhoouqxebjcyhbbhqyesjd/Build/Products/Debug-iphoneos/Material.framework"; sourceTree = "<absolute>"; };
+		967585371C569AA9001E4268 /* RightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RightViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -42,6 +48,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				967585351C5692A4001E4268 /* Material.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -51,6 +58,7 @@
 		9642FA0E1C1B50E700022BC6 = {
 			isa = PBXGroup;
 			children = (
+				967585341C5692A4001E4268 /* Material.framework */,
 				9642FA191C1B50E700022BC6 /* SideNavigationViewController */,
 				9642FA181C1B50E700022BC6 /* Products */,
 			);
@@ -69,10 +77,11 @@
 			children = (
 				9642FA1A1C1B50E700022BC6 /* AppDelegate.swift */,
 				9642FA1C1C1B50E700022BC6 /* MainViewController.swift */,
-				9642FA321C1B909700022BC6 /* SideViewController.swift */,
+				9642FA321C1B909700022BC6 /* LeftViewController.swift */,
 				9642FA211C1B50E700022BC6 /* Assets.xcassets */,
 				9642FA231C1B50E700022BC6 /* LaunchScreen.storyboard */,
 				9642FA261C1B50E700022BC6 /* Info.plist */,
+				967585371C569AA9001E4268 /* RightViewController.swift */,
 			);
 			path = SideNavigationViewController;
 			sourceTree = "<group>";
@@ -149,7 +158,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				9642FA1D1C1B50E700022BC6 /* MainViewController.swift in Sources */,
-				9642FA331C1B909700022BC6 /* SideViewController.swift in Sources */,
+				967585381C569AA9001E4268 /* RightViewController.swift in Sources */,
+				9642FA331C1B909700022BC6 /* LeftViewController.swift in Sources */,
 				9642FA1B1C1B50E700022BC6 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/AppDelegate.swift

@@ -39,7 +39,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
 		// Override point for customization after application launch.
 		window = UIWindow(frame: UIScreen.mainScreen().bounds)
-		window!.rootViewController = SideNavigationViewController(mainViewController: MainViewController(), sideViewController: SideViewController())
+		window!.rootViewController = SideNavigationViewController(mainViewController: MainViewController(), leftViewController: LeftViewController())
 		window!.makeKeyAndVisible()
 		return true
 	}

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/SideViewController.swift → Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/LeftViewController.swift

@@ -29,7 +29,7 @@
 */
 
 /*
-The following is an example of setting a UITableView as the SideViewController
+The following is an example of setting a UITableView as the LeftViewController
 within a SideNavigationViewController.
 */
 
@@ -42,7 +42,7 @@ private struct Item {
 	var selected: Bool
 }
 
-class SideViewController: UIViewController {
+class LeftViewController: UIViewController {
 	/// A tableView used to display navigation items.
 	private let tableView: UITableView = UITableView()
 	
@@ -64,8 +64,8 @@ class SideViewController: UIViewController {
 	
 	override func viewWillAppear(animated: Bool) {
 		super.viewWillAppear(animated)
-		sideNavigationViewController?.backdropColor = nil
-		sideNavigationViewController?.depth = .None
+//		sideNavigationViewController?.backdropColor = nil
+//		sideNavigationViewController?.depth = .None
 	}
 
 	
@@ -137,7 +137,7 @@ class SideViewController: UIViewController {
 }
 
 /// TableViewDataSource methods.
-extension SideViewController: UITableViewDataSource {
+extension LeftViewController: UITableViewDataSource {
 	/// Determines the number of rows in the tableView.
 	func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
 		return items.count;
@@ -164,7 +164,7 @@ extension SideViewController: UITableViewDataSource {
 }
 
 /// UITableViewDelegate methods.
-extension SideViewController: UITableViewDelegate {
+extension LeftViewController: UITableViewDelegate {
 	/// Sets the tableView cell height.
 	func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
 		return 64

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/MainViewController.swift

@@ -69,7 +69,7 @@ class MainViewController: UIViewController {
 		because any earlier may cause a race condition when instantiating
 		the MainViewController and SideViewController.
 		*/
-		sideNavigationViewController?.setSideViewWidth(view.bounds.width - 88, hidden: true, animated: false)
+		sideNavigationViewController?.setLeftViewWidth(view.bounds.width - 88, hidden: true, animated: false)
 	}
 	
 	/**

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/RightViewController.swift

+/*
+* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+*	*	Redistributions of source code must retain the above copyright notice, this
+*		list of conditions and the following disclaimer.
+*
+*	*	Redistributions in binary form must reproduce the above copyright notice,
+*		this list of conditions and the following disclaimer in the documentation
+*		and/or other materials provided with the distribution.
+*
+*	*	Neither the name of Material nor the names of its
+*		contributors may be used to endorse or promote products derived from
+*		this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+The following is an example of setting a UITableView as the RightViewController
+within a SideNavigationViewController.
+*/
+
+import UIKit
+import Material
+
+private struct Item {
+	var text: String
+	var imageName: String
+	var selected: Bool
+}
+
+class RightViewController: UIViewController {
+	/// A tableView used to display navigation items.
+	private let tableView: UITableView = UITableView()
+	
+	/// A list of all the navigation items.
+	private var items: Array<Item> = Array<Item>()
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		prepareView()
+		prepareItems()
+		prepareProfileView()
+		prepareTableView()
+	}
+	
+	/// General preparation statements.
+	private func prepareView() {
+		view.backgroundColor = MaterialColor.clear
+	}
+	
+	override func viewWillAppear(animated: Bool) {
+		super.viewWillAppear(animated)
+		//		sideNavigationViewController?.backdropColor = nil
+		//		sideNavigationViewController?.depth = .None
+	}
+	
+	
+	/// Prepares the items that are displayed within the tableView.
+	private func prepareItems() {
+		items.append(Item(text: "Inbox", imageName: "ic_inbox", selected: true))
+		items.append(Item(text: "Today", imageName: "ic_today", selected: false))
+		items.append(Item(text: "Bookmarks", imageName: "ic_book", selected: false))
+		items.append(Item(text: "Work", imageName: "ic_work", selected: false))
+		items.append(Item(text: "Contacts", imageName: "ic_contacts", selected: false))
+		items.append(Item(text: "Settings", imageName: "ic_settings", selected: false))
+	}
+	
+	/// Prepares profile view.
+	private func prepareProfileView() {
+		let backgroundView: MaterialView = MaterialView()
+		backgroundView.image = UIImage(named: "ProfileSideNavBackground")
+		
+		let profileView: MaterialView = MaterialView()
+		profileView.image = UIImage(named: "Profile9")?.resize(toWidth: 72)
+		profileView.shape = .Circle
+		profileView.borderColor = MaterialColor.white
+		profileView.borderWidth = .Border3
+		
+		let nameLabel: UILabel = UILabel()
+		nameLabel.text = "Michael Smith"
+		nameLabel.textColor = MaterialColor.white
+		nameLabel.font = RobotoFont.mediumWithSize(18)
+		
+		view.addSubview(backgroundView)
+		backgroundView.translatesAutoresizingMaskIntoConstraints = false
+		MaterialLayout.alignFromTop(view, child: backgroundView)
+		MaterialLayout.alignToParentHorizontally(view, child: backgroundView)
+		MaterialLayout.height(view, child: backgroundView, height: 170)
+		
+		backgroundView.addSubview(profileView)
+		profileView.translatesAutoresizingMaskIntoConstraints = false
+		MaterialLayout.alignFromTopLeft(backgroundView, child: profileView, top: 20, left: 20)
+		MaterialLayout.size(backgroundView, child: profileView, width: 72, height: 72)
+		
+		backgroundView.addSubview(nameLabel)
+		nameLabel.translatesAutoresizingMaskIntoConstraints = false
+		MaterialLayout.alignFromBottom(backgroundView, child: nameLabel, bottom: 20)
+		MaterialLayout.alignToParentHorizontally(backgroundView, child: nameLabel, left: 20, right: 20)
+	}
+	
+	/// Prepares the tableView.
+	private func prepareTableView() {
+		tableView.registerClass(UITableViewCell.self, forCellReuseIdentifier: "Cell")
+		tableView.dataSource = self
+		tableView.delegate = self
+		tableView.separatorStyle = .None
+		
+		//		if !UIAccessibilityIsReduceTransparencyEnabled() {
+		//			tableView.backgroundColor = MaterialColor.clear
+		//			let blurEffect = UIBlurEffect(style: .Light)
+		//			let blurEffectView = UIVisualEffectView(effect: blurEffect)
+		//			tableView.backgroundView = blurEffectView
+		//
+		//			//if you want translucent vibrant table view separator lines
+		//			tableView.separatorEffect = UIVibrancyEffect(forBlurEffect: blurEffect)
+		//		}
+		
+		// Use MaterialLayout to easily align the tableView.
+		view.addSubview(tableView)
+		tableView.translatesAutoresizingMaskIntoConstraints = false
+		MaterialLayout.alignToParent(view, child: tableView, top: 170)
+	}
+}
+
+/// TableViewDataSource methods.
+extension RightViewController: UITableViewDataSource {
+	/// Determines the number of rows in the tableView.
+	func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		return items.count;
+	}
+	
+	/// Prepares the cells within the tableView.
+	func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+		let cell: UITableViewCell = tableView.dequeueReusableCellWithIdentifier("Cell", forIndexPath: indexPath) as UITableViewCell
+		cell.backgroundColor = MaterialColor.clear
+		
+		let item: Item = items[indexPath.row]
+		cell.selectionStyle = .None
+		cell.textLabel!.text = item.text
+		cell.textLabel!.font = RobotoFont.medium
+		cell.imageView!.image = UIImage(named: item.imageName)?.imageWithRenderingMode(.AlwaysTemplate)
+		cell.imageView!.tintColor = MaterialColor.cyan.darken4
+		
+		if item.selected {
+			cell.textLabel!.textColor = MaterialColor.cyan.base
+		}
+		
+		return cell
+	}
+}
+
+/// UITableViewDelegate methods.
+extension RightViewController: UITableViewDelegate {
+	/// Sets the tableView cell height.
+	func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+		return 64
+	}
+}