Skip to content

M
Material
Commit 7d4f90e2 by Daniel Dahan
Options

prepare for release

parent 58089e3d
Showing with 21 additions and 23 deletions
Examples/Programmatic/NavigationBarView/NavigationBarView/ViewController.swift
...@@ -108,7 +108,7 @@ class ViewController: UIViewController { ...@@ -108,7 +108,7 @@ class ViewController: UIViewController {
/// NavigationBarViewDelegate methods. /// NavigationBarViewDelegate methods.
extension ViewController: NavigationBarViewDelegate { extension ViewController: NavigationBarViewDelegate {
func navigationBarViewLayoutChanged(navigationBarView: NavigationBarView) { func navigationBarViewDidChangeLayout(navigationBarView: NavigationBarView) {
print("Updated Frame: \(navigationBarView.frame)") print("Updated Frame: \(navigationBarView.frame)")
} }
} }
......
Examples/Programmatic/SearchBarView/SearchBarView/ViewController.swift
...@@ -98,7 +98,7 @@ class ViewController: UIViewController { ...@@ -98,7 +98,7 @@ class ViewController: UIViewController {
/// SearchBarViewDelegate methods. /// SearchBarViewDelegate methods.
extension ViewController: SearchBarViewDelegate { extension ViewController: SearchBarViewDelegate {
func searchBarViewLayoutChanged(searchBarView: SearchBarView) { func searchBarViewDidChangeLayout(searchBarView: SearchBarView) {
print("Updated Frame: \(searchBarView.frame)") print("Updated Frame: \(searchBarView.frame)")
} }
} }
......
Examples/Storyboards/NavigationBarView/NavigationBarView.xcodeproj/project.pbxproj
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
96A71F4C1C74B1AB00C0C4AE /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96A71F4B1C74B1AB00C0C4AE /* Material.framework */; };
96A71F4D1C74B1AB00C0C4AE /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96A71F4B1C74B1AB00C0C4AE /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9ABEC5151C15085400F6895E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABEC5141C15085400F6895E /* AppDelegate.swift */; }; 9ABEC5151C15085400F6895E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABEC5141C15085400F6895E /* AppDelegate.swift */; };
9ABEC5171C15085400F6895E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABEC5161C15085400F6895E /* ViewController.swift */; }; 9ABEC5171C15085400F6895E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABEC5161C15085400F6895E /* ViewController.swift */; };
9ABEC51A1C15085400F6895E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9ABEC5181C15085400F6895E /* Main.storyboard */; }; 9ABEC51A1C15085400F6895E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9ABEC5181C15085400F6895E /* Main.storyboard */; };
...@@ -23,7 +21,6 @@ ...@@ -23,7 +21,6 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
96A71F4D1C74B1AB00C0C4AE /* Material.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -31,7 +28,6 @@ ...@@ -31,7 +28,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
96A71F4B1C74B1AB00C0C4AE /* 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>"; };
9ABEC5111C15085400F6895E /* NavigationBarView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationBarView.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9ABEC5111C15085400F6895E /* NavigationBarView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationBarView.app; sourceTree = BUILT_PRODUCTS_DIR; };
9ABEC5141C15085400F6895E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 9ABEC5141C15085400F6895E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9ABEC5161C15085400F6895E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 9ABEC5161C15085400F6895E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
...@@ -46,7 +42,6 @@ ...@@ -46,7 +42,6 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96A71F4C1C74B1AB00C0C4AE /* Material.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -56,7 +51,6 @@ ...@@ -56,7 +51,6 @@
9ABEC5081C15085400F6895E = { 9ABEC5081C15085400F6895E = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96A71F4B1C74B1AB00C0C4AE /* Material.framework */,
9ABEC5131C15085400F6895E /* NavigationBarView */, 9ABEC5131C15085400F6895E /* NavigationBarView */,
9ABEC5121C15085400F6895E /* Products */, 9ABEC5121C15085400F6895E /* Products */,
); );
......
Examples/Storyboards/NavigationBarView/NavigationBarView/ViewController.swift
...@@ -35,13 +35,14 @@ class ViewController: UIViewController { ...@@ -35,13 +35,14 @@ class ViewController: UIViewController {
@IBOutlet weak var navigationBarView: NavigationBarView! @IBOutlet weak var navigationBarView: NavigationBarView!
/// ************* This needs to be attached to the Storyboard. *************
@IBOutlet weak var navigationBarViewHeightConstraint: NSLayoutConstraint? @IBOutlet weak var navigationBarViewHeightConstraint: NSLayoutConstraint?
override func willRotateToInterfaceOrientation(toInterfaceOrientation: UIInterfaceOrientation, duration: NSTimeInterval) { override func willRotateToInterfaceOrientation(toInterfaceOrientation: UIInterfaceOrientation, duration: NSTimeInterval) {
// if landscape // if landscape
if UIInterfaceOrientationIsLandscape(toInterfaceOrientation) { if UIInterfaceOrientationIsLandscape(toInterfaceOrientation) {
navigationBarViewHeightConstraint?.constant = 44 navigationBarViewHeightConstraint?.constant = 44
} else { // else portrait } else {
navigationBarViewHeightConstraint?.constant = 64 navigationBarViewHeightConstraint?.constant = 64
} }
} }
......
Material.xcodeproj/project.pbxproj
...@@ -291,6 +291,7 @@ ...@@ -291,6 +291,7 @@
96D88C091C1328D800B91418 /* Material.h */, 96D88C091C1328D800B91418 /* Material.h */,
96D88C501C132A2C00B91418 /* Extensions */, 96D88C501C132A2C00B91418 /* Extensions */,
96D88C541C132A7700B91418 /* Navigation */, 96D88C541C132A7700B91418 /* Navigation */,
96A71EF71C71134200C0C4AE /* Search */,
96D88C531C132A6900B91418 /* View */, 96D88C531C132A6900B91418 /* View */,
96D88C521C132A5700B91418 /* Layout */, 96D88C521C132A5700B91418 /* Layout */,
96D88C511C132A4200B91418 /* Label */, 96D88C511C132A4200B91418 /* Label */,
...@@ -307,7 +308,6 @@ ...@@ -307,7 +308,6 @@
965C58BD1C6B8D3300CFB4E1 /* Grid */, 965C58BD1C6B8D3300CFB4E1 /* Grid */,
96A71E921C6FBC2900C0C4AE /* Menu */, 96A71E921C6FBC2900C0C4AE /* Menu */,
96A71EC51C6FFEF300C0C4AE /* Switch */, 96A71EC51C6FFEF300C0C4AE /* Switch */,
96A71EF71C71134200C0C4AE /* Search */,
); );
path = Sources; path = Sources;
sourceTree = "<group>"; sourceTree = "<group>";
......
README.md
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Express your creativity with Material, an animation and graphics framework for Google's Material Design and Apple's Flat UI in Swift. Express your creativity with Material, an animation and graphics framework for Google's Material Design and Apple's Flat UI in Swift.
![MaterialMockup](http://www.cosmicmind.io/MK/MaterialMockup.png) ![MaterialApp](http://www.cosmicmind.io/MK/MaterialApp.gif)
## Notice ## Notice
...@@ -21,14 +21,17 @@ Our standards look to follow Apple's measurement guides, while providing both Ap ...@@ -21,14 +21,17 @@ Our standards look to follow Apple's measurement guides, while providing both Ap
- [x] Layout Library To Simplify AutoLayout - [x] Layout Library To Simplify AutoLayout
- [x] Base Material Layers & Material Views To Create New UI Components - [x] Base Material Layers & Material Views To Create New UI Components
- [x] Side Navigation View Controller - [x] Side Navigation View Controller
- [x] Navigation Bar View - [x] Navigation Bar View & Controller
- [x] Search Bar View
- [x] Material Buttons - [x] Material Buttons
- [x] Material Switch
- [x] Material Card Views - [x] Material Card Views
- [x] Menu Toolset To Create Animated Menus - [x] Menu Toolset To Create Animated Menus
- [x] Camera / Video Extension With Extensive Functionality - [x] Camera / Video Extension With Extensive Functionality
- [x] Animation Extension To Create Intricate Animations - [x] Animation Extension To Create Intricate Animations
- [x] Complete Material Color Library - [x] Complete Material Color Library
- [x] Example Projects - [x] Example Projects
- [x] And More...
## Requirements ## Requirements
...@@ -58,8 +61,6 @@ Material is a growing project and will encounter changes throughout its developm ...@@ -58,8 +61,6 @@ Material is a growing project and will encounter changes throughout its developm
* Visit the Examples directory to see example projects using Material. * Visit the Examples directory to see example projects using Material.
![MaterialApp](http://www.cosmicmind.io/MK/MaterialApp.gif)
## A Tour ## A Tour
* [MaterialColor](#materialcolor) * [MaterialColor](#materialcolor)
...@@ -76,7 +77,7 @@ Material is a growing project and will encounter changes throughout its developm ...@@ -76,7 +77,7 @@ Material is a growing project and will encounter changes throughout its developm
* [Grid](#grid) (New) * [Grid](#grid) (New)
* [MaterialTableViewCell](#materialtableviewcell) (New) * [MaterialTableViewCell](#materialtableviewcell) (New)
* [NavigationBarView](#navigationbarview) (New) * [NavigationBarView](#navigationbarview) (New)
* [NavigationViewController](#navigationviewcontroller) (New) * NavigationViewController (New)
* [SearchBarView](#searchbarview) (New) * [SearchBarView](#searchbarview) (New)
* [SideNavigationViewController](#sidenavigationviewcontroller) * [SideNavigationViewController](#sidenavigationviewcontroller)
* [CardView](#cardview) (New) * [CardView](#cardview) (New)
...@@ -90,6 +91,7 @@ Material is a growing project and will encounter changes throughout its developm ...@@ -90,6 +91,7 @@ Material is a growing project and will encounter changes throughout its developm
* TabViewController * TabViewController
* Scrolling Techniques * Scrolling Techniques
* Snackbar * Snackbar
* Advanced Camera / Audio Toolset & Views
* More Examples * More Examples
<a name="materialcolor"></a> <a name="materialcolor"></a>
...@@ -226,7 +228,7 @@ Below is an example of a large CardView using Grid. ...@@ -226,7 +228,7 @@ Below is an example of a large CardView using Grid.
<a name="materialtableviewcell"></a> <a name="materialtableviewcell"></a>
## MaterialTableViewCell ## MaterialTableViewCell
UITableView is a popular and widely used view in iOS. Now the pulse animation and core Material features have been made available for the UITableView. UITableViewCell is a popular and widely used view in iOS. Now the pulse animation and core Material features have been made available for the UITableViewCell.
![MaterialMaterialTableViewCell](http://www.cosmicmind.io/MK/MaterialMaterialTableViewCell.gif) ![MaterialMaterialTableViewCell](http://www.cosmicmind.io/MK/MaterialMaterialTableViewCell.gif)
...@@ -244,7 +246,7 @@ A NavigationBarView is a fully featured navigation bar that supports orientation ...@@ -244,7 +246,7 @@ A NavigationBarView is a fully featured navigation bar that supports orientation
<a name="searchbarview"></a> <a name="searchbarview"></a>
## SearchBarView ## SearchBarView
A SearchBarView is fully featured and supports orientation changes, background images, title and detail labels, both left and right UIControl sets, and status bar settings. A SearchBarView is a fully featured search bar that supports orientation changes, background images, title and detail labels, both left and right UIControl sets, and status bar settings.
![MaterialSearchBarView](http://www.cosmicmind.io/MK/MaterialSearchBarView.gif) ![MaterialSearchBarView](http://www.cosmicmind.io/MK/MaterialSearchBarView.gif)
...@@ -270,7 +272,7 @@ Easily remove the pulse animation and add a background image for an entirely new ...@@ -270,7 +272,7 @@ Easily remove the pulse animation and add a background image for an entirely new
![MaterialCardViewFavorite](http://www.cosmicmind.io/MK/MaterialCardViewFavorite.gif) ![MaterialCardViewFavorite](http://www.cosmicmind.io/MK/MaterialCardViewFavorite.gif)
Add any view as the detail to a CardView. For example, a UITableView. Add any UIView as the detail to a CardView. For example, a UITableView.
![MaterialTableCardView](http://www.cosmicmind.io/MK/MaterialTableCardView.gif) ![MaterialTableCardView](http://www.cosmicmind.io/MK/MaterialTableCardView.gif)
......
Sources/NavigationBarView.swift
...@@ -32,7 +32,7 @@ import UIKit ...@@ -32,7 +32,7 @@ import UIKit
@objc(NavigationBarViewDelegate) @objc(NavigationBarViewDelegate)
public protocol NavigationBarViewDelegate : MaterialDelegate { public protocol NavigationBarViewDelegate : MaterialDelegate {
optional func navigationBarViewLayoutChanged(navigationBarView: NavigationBarView) optional func navigationBarViewDidChangeLayout(navigationBarView: NavigationBarView)
} }
public class NavigationBarView : MaterialView { public class NavigationBarView : MaterialView {
...@@ -192,7 +192,7 @@ public class NavigationBarView : MaterialView { ...@@ -192,7 +192,7 @@ public class NavigationBarView : MaterialView {
width = UIScreen.mainScreen().bounds.width width = UIScreen.mainScreen().bounds.width
grid.axis.columns = Int(width / 48) grid.axis.columns = Int(width / 48)
if frame.origin.x != oldFrame!.origin.x || frame.origin.y != oldFrame!.origin.y || frame.width != oldFrame!.width || frame.height != oldFrame!.height { if frame.origin.x != oldFrame!.origin.x || frame.origin.y != oldFrame!.origin.y || frame.width != oldFrame!.width || frame.height != oldFrame!.height {
(delegate as? NavigationBarViewDelegate)?.navigationBarViewLayoutChanged?(self) (delegate as? NavigationBarViewDelegate)?.navigationBarViewDidChangeLayout?(self)
oldFrame = frame oldFrame = frame
} }
reloadView() reloadView()
......
Sources/NavigationViewController.swift
...@@ -163,7 +163,7 @@ public class NavigationViewController: UIViewController { ...@@ -163,7 +163,7 @@ public class NavigationViewController: UIViewController {
extension NavigationViewController : NavigationBarViewDelegate { extension NavigationViewController : NavigationBarViewDelegate {
/// Monitor layout changes. /// Monitor layout changes.
public func navigationBarViewLayoutChanged(navigationBarView: NavigationBarView) { public func navigationBarViewDidChangeLayout(navigationBarView: NavigationBarView) {
layoutSubviews() layoutSubviews()
} }
} }
\ No newline at end of file
Sources/SearchBarView.swift
...@@ -32,7 +32,7 @@ import UIKit ...@@ -32,7 +32,7 @@ import UIKit
@objc(SearchBarViewDelegate) @objc(SearchBarViewDelegate)
public protocol SearchBarViewDelegate : MaterialDelegate { public protocol SearchBarViewDelegate : MaterialDelegate {
optional func searchBarViewLayoutChanged(searchBarView: SearchBarView) optional func searchBarViewDidChangeLayout(searchBarView: SearchBarView)
} }
public class SearchBarView : MaterialView { public class SearchBarView : MaterialView {
...@@ -186,7 +186,7 @@ public class SearchBarView : MaterialView { ...@@ -186,7 +186,7 @@ public class SearchBarView : MaterialView {
width = UIScreen.mainScreen().bounds.width width = UIScreen.mainScreen().bounds.width
grid.axis.columns = Int(width / 48) grid.axis.columns = Int(width / 48)
if frame.origin.x != oldFrame!.origin.x || frame.origin.y != oldFrame!.origin.y || frame.width != oldFrame!.width || frame.height != oldFrame!.height { if frame.origin.x != oldFrame!.origin.x || frame.origin.y != oldFrame!.origin.y || frame.width != oldFrame!.width || frame.height != oldFrame!.height {
(delegate as? SearchBarViewDelegate)?.searchBarViewLayoutChanged?(self) (delegate as? SearchBarViewDelegate)?.searchBarViewDidChangeLayout?(self)
oldFrame = frame oldFrame = frame
} }
reloadView() reloadView()
......
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