Skip to content

M
Material
Commit e69ba269 by Daniel Dahan
Options

removed NavigationBarView* code

parent 4129092d
Showing with 88 additions and 531 deletions
Examples/Material.xcworkspace/contents.xcworkspacedata
...@@ -47,12 +47,6 @@ ...@@ -47,12 +47,6 @@
location = "group:Programmatic/MenuViewController/MenuViewController.xcodeproj"> location = "group:Programmatic/MenuViewController/MenuViewController.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
location = "group:Programmatic/NavigationBarView/NavigationBarView.xcodeproj">
</FileRef>
<FileRef
location = "group:Programmatic/NavigationBarViewController/NavigationBarViewController.xcodeproj">
</FileRef>
<FileRef
location = "group:Programmatic/SearchBarView/SearchBarView.xcodeproj"> location = "group:Programmatic/SearchBarView/SearchBarView.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
...@@ -87,9 +81,6 @@ ...@@ -87,9 +81,6 @@
location = "group:Storyboards/MaterialButton/MaterialButton.xcodeproj"> location = "group:Storyboards/MaterialButton/MaterialButton.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
location = "group:Storyboards/NavigationBarView/NavigationBarView.xcodeproj">
</FileRef>
<FileRef
location = "group:Storyboards/SideNavigationViewController/SideNavigationViewController.xcodeproj"> location = "group:Storyboards/SideNavigationViewController/SideNavigationViewController.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
......
Examples/Programmatic/App/App/AppDelegate.swift
...@@ -40,7 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -40,7 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch. // Override point for customization after application launch.
window = UIWindow(frame: UIScreen.mainScreen().bounds) window = UIWindow(frame: UIScreen.mainScreen().bounds)
// window!.rootViewController = SideNavigationViewController(mainViewController: AppMenuViewController(mainViewController: AppNavigationBarViewController(mainViewController: InboxViewController())), leftViewController: AppLeftViewController(), rightViewController: AppRightViewController()) // window!.rootViewController = SideNavigationViewController(mainViewController: AppMenuViewController(mainViewController: AppNavigationBarViewController(mainViewController: InboxViewController())), leftViewController: AppLeftViewController(), rightViewController: AppRightViewController())
window!.rootViewController = SideNavigationViewController(mainViewController: AppMenuViewController(mainViewController: AppNavigationController(rootViewController: FeedViewController())), leftViewController: AppLeftViewController()) window!.rootViewController = SideNavigationViewController(mainViewController: AppMenuViewController(mainViewController: AppNavigationController(rootViewController: FeedViewController())), leftViewController: AppLeftViewController(), rightViewController: AppRightViewController())
window!.makeKeyAndVisible() window!.makeKeyAndVisible()
return true return true
} }
......
Examples/Programmatic/App/App/AppLeftViewController.swift
...@@ -158,31 +158,4 @@ extension AppLeftViewController: UITableViewDelegate { ...@@ -158,31 +158,4 @@ extension AppLeftViewController: UITableViewDelegate {
func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) { func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
print("Cell selected") print("Cell selected")
} }
func tableView(tableView: UITableView, willSelectRowAtIndexPath indexPath: NSIndexPath) -> NSIndexPath? {
let item: Item = items[indexPath.row]
print(sideNavigationViewController?.mainViewController.navigationController)
/**
An example of loading a new UIViewController in the AppNavigationBarViewController
if the UIViewController is not already loaded. This is a bit of a tricky example, as
we are diving deeper into the view hierarchy to transition only the mainViewController of the
AppNavigationBarViewController.
Accessing the mainViewController of: SideNavigationViewController -> MenuViewController -> NavigationBarViewController.
*/
if let a: MenuViewController = sideNavigationViewController?.mainViewController as? MenuViewController {
if let b: NavigationBarViewController = a.mainViewController as? NavigationBarViewController {
if "Feed" == item.text && !(b.mainViewController is FeedViewController) {
b.transitionFromMainViewController(FeedViewController(), options: [.TransitionCrossDissolve]) { [weak self] _ in
self?.sideNavigationViewController?.closeLeftView()
}
} else if "Inbox" == item.text && !(b.mainViewController is InboxViewController) {
b.transitionFromMainViewController(InboxViewController(), options: [.TransitionCrossDissolve]) { [weak self] _ in
self?.sideNavigationViewController?.closeLeftView()
}
}
}
}
return indexPath
}
} }
Examples/Programmatic/App/App/AppSearchBarViewController.swift
...@@ -58,12 +58,13 @@ class AppSearchBarViewController: SearchBarViewController { ...@@ -58,12 +58,13 @@ class AppSearchBarViewController: SearchBarViewController {
/// Toggle SideSearchViewController left UIViewController. /// Toggle SideSearchViewController left UIViewController.
internal func handleBackButton() { internal func handleBackButton() {
searchBarView.textField.resignFirstResponder() searchBarView.textField.resignFirstResponder()
navigationBarViewController?.floatingViewController = nil dismissViewControllerAnimated(true, completion: nil)
} }
/// Toggle SideSearchViewController right UIViewController. /// Toggle SideSearchViewController right UIViewController.
internal func handleMoreButton() { internal func handleMoreButton() {
searchBarView.textField.resignFirstResponder() searchBarView.textField.resignFirstResponder()
print(presentingViewController?.view.layer.zPosition)
sideNavigationViewController?.enabledRightView = true sideNavigationViewController?.enabledRightView = true
sideNavigationViewController?.toggleRightView() sideNavigationViewController?.toggleRightView()
} }
......
Examples/Programmatic/App/App/FeedViewController.swift
...@@ -66,7 +66,7 @@ class FeedViewController: UIViewController { ...@@ -66,7 +66,7 @@ class FeedViewController: UIViewController {
/// Handler for searchButton. /// Handler for searchButton.
internal func handleSearchButton() { internal func handleSearchButton() {
print("handled") presentViewController(AppSearchBarViewController(mainViewController: SearchListViewController()), animated: true, completion: nil)
} }
/// Prepares view. /// Prepares view.
......
Examples/Programmatic/App/App/SearchListViewController.swift
...@@ -125,7 +125,7 @@ extension SearchListViewController: UITableViewDataSource { ...@@ -125,7 +125,7 @@ extension SearchListViewController: UITableViewDataSource {
header.addSubview(label) header.addSubview(label)
label.translatesAutoresizingMaskIntoConstraints = false label.translatesAutoresizingMaskIntoConstraints = false
MaterialLayout.alignToParent(header, child: label, left: navigationBarViewController!.navigationBarView.contentInset.left + navigationBarViewController!.navigationBarView.spacing) MaterialLayout.alignToParent(header, child: label, left: 24)
return header return header
} }
......
Examples/Programmatic/NavigationBarView/NavigationBarView.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:NavigationBarView.xcodeproj">
</FileRef>
</Workspace>
Examples/Programmatic/NavigationBarViewController/NavigationBarViewController.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:NavigationBarViewController.xcodeproj">
</FileRef>
</Workspace>
Examples/Storyboards/NavigationBarView/NavigationBarView.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:/Users/danieldahan/Dropbox/CosmicMind/Technology/Repositories/Material/Examples/Storyboards/NavigationBarView/NavigationBarView.xcodeproj">
</FileRef>
</Workspace>
Material.xcodeproj/project.pbxproj
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
96A71EBB1C6FCFA300C0C4AE /* MenuView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71E901C6FBC2200C0C4AE /* MenuView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96A71EBB1C6FCFA300C0C4AE /* MenuView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71E901C6FBC2200C0C4AE /* MenuView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96A71EC71C6FFF0500C0C4AE /* MaterialSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71EC61C6FFF0500C0C4AE /* MaterialSwitch.swift */; }; 96A71EC71C6FFF0500C0C4AE /* MaterialSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71EC61C6FFF0500C0C4AE /* MaterialSwitch.swift */; };
96A71EF61C71127100C0C4AE /* SearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71EF51C71127100C0C4AE /* SearchBarView.swift */; }; 96A71EF61C71127100C0C4AE /* SearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71EF51C71127100C0C4AE /* SearchBarView.swift */; };
96A71F301C72E41100C0C4AE /* NavigationBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71F2F1C72E41100C0C4AE /* NavigationBarViewController.swift */; };
96A71F451C74ABCB00C0C4AE /* MaterialBorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71F441C74ABCB00C0C4AE /* MaterialBorder.swift */; }; 96A71F451C74ABCB00C0C4AE /* MaterialBorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71F441C74ABCB00C0C4AE /* MaterialBorder.swift */; };
96A71FB31C764E3200C0C4AE /* StatusBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71FB21C764E3200C0C4AE /* StatusBarView.swift */; }; 96A71FB31C764E3200C0C4AE /* StatusBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71FB21C764E3200C0C4AE /* StatusBarView.swift */; };
96A71FB61C7651AA00C0C4AE /* ControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71FB01C7649F800C0C4AE /* ControlView.swift */; }; 96A71FB61C7651AA00C0C4AE /* ControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A71FB01C7649F800C0C4AE /* ControlView.swift */; };
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
96CC08351C7CCB7C0034FF84 /* StatusBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71FB21C764E3200C0C4AE /* StatusBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96CC08351C7CCB7C0034FF84 /* StatusBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71FB21C764E3200C0C4AE /* StatusBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96CC08361C7CCB7C0034FF84 /* SearchBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71EF51C71127100C0C4AE /* SearchBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96CC08361C7CCB7C0034FF84 /* SearchBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71EF51C71127100C0C4AE /* SearchBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96CC08371C7CCB7C0034FF84 /* SearchBarViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 960036141C77E1B600EBA579 /* SearchBarViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96CC08371C7CCB7C0034FF84 /* SearchBarViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 960036141C77E1B600EBA579 /* SearchBarViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96CC08381C7CCB7C0034FF84 /* NavigationBarViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A71F2F1C72E41100C0C4AE /* NavigationBarViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96CC083D1C7CF9D40034FF84 /* StatusBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC083C1C7CF9D40034FF84 /* StatusBarViewController.swift */; }; 96CC083D1C7CF9D40034FF84 /* StatusBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC083C1C7CF9D40034FF84 /* StatusBarViewController.swift */; };
96CC083E1C7CFF2A0034FF84 /* StatusBarViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC083C1C7CF9D40034FF84 /* StatusBarViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96CC083E1C7CFF2A0034FF84 /* StatusBarViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC083C1C7CF9D40034FF84 /* StatusBarViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96CC08921C7FEC170034FF84 /* MaterialCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC088B1C7FEC170034FF84 /* MaterialCollectionView.swift */; }; 96CC08921C7FEC170034FF84 /* MaterialCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC088B1C7FEC170034FF84 /* MaterialCollectionView.swift */; };
...@@ -105,7 +103,6 @@ ...@@ -105,7 +103,6 @@
96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */; }; 96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */; };
96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; }; 96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; };
96D88C3D1C1328D800B91418 /* MaterialView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C141C1328D800B91418 /* MaterialView.swift */; }; 96D88C3D1C1328D800B91418 /* MaterialView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C141C1328D800B91418 /* MaterialView.swift */; };
96D88C3E1C1328D800B91418 /* NavigationBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C151C1328D800B91418 /* NavigationBarView.swift */; };
96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C161C1328D800B91418 /* RaisedButton.swift */; }; 96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C161C1328D800B91418 /* RaisedButton.swift */; };
96D88C401C1328D800B91418 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96D88C171C1328D800B91418 /* Roboto-Bold.ttf */; }; 96D88C401C1328D800B91418 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96D88C171C1328D800B91418 /* Roboto-Bold.ttf */; };
96D88C411C1328D800B91418 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96D88C181C1328D800B91418 /* Roboto-Light.ttf */; }; 96D88C411C1328D800B91418 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 96D88C181C1328D800B91418 /* Roboto-Light.ttf */; };
...@@ -143,7 +140,6 @@ ...@@ -143,7 +140,6 @@
96D88C721C132ACC00B91418 /* MaterialTransitionAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C721C132ACC00B91418 /* MaterialTransitionAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C731C132ACC00B91418 /* MaterialAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFF1C1328D800B91418 /* MaterialAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C731C132ACC00B91418 /* MaterialAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFF1C1328D800B91418 /* MaterialAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C741C132ACC00B91418 /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C001C1328D800B91418 /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C741C132ACC00B91418 /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C001C1328D800B91418 /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C751C132AD500B91418 /* NavigationBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C151C1328D800B91418 /* NavigationBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96DBA7361C61198400844821 /* Material+UIImage+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DBA7351C61198400844821 /* Material+UIImage+Color.swift */; }; 96DBA7361C61198400844821 /* Material+UIImage+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DBA7351C61198400844821 /* Material+UIImage+Color.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -186,7 +182,6 @@ ...@@ -186,7 +182,6 @@
96A71E901C6FBC2200C0C4AE /* MenuView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = "<group>"; }; 96A71E901C6FBC2200C0C4AE /* MenuView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = "<group>"; };
96A71EC61C6FFF0500C0C4AE /* MaterialSwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialSwitch.swift; sourceTree = "<group>"; }; 96A71EC61C6FFF0500C0C4AE /* MaterialSwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialSwitch.swift; sourceTree = "<group>"; };
96A71EF51C71127100C0C4AE /* SearchBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBarView.swift; sourceTree = "<group>"; }; 96A71EF51C71127100C0C4AE /* SearchBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBarView.swift; sourceTree = "<group>"; };
96A71F2F1C72E41100C0C4AE /* NavigationBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationBarViewController.swift; sourceTree = "<group>"; };
96A71F441C74ABCB00C0C4AE /* MaterialBorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialBorder.swift; sourceTree = "<group>"; }; 96A71F441C74ABCB00C0C4AE /* MaterialBorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialBorder.swift; sourceTree = "<group>"; };
96A71FB01C7649F800C0C4AE /* ControlView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlView.swift; sourceTree = "<group>"; }; 96A71FB01C7649F800C0C4AE /* ControlView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlView.swift; sourceTree = "<group>"; };
96A71FB21C764E3200C0C4AE /* StatusBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarView.swift; sourceTree = "<group>"; }; 96A71FB21C764E3200C0C4AE /* StatusBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarView.swift; sourceTree = "<group>"; };
...@@ -227,7 +222,6 @@ ...@@ -227,7 +222,6 @@
96D88C111C1328D800B91418 /* MaterialTextLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTextLayer.swift; sourceTree = "<group>"; }; 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTextLayer.swift; sourceTree = "<group>"; };
96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTransitionAnimation.swift; sourceTree = "<group>"; }; 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTransitionAnimation.swift; sourceTree = "<group>"; };
96D88C141C1328D800B91418 /* MaterialView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialView.swift; sourceTree = "<group>"; }; 96D88C141C1328D800B91418 /* MaterialView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialView.swift; sourceTree = "<group>"; };
96D88C151C1328D800B91418 /* NavigationBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationBarView.swift; sourceTree = "<group>"; };
96D88C161C1328D800B91418 /* RaisedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RaisedButton.swift; sourceTree = "<group>"; }; 96D88C161C1328D800B91418 /* RaisedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RaisedButton.swift; sourceTree = "<group>"; };
96D88C171C1328D800B91418 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; }; 96D88C171C1328D800B91418 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
96D88C181C1328D800B91418 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; }; 96D88C181C1328D800B91418 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; };
...@@ -261,8 +255,6 @@ ...@@ -261,8 +255,6 @@
9626C2DA1C794FA5007CA8E0 /* NavigationBar */ = { 9626C2DA1C794FA5007CA8E0 /* NavigationBar */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96D88C151C1328D800B91418 /* NavigationBarView.swift */,
96A71F2F1C72E41100C0C4AE /* NavigationBarViewController.swift */,
96334EF71C8B84880083986B /* NavigationBar.swift */, 96334EF71C8B84880083986B /* NavigationBar.swift */,
96334EF91C8B849A0083986B /* NavigationController.swift */, 96334EF91C8B849A0083986B /* NavigationController.swift */,
); );
...@@ -566,7 +558,6 @@ ...@@ -566,7 +558,6 @@
isa = PBXHeadersBuildPhase; isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96D88C751C132AD500B91418 /* NavigationBarView.swift in Headers */,
96D88C661C132ACB00B91418 /* SideNavigationViewController.swift in Headers */, 96D88C661C132ACB00B91418 /* SideNavigationViewController.swift in Headers */,
96D88C671C132ACB00B91418 /* MaterialPulseView.swift in Headers */, 96D88C671C132ACB00B91418 /* MaterialPulseView.swift in Headers */,
96D88C681C132ACB00B91418 /* MaterialView.swift in Headers */, 96D88C681C132ACB00B91418 /* MaterialView.swift in Headers */,
...@@ -620,7 +611,6 @@ ...@@ -620,7 +611,6 @@
96CC08351C7CCB7C0034FF84 /* StatusBarView.swift in Headers */, 96CC08351C7CCB7C0034FF84 /* StatusBarView.swift in Headers */,
96CC08361C7CCB7C0034FF84 /* SearchBarView.swift in Headers */, 96CC08361C7CCB7C0034FF84 /* SearchBarView.swift in Headers */,
96CC08371C7CCB7C0034FF84 /* SearchBarViewController.swift in Headers */, 96CC08371C7CCB7C0034FF84 /* SearchBarViewController.swift in Headers */,
96CC08381C7CCB7C0034FF84 /* NavigationBarViewController.swift in Headers */,
96CC083E1C7CFF2A0034FF84 /* StatusBarViewController.swift in Headers */, 96CC083E1C7CFF2A0034FF84 /* StatusBarViewController.swift in Headers */,
965626431C8757B4004ADEF7 /* MaterialSpacing.swift in Headers */, 965626431C8757B4004ADEF7 /* MaterialSpacing.swift in Headers */,
965626441C8757B4004ADEF7 /* MaterialDevice.swift in Headers */, 965626441C8757B4004ADEF7 /* MaterialDevice.swift in Headers */,
...@@ -765,7 +755,6 @@ ...@@ -765,7 +755,6 @@
96A71EC71C6FFF0500C0C4AE /* MaterialSwitch.swift in Sources */, 96A71EC71C6FFF0500C0C4AE /* MaterialSwitch.swift in Sources */,
96CC08951C7FEC170034FF84 /* MaterialCollectionViewDelegate.swift in Sources */, 96CC08951C7FEC170034FF84 /* MaterialCollectionViewDelegate.swift in Sources */,
96CC08971C7FEC170034FF84 /* MaterialDataSourceItem.swift in Sources */, 96CC08971C7FEC170034FF84 /* MaterialDataSourceItem.swift in Sources */,
96D88C3E1C1328D800B91418 /* NavigationBarView.swift in Sources */,
96D88C221C1328D800B91418 /* FabButton.swift in Sources */, 96D88C221C1328D800B91418 /* FabButton.swift in Sources */,
96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */, 96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */,
65FDC2EB1C66858A00103AC2 /* Menu.swift in Sources */, 65FDC2EB1C66858A00103AC2 /* Menu.swift in Sources */,
...@@ -779,7 +768,6 @@ ...@@ -779,7 +768,6 @@
96CC08941C7FEC170034FF84 /* MaterialCollectionViewDataSource.swift in Sources */, 96CC08941C7FEC170034FF84 /* MaterialCollectionViewDataSource.swift in Sources */,
96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */, 96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */,
96D88C281C1328D800B91418 /* MaterialAnimation.swift in Sources */, 96D88C281C1328D800B91418 /* MaterialAnimation.swift in Sources */,
96A71F301C72E41100C0C4AE /* NavigationBarViewController.swift in Sources */,
96334F011C8B8BD30083986B /* Material+UIImage+Blank.swift in Sources */, 96334F011C8B8BD30083986B /* Material+UIImage+Blank.swift in Sources */,
960B232E1C383EAA00E96216 /* Material+UIImage.swift in Sources */, 960B232E1C383EAA00E96216 /* Material+UIImage.swift in Sources */,
96334F031C8BA14C0083986B /* Material+Obj-C.swift in Sources */, 96334F031C8BA14C0083986B /* Material+Obj-C.swift in Sources */,
......
Sources/NavigationBar.swift
...@@ -30,6 +30,18 @@ ...@@ -30,6 +30,18 @@
import UIKit import UIKit
public extension UINavigationBar {
/// Device status bar style.
public var statusBarStyle: UIStatusBarStyle {
get {
return MaterialDevice.statusBarStyle
}
set(value) {
MaterialDevice.statusBarStyle = value
}
}
}
public class NavigationBar : UINavigationBar { public class NavigationBar : UINavigationBar {
/// Reference to the backButton. /// Reference to the backButton.
public private(set) lazy var backButton: FlatButton = FlatButton() public private(set) lazy var backButton: FlatButton = FlatButton()
...@@ -233,27 +245,6 @@ public class NavigationBar : UINavigationBar { ...@@ -233,27 +245,6 @@ public class NavigationBar : UINavigationBar {
} }
} }
/// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? {
get {
return layer.shadowPath
}
set(value) {
layer.shadowPath = value
}
}
/// Enables automatic shadowPath sizing.
public var shadowPathAutoSizeEnabled: Bool = false {
didSet {
if shadowPathAutoSizeEnabled {
layoutShadowPath()
} else {
shadowPath = nil
}
}
}
/** /**
A property that sets the shadowOffset, shadowOpacity, and shadowRadius A property that sets the shadowOffset, shadowOpacity, and shadowRadius
for the backing layer. This is the preferred method of setting depth for the backing layer. This is the preferred method of setting depth
...@@ -265,7 +256,6 @@ public class NavigationBar : UINavigationBar { ...@@ -265,7 +256,6 @@ public class NavigationBar : UINavigationBar {
shadowOffset = value.offset shadowOffset = value.offset
shadowOpacity = value.opacity shadowOpacity = value.opacity
shadowRadius = value.radius shadowRadius = value.radius
layoutShadowPath()
} }
} }
...@@ -285,7 +275,6 @@ public class NavigationBar : UINavigationBar { ...@@ -285,7 +275,6 @@ public class NavigationBar : UINavigationBar {
} }
set(value) { set(value) {
layer.cornerRadius = value layer.cornerRadius = value
layoutShadowPath()
} }
} }
...@@ -368,12 +357,16 @@ public class NavigationBar : UINavigationBar { ...@@ -368,12 +357,16 @@ public class NavigationBar : UINavigationBar {
super.layoutSublayersOfLayer(layer) super.layoutSublayersOfLayer(layer)
if self.layer == layer { if self.layer == layer {
layoutVisualLayer() layoutVisualLayer()
layoutShadowPath()
} }
} }
public override func layoutSubviews() { public override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
/*
When rotating the device orientation, this adjusts the layout
of the titleView subviews.
*/
topItem?.titleView?.grid.reloadLayout() topItem?.titleView?.grid.reloadLayout()
} }
...@@ -392,7 +385,7 @@ public class NavigationBar : UINavigationBar { ...@@ -392,7 +385,7 @@ public class NavigationBar : UINavigationBar {
} }
if nil == item.titleView { if nil == item.titleView {
item.titleView = UIView(frame: CGRectMake(0, 2, 2000, 40)) item.titleView = UIView(frame: CGRectMake(0, 0, 2000, 44))
item.titleView!.backgroundColor = nil item.titleView!.backgroundColor = nil
item.titleView!.grid.axis.direction = .Vertical item.titleView!.grid.axis.direction = .Vertical
} }
...@@ -402,9 +395,11 @@ public class NavigationBar : UINavigationBar { ...@@ -402,9 +395,11 @@ public class NavigationBar : UINavigationBar {
// TitleView alignment. // TitleView alignment.
if let t: UILabel = item.titleLabel { if let t: UILabel = item.titleLabel {
t.grid.rows = 1 t.grid.rows = 1
t.backgroundColor = MaterialColor.red.accent1
item.titleView!.addSubview(t) item.titleView!.addSubview(t)
item.titleView!.grid.views?.append(t) item.titleView!.grid.views?.append(t)
if let d: UILabel = item.detailLabel { if let d: UILabel = item.detailLabel {
d.backgroundColor = MaterialColor.red.accent3
t.font = t.font.fontWithSize(17) t.font = t.font.fontWithSize(17)
d.grid.rows = 1 d.grid.rows = 1
d.font = d.font.fontWithSize(12) d.font = d.font.fontWithSize(12)
...@@ -446,8 +441,6 @@ public class NavigationBar : UINavigationBar { ...@@ -446,8 +441,6 @@ public class NavigationBar : UINavigationBar {
backButtonImage = nil backButtonImage = nil
backgroundColor = MaterialColor.white backgroundColor = MaterialColor.white
depth = .Depth1 depth = .Depth1
spacingPreset = .Spacing2
contentInset = UIEdgeInsetsMake(8, 0, 8, 0)
prepareVisualLayer() prepareVisualLayer()
prepareBackButton() prepareBackButton()
} }
...@@ -472,168 +465,88 @@ public class NavigationBar : UINavigationBar { ...@@ -472,168 +465,88 @@ public class NavigationBar : UINavigationBar {
backButton.setImage(backButtonImage, forState: .Normal) backButton.setImage(backButtonImage, forState: .Normal)
backButton.setImage(backButtonImage, forState: .Highlighted) backButton.setImage(backButtonImage, forState: .Highlighted)
} }
/// Sets the shadow path.
internal func layoutShadowPath() {
if shadowPathAutoSizeEnabled {
if .None == depth {
shadowPath = nil
} else if nil == shadowPath {
shadowPath = UIBezierPath(roundedRect: bounds, cornerRadius: cornerRadius).CGPath
}
}
}
} }
/// A memory reference to the NavigationBarControls instance for UINavigationBar extensions. /// A memory reference to the NavigationItem instance for UINavigationBar extensions.
private var NavigationItemControlsKey: UInt8 = 0 private var NavigationItemKey: UInt8 = 0
public class NavigationItemControls { public class NavigationItem {
/// Inset. /// Inset.
public var inset: CGFloat = -16 public var inset: CGFloat = -16
/// Left controls.
public var leftControls: Array<UIControl>?
/// Right controls.
public var rightControls: Array<UIControl>?
}
/// A memory reference to the NavigationItemLabels instance for UINavigationItem extensions.
private var NavigationItemLabelsKey: UInt8 = 0
public class NavigationItemLabels {
/// Title label. /// Title label.
public var titleLabel: UILabel? public var titleLabel: UILabel?
/// Detail label. /// Detail label.
public var detailLabel: UILabel? public var detailLabel: UILabel?
/// Left controls.
public var leftControls: Array<UIControl>?
/// Right controls.
public var rightControls: Array<UIControl>?
} }
public extension UINavigationItem { public extension UINavigationItem {
/// NavigationBarControls reference. /// NavigationBarControls reference.
public internal(set) var labels: NavigationItemLabels { public internal(set) var item: NavigationItem {
get { get {
return MaterialAssociatedObject(self, key: &NavigationItemLabelsKey) { return MaterialAssociatedObject(self, key: &NavigationItemKey) {
return NavigationItemLabels() return NavigationItem()
} }
} }
set(value) { set(value) {
MaterialAssociateObject(self, key: &NavigationItemLabelsKey, value: value) MaterialAssociateObject(self, key: &NavigationItemKey, value: value)
} }
} }
/// Title Label. /// Inset.
public var titleLabel: UILabel? { public var inset: CGFloat {
get {
return labels.titleLabel
}
set(value) {
labels.titleLabel = value
}
}
/// Detail Label.
public var detailLabel: UILabel? {
get { get {
return labels.detailLabel return item.inset
} }
set(value) { set(value) {
labels.detailLabel = value item.inset = value
} }
} }
/// NavigationBarControls reference. /// Title Label.
public internal(set) var controls: NavigationItemControls { public var titleLabel: UILabel? {
get { get {
return MaterialAssociatedObject(self, key: &NavigationItemControlsKey) { return item.titleLabel
return NavigationItemControls()
}
} }
set(value) { set(value) {
MaterialAssociateObject(self, key: &NavigationItemControlsKey, value: value) item.titleLabel = value
} }
} }
/// Inset. /// Detail Label.
public var inset: CGFloat { public var detailLabel: UILabel? {
get { get {
return controls.inset return item.detailLabel
} }
set(value) { set(value) {
controls.inset = value item.detailLabel = value
} }
} }
/// Left side UIControls. /// Left side UIControls.
public var leftControls: Array<UIControl>? { public var leftControls: Array<UIControl>? {
get { get {
return controls.leftControls return item.leftControls
} }
set(value) { set(value) {
controls.leftControls = value item.leftControls = value
} }
} }
/// Right side UIControls. /// Right side UIControls.
public var rightControls: Array<UIControl>? { public var rightControls: Array<UIControl>? {
get { get {
return controls.rightControls return item.rightControls
}
set(value) {
controls.rightControls = value
}
}
}
public extension UINavigationBar {
/// Device status bar style.
public var statusBarStyle: UIStatusBarStyle {
get {
return MaterialDevice.statusBarStyle
}
set(value) {
MaterialDevice.statusBarStyle = value
}
}
/// A preset wrapper around contentInset.
public var contentInsetPreset: MaterialEdgeInset {
get {
return grid.contentInsetPreset
}
set(value) {
grid.contentInsetPreset = value
}
}
/// A wrapper around grid.contentInset.
public var contentInset: UIEdgeInsets {
get {
return grid.contentInset
}
set(value) {
grid.contentInset = value
}
}
/// A preset wrapper around spacing.
public var spacingPreset: MaterialSpacing {
get {
return grid.spacingPreset
}
set(value) {
grid.spacingPreset = value
}
}
/// A wrapper around grid.spacing.
public var spacing: CGFloat {
get {
return grid.spacing
} }
set(value) { set(value) {
grid.spacing = value item.rightControls = value
} }
} }
} }
Sources/NavigationBarView.swift deleted 100644 → 0
/*
* 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.
*/
import UIKit
public class NavigationBarView : StatusBarView {
/// Title label.
public var titleLabel: UILabel? {
didSet {
if let v: UILabel = titleLabel {
contentView.addSubview(v)
}
layoutSubviews()
}
}
/// Detail label.
public var detailLabel: UILabel? {
didSet {
if let v: UILabel = detailLabel {
contentView.addSubview(v)
}
layoutSubviews()
}
}
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectZero)
}
/**
A convenience initializer with parameter settings.
- Parameter titleLabel: UILabel for the title.
- Parameter detailLabel: UILabel for the details.
- Parameter leftControls: An Array of UIControls that go on the left side.
- Parameter rightControls: An Array of UIControls that go on the right side.
*/
public convenience init?(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, leftControls: Array<UIControl>? = nil, rightControls: Array<UIControl>? = nil) {
self.init(frame: CGRectZero)
prepareProperties(titleLabel, detailLabel: detailLabel, leftControls: leftControls, rightControls: rightControls)
}
public override func layoutSubviews() {
super.layoutSubviews()
if willRenderView {
// TitleView alignment.
if let v: UILabel = titleLabel {
if let d: UILabel = detailLabel {
v.grid.rows = 2
v.font = v.font.fontWithSize(17)
d.grid.rows = 2
d.font = d.font.fontWithSize(12)
contentView.grid.axis.rows = 3
contentView.grid.spacing = -8
contentView.grid.contentInset.top = -8
} else {
v.grid.rows = 1
v.font = v.font?.fontWithSize(20)
contentView.grid.axis.rows = 1
contentView.grid.spacing = 0
contentView.grid.contentInset.top = 0
}
}
contentView.grid.views = []
if let v: UILabel = titleLabel {
contentView.grid.views?.append(v)
}
if let v: UILabel = detailLabel {
contentView.grid.views?.append(v)
}
grid.reloadLayout()
contentView.grid.reloadLayout()
}
}
/// Prepares the contentView.
public override func prepareContentView() {
super.prepareContentView()
contentView.grid.axis.direction = .Vertical
}
/**
Used to trigger property changes that initializers avoid.
- Parameter titleLabel: UILabel for the title.
- Parameter detailLabel: UILabel for the details.
- Parameter leftControls: An Array of UIControls that go on the left side.
- Parameter rightControls: An Array of UIControls that go on the right side.
*/
internal func prepareProperties(titleLabel: UILabel?, detailLabel: UILabel?, leftControls: Array<UIControl>?, rightControls: Array<UIControl>?) {
prepareProperties(leftControls, rightControls: rightControls)
self.titleLabel = titleLabel
self.detailLabel = detailLabel
}
}
Sources/NavigationBarViewController.swift deleted 100644 → 0
/*
* 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.
*/
import UIKit
public extension UIViewController {
/**
A convenience property that provides access to the NavigationBarViewController.
This is the recommended method of accessing the NavigationBarViewController
through child UIViewControllers.
*/
public var navigationBarViewController: NavigationBarViewController? {
var viewController: UIViewController? = self
while nil != viewController {
if viewController is NavigationBarViewController {
return viewController as? NavigationBarViewController
}
viewController = viewController?.parentViewController
}
return nil
}
}
@objc(NavigationBarViewControllerDelegate)
public protocol NavigationBarViewControllerDelegate : MaterialDelegate {
/// Delegation method that executes when the floatingViewController will open.
optional func navigationBarViewControllerWillOpenFloatingViewController(navigationBarViewController: NavigationBarViewController)
/// Delegation method that executes when the floatingViewController will close.
optional func navigationBarViewControllerWillCloseFloatingViewController(navigationBarViewController: NavigationBarViewController)
/// Delegation method that executes when the floatingViewController did open.
optional func navigationBarViewControllerDidOpenFloatingViewController(navigationBarViewController: NavigationBarViewController)
/// Delegation method that executes when the floatingViewController did close.
optional func navigationBarViewControllerDidCloseFloatingViewController(navigationBarViewController: NavigationBarViewController)
}
@objc(NavigationBarViewController)
public class NavigationBarViewController: StatusBarViewController {
/// The height of the StatusBar.
public override var heightForStatusBar: CGFloat {
get {
return navigationBarView.heightForStatusBar
}
set(value) {
navigationBarView.heightForStatusBar = value
}
}
/// The height when in Portrait orientation mode.
public override var heightForPortraitOrientation: CGFloat {
get {
return navigationBarView.heightForPortraitOrientation
}
set(value) {
navigationBarView.heightForPortraitOrientation = value
}
}
/// The height when in Landscape orientation mode.
public override var heightForLandscapeOrientation: CGFloat {
get {
return navigationBarView.heightForLandscapeOrientation
}
set(value) {
navigationBarView.heightForLandscapeOrientation = value
}
}
/// Internal reference to the floatingViewController.
private var internalFloatingViewController: UIViewController?
/// Reference to the NavigationBarView.
public private(set) lazy var navigationBarView: NavigationBarView = NavigationBarView()
/// Delegation handler.
public weak var delegate: NavigationBarViewControllerDelegate?
/// A floating UIViewController.
public var floatingViewController: UIViewController? {
get {
return internalFloatingViewController
}
set(value) {
if let v: UIViewController = internalFloatingViewController {
v.view.layer.rasterizationScale = MaterialDevice.scale
v.view.layer.shouldRasterize = true
delegate?.navigationBarViewControllerWillCloseFloatingViewController?(self)
internalFloatingViewController = nil
UIView.animateWithDuration(0.5,
animations: { [unowned self] in
v.view.center.y = 2 * self.view.bounds.height
self.navigationBarView.alpha = 1
self.mainViewController.view.alpha = 1
}) { [unowned self] _ in
v.willMoveToParentViewController(nil)
v.view.removeFromSuperview()
v.removeFromParentViewController()
v.view.layer.shouldRasterize = false
self.userInteractionEnabled = true
self.navigationBarView.userInteractionEnabled = true
dispatch_async(dispatch_get_main_queue()) { [unowned self] in
self.delegate?.navigationBarViewControllerDidCloseFloatingViewController?(self)
}
}
}
if let v: UIViewController = value {
// Add the noteViewController! to the view.
addChildViewController(v)
v.view.frame = view.bounds
v.view.center.y = 2 * view.bounds.height
v.view.hidden = true
view.insertSubview(v.view, aboveSubview: navigationBarView)
v.view.layer.zPosition = 1500
v.didMoveToParentViewController(self)
// Animate the noteButton out and the noteViewController! in.
v.view.hidden = false
v.view.layer.rasterizationScale = MaterialDevice.scale
v.view.layer.shouldRasterize = true
view.layer.rasterizationScale = MaterialDevice.scale
view.layer.shouldRasterize = true
internalFloatingViewController = v
userInteractionEnabled = false
navigationBarView.userInteractionEnabled = false
delegate?.navigationBarViewControllerWillOpenFloatingViewController?(self)
UIView.animateWithDuration(0.5,
animations: { [unowned self] in
v.view.center.y = self.view.bounds.height / 2
self.navigationBarView.alpha = 0.5
self.mainViewController.view.alpha = 0.5
}) { [unowned self] _ in
v.view.layer.shouldRasterize = false
self.view.layer.shouldRasterize = false
dispatch_async(dispatch_get_main_queue()) { [unowned self] in
self.delegate?.navigationBarViewControllerDidOpenFloatingViewController?(self)
}
}
}
}
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepareView method
to initialize property values and other setup operations.
The super.prepareView method should always be called immediately
when subclassing.
*/
public override func prepareView() {
super.prepareView()
prepareNavigationBarView()
}
/// Prepares the NavigationBarView.
private func prepareNavigationBarView() {
navigationBarView.zPosition = 1000
view.addSubview(navigationBarView)
}
}
Sources/NavigationController.swift
...@@ -31,14 +31,27 @@ ...@@ -31,14 +31,27 @@
import UIKit import UIKit
public class NavigationController : UINavigationController { public class NavigationController : UINavigationController {
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) { public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder) super.init(coder: aDecoder)
} }
/**
An initializer that initializes the object with an Optional nib and bundle.
- Parameter nibNameOrNil: An Optional String for the nib.
- Parameter bundle: An Optional NSBundle where the nib is located.
*/
public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) { public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
} }
/**
An initializer that initializes the object with a rootViewController.
- Parameter rootViewController: A UIViewController for the rootViewController.
*/
public override init(rootViewController: UIViewController) { public override init(rootViewController: UIViewController) {
super.init(navigationBarClass: NavigationBar.self, toolbarClass: nil) super.init(navigationBarClass: NavigationBar.self, toolbarClass: nil)
setViewControllers([rootViewController], animated: false) setViewControllers([rootViewController], animated: false)
...@@ -46,26 +59,31 @@ public class NavigationController : UINavigationController { ...@@ -46,26 +59,31 @@ public class NavigationController : UINavigationController {
public override func viewDidLoad() { public override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
// This ensures the panning gesture is available when going back between views.
interactivePopGestureRecognizer?.delegate = nil interactivePopGestureRecognizer?.delegate = nil
} }
public override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
navigationBar.layoutSubviews()
}
public override func viewDidAppear(animated: Bool) { public override func viewDidAppear(animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
if let v: UINavigationItem = navigationBar.topItem { if let v: UINavigationItem = navigationBar.topItem {
v.title = "" prepareTitle(v)
(navigationBar as? NavigationBar)?.layoutNavigationItem(v) (navigationBar as? NavigationBar)?.layoutNavigationItem(v)
} }
} }
/**
Delegation method that is called when a new UINavigationItem is about to be pushed.
This is used to prepare the transitions between UIViewControllers on the stack.
- Parameter navigationBar: A UINavigationBar that is used in the NavigationController.
- Parameter item: The UINavigationItem that will be pushed on the stack.
- Returns: A Boolean value that indicates whether to push the item on to the stack or not.
True is yes, false is no.
*/
public func navigationBar(navigationBar: UINavigationBar, shouldPushItem item: UINavigationItem) -> Bool { public func navigationBar(navigationBar: UINavigationBar, shouldPushItem item: UINavigationItem) -> Bool {
item.title = ""
item.setHidesBackButton(true, animated: false)
if let v: NavigationBar = navigationBar as? NavigationBar { if let v: NavigationBar = navigationBar as? NavigationBar {
prepareTitle(item)
item.setHidesBackButton(true, animated: false)
if var c: Array<UIControl> = item.leftControls { if var c: Array<UIControl> = item.leftControls {
c.append(v.backButton) c.append(v.backButton)
item.leftControls = c item.leftControls = c
...@@ -79,7 +97,15 @@ public class NavigationController : UINavigationController { ...@@ -79,7 +97,15 @@ public class NavigationController : UINavigationController {
return true return true
} }
/// Handler for the back button.
internal func handleBackButton() { internal func handleBackButton() {
popViewControllerAnimated(true) popViewControllerAnimated(true)
} }
/// Prepares the title if it's value is nil.
private func prepareTitle(item: UINavigationItem) {
if nil == item.title {
item.title = ""
}
}
} }
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