Commit 91c97a3b by Daniel Dahan

merged issue-209

parents 8a0d7d01 257c19c2
......@@ -52,7 +52,7 @@ Material is a growing project and will encounter changes throughout its developm
* Visit the Examples directory to see example projects using Material.
* The [Installation](https://github.com/CosmicMind/Material/wiki/Installation) page has documentation on how to run the example projects.
## A Tour
# Quick Access
#### Colors
......@@ -78,48 +78,41 @@ Material is a growing project and will encounter changes throughout its developm
#### Control
* [MaterialSwitch](#materialswitch) (New)
* [MaterialSwitch](#materialswitch)
#### Collection Management
* [Menu](#menu) (New)
* [Menu](#menu)
#### Layout
* [Grid](#grid) (New)
* [Grid](#grid)
* MaterialLayout
#### Collections
* [MaterialTableViewCell](#materialtableviewcell) (New)
* [MaterialTableViewCell](#materialtableviewcell)
#### Cards
* [CardView](#cardview) (New)
* [CardView](#cardview)
* [ImageCardView](#imagecardview)
#### Navigation
* [MenuView](#menuview) (New)
* [MenuViewController](#menuviewcontroller) (New)
* [NavigationBarView](#navigationbarview) (New)
* [NavigationBarViewController](#navigationbarviewcontroller) (New)
* [SearchBarView](#searchbarview) (New)
* [SearchBarViewController](#searchbarviewcontroller) (New)
* [MenuView](#menuview)
* [MenuViewController](#menuviewcontroller)
* [NavigationBar](#navigationbar) (New)
* [NavigationController](#navigationcontroller) (New)
* [SearchBarView](#searchbarview)
* [SearchBarViewController](#searchbarviewcontroller)
* [SideNavigationViewController](#sidenavigationviewcontroller)
#### Photo / Video Camera
* [CaptureView](#captureview)
#### Upcoming
* TabView
* TabViewController
* Scrolling Techniques
* Snackbar
* Advanced Camera / Audio Toolset & Views
* More Examples
# Explore
<a name="materialcolor"></a>
#### MaterialColor
......@@ -311,19 +304,19 @@ A MenuViewController manages UIViewControllers using a MenuView component.
![MaterialMenuViewController](http://www.cosmicmind.io/MK/MaterialMenuViewController.gif)
<a name="navigationbarview"></a>
#### NavigationBarView
<a name="navigationbar"></a>
#### NavigationBar
A NavigationBarView is a fully featured navigation bar that supports orientation changes, background images, title and detail labels, both left and right UIControl sets, and status bar settings.
A NavigationBar is a fully featured navigation bar that supports orientation changes, background images, title and detail labels, both left and right UIControl sets, and status bar settings.
![MaterialNavigationBarView](http://www.cosmicmind.io/MK/MaterialNavigationBarView.gif)
[Learn More About NavigationBarView](https://github.com/CosmicMind/Material/wiki/NavigationBarView)
<a href="#navigationbarviewcontroller"></a>
#### NavigationBarViewController
<a href="#navigationcontroller"></a>
#### NavigationController
A NavigationBarViewController manages UIViewControllers using a NavigationBarView component.
A NavigationController manages UIViewControllers using a NavigationBar component.
![MaterialNavigationBarViewController](http://www.cosmicmind.io/MK/MaterialNavigationBarViewController.gif)
......@@ -359,7 +352,16 @@ Add a new dimension of interactivity with CaptureView. CaptureView is a fully fu
[Learn More About CaptureView](https://github.com/CosmicMind/Material/wiki/CaptureView)
## License
# Upcoming
* TabView
* TabViewController
* Scrolling Techniques
* Snackbar
* Advanced Camera / Audio Toolset & Views
* More Examples
# License
Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>. All rights reserved.
......
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