working on Toolbar dynamic frame

ebefc167 · Daniel Dahan · 22b31595 · ebefc167 · 22b31595 · 22b31595
Commit ebefc167 authored May 16, 2016 by Daniel Dahan
Showing with 0 additions and 693 deletions

Material.xcodeproj/project.pbxproj
+0 -20

Sources/iOS/MTextView.swift
+0 -539

Sources/iOS/MaterialEditorViewController.swift
+0 -65

Sources/iOS/MaterialNoteViewController.swift
+0 -69

No files found.
--- a/Material.xcodeproj/project.pbxproj
+++ b/Material.xcodeproj/project.pbxproj
@@ -15,9 +15,6 @@
 		9660162A1CB2F04E00AAB661 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C091C1328D800B91418 /* Material.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9679CEAB1CC69E080021685B /* Material+UIImage+TintColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9679CEAA1CC69E080021685B /* Material+UIImage+TintColor.swift */; };
 		96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; };
-		9692C9651CE92EA4008C2766 /* MaterialEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9692C9641CE92EA4008C2766 /* MaterialEditorViewController.swift */; };
-		9692C9671CE92EB1008C2766 /* MaterialNoteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9692C9661CE92EB1008C2766 /* MaterialNoteViewController.swift */; };
-		9692C9691CE964A8008C2766 /* MTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9692C9681CE964A8008C2766 /* MTextView.swift */; };
 		96977DA61CBB2E49000BEFC4 /* Material+UIImage+FilterBlur.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96977DA51CBB2E49000BEFC4 /* Material+UIImage+FilterBlur.swift */; };
 		96BCB7A11CB40DC500C806FE /* BottomNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */; };
 		96BCB7A21CB40DC500C806FE /* BottomTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7591CB40DC500C806FE /* BottomTabBar.swift */; };
@@ -207,9 +204,6 @@
 		9660161C1CB2ED6C00AAB661 /* Material OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Material OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		967887881C9777CB0037F6C9 /* MaterialViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialViewTests.swift; sourceTree = "<group>"; };
 		9679CEAA1CC69E080021685B /* Material+UIImage+TintColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIImage+TintColor.swift"; sourceTree = "<group>"; };
-		9692C9641CE92EA4008C2766 /* MaterialEditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialEditorViewController.swift; sourceTree = "<group>"; };
-		9692C9661CE92EB1008C2766 /* MaterialNoteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialNoteViewController.swift; sourceTree = "<group>"; };
-		9692C9681CE964A8008C2766 /* MTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MTextView.swift; sourceTree = "<group>"; };
 		96977DA51CBB2E49000BEFC4 /* Material+UIImage+FilterBlur.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIImage+FilterBlur.swift"; sourceTree = "<group>"; };
 		96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomNavigationController.swift; sourceTree = "<group>"; };
 		96BCB7591CB40DC500C806FE /* BottomTabBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomTabBar.swift; sourceTree = "<group>"; };
@@ -357,15 +351,6 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		9692C9631CE92E84008C2766 /* Editor */ = {
-			isa = PBXGroup;
-			children = (
-				9692C9641CE92EA4008C2766 /* MaterialEditorViewController.swift */,
-				9692C9661CE92EB1008C2766 /* MaterialNoteViewController.swift */,
-			);
-			name = Editor;
-			sourceTree = "<group>";
-		};
 		96BCB7571CB40DC500C806FE /* iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -376,7 +361,6 @@
 				96BCB8051CB40F9C00C806FE /* Collection */,
 				96BCB8001CB40F0300C806FE /* Color */,
 				96BCB80B1CB410CC00C806FE /* Device */,
-				9692C9631CE92E84008C2766 /* Editor */,
 				96BCB80A1CB410A100C806FE /* Extension */,
 				96BCB8071CB4101C00C806FE /* Font */,
 				96BCB8081CB4105E00C806FE /* Icon */,
@@ -602,7 +586,6 @@
 				961F18E71CD93E3E008927C5 /* ErrorTextField.swift */,
 				96BCB79D1CB40DC500C806FE /* TextStorage.swift */,
 				96BCB79E1CB40DC500C806FE /* TextView.swift */,
-				9692C9681CE964A8008C2766 /* MTextView.swift */,
 			);
 			name = Text;
 			sourceTree = "<group>";
@@ -891,7 +874,6 @@
 			files = (
 				96BCB7C01CB40DC500C806FE /* MaterialDataSourceItem.swift in Sources */,
 				96BCB7AC1CB40DC500C806FE /* Material+Obj-C.swift in Sources */,
-				9692C9691CE964A8008C2766 /* MTextView.swift in Sources */,
 				9679CEAB1CC69E080021685B /* Material+UIImage+TintColor.swift in Sources */,
 				9658F2171CD6FA4700B902C1 /* IconButton.swift in Sources */,
 				96BCB7BB1CB40DC500C806FE /* MaterialCollectionViewCell.swift in Sources */,
@@ -906,7 +888,6 @@
 				96BCB7CA1CB40DC500C806FE /* MaterialLayout.swift in Sources */,
 				96BCB7D11CB40DC500C806FE /* MaterialSwitch.swift in Sources */,
 				96BCB7BA1CB40DC500C806FE /* MaterialCollectionView.swift in Sources */,
-				9692C9671CE92EB1008C2766 /* MaterialNoteViewController.swift in Sources */,
 				96BCB7A31CB40DC500C806FE /* CapturePreview.swift in Sources */,
 				96BCB7BC1CB40DC500C806FE /* MaterialCollectionViewDataSource.swift in Sources */,
 				96BCB7C71CB40DC500C806FE /* MaterialKeyframeAnimation.swift in Sources */,
@@ -939,7 +920,6 @@
 				96BCB7DE1CB40DC500C806FE /* SearchBar.swift in Sources */,
 				96BCB7B11CB40DC500C806FE /* Material+UIImage+Crop.swift in Sources */,
 				96BCB7B81CB40DC500C806FE /* MaterialBorder.swift in Sources */,
-				9692C9651CE92EA4008C2766 /* MaterialEditorViewController.swift in Sources */,
 				96BCB7A61CB40DC500C806FE /* CardView.swift in Sources */,
 				96BCB7C91CB40DC500C806FE /* MaterialLayer.swift in Sources */,
 				96BCB7E21CB40DC500C806FE /* StatusBarViewController.swift in Sources */,

--- a/Sources/iOS/MTextView.swift
+++ b/Sources/iOS/MTextView.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.
-*/
-import UIKit
-public protocol MTextViewDelegate : UITextViewDelegate {}
-@IBDesignable
-public class MTextView: UITextView, TextDelegate {
-	/// A Text storage object that monitors the changes within the textView.
-	public private(set) lazy var mText: Text = Text()
-	/// A Boolean that indicates if the TextView is in an editing state.
-	public private(set) var editing: Bool = false
-	/// A Boolean that indicates if the TextView is in an animating state.
-	public private(set) var animating: Bool = false
-	/**
-	This property is the same as clipsToBounds. It crops any of the view's
-	contents from bleeding past the view's frame.
-	*/
-	@IBInspectable public var masksToBounds: Bool {
-		get {
-			return layer.masksToBounds
-		}
-		set(value) {
-			layer.masksToBounds = value
-		}
-	}
-	/// A property that accesses the backing layer's backgroundColor.
-	@IBInspectable public override var backgroundColor: UIColor? {
-		didSet {
-			layer.backgroundColor = backgroundColor?.CGColor
-		}
-	}
-	/// A property that accesses the layer.frame.origin.x property.
-	@IBInspectable public var x: CGFloat {
-		get {
-			return layer.frame.origin.x
-		}
-		set(value) {
-			layer.frame.origin.x = value
-		}
-	}
-	/// A property that accesses the layer.frame.origin.y property.
-	@IBInspectable public var y: CGFloat {
-		get {
-			return layer.frame.origin.y
-		}
-		set(value) {
-			layer.frame.origin.y = value
-		}
-	}
-	/// A property that accesses the layer.frame.size.width property.
-	@IBInspectable public var width: CGFloat {
-		get {
-			return layer.frame.size.width
-		}
-		set(value) {
-			layer.frame.size.width = value
-		}
-	}
-	/// A property that accesses the layer.frame.size.height property.
-	@IBInspectable public var height: CGFloat {
-		get {
-			return layer.frame.size.height
-		}
-		set(value) {
-			layer.frame.size.height = value
-		}
-	}
-	/// A property that accesses the layer.position property.
-	@IBInspectable public var position: CGPoint {
-		get {
-			return layer.position
-		}
-		set(value) {
-			layer.position = value
-		}
-	}
-	/// A property that accesses the layer.zPosition property.
-	@IBInspectable public var zPosition: CGFloat {
-		get {
-			return layer.zPosition
-		}
-		set(value) {
-			layer.zPosition = value
-		}
-	}
-	/// Reference to the divider.
-	public private(set) lazy var divider: CAShapeLayer = CAShapeLayer()
-	/// Divider height.
-	@IBInspectable public var dividerHeight: CGFloat = 1
-	/// Divider active state height.
-	@IBInspectable public var dividerActiveHeight: CGFloat = 2
-	/// Sets the divider.
-	@IBInspectable public var dividerColor: UIColor = MaterialColor.darkText.dividers {
-		didSet {
-			if !editing {
-				divider.backgroundColor = dividerColor.CGColor
-			}
-		}
-	}
-	/// Sets the divider.
-	@IBInspectable public var dividerActiveColor: UIColor? {
-		didSet {
-			if let v: UIColor = dividerActiveColor {
-				if editing {
-					divider.backgroundColor = v.CGColor
-				}
-			}
-		}
-	}
-	/// The placeholderLabel font value.
-	@IBInspectable public override var font: UIFont? {
-		didSet {
-			placeholderLabel.font = font
-		}
-	}
-	/// TextField's text property observer.
-	@IBInspectable public override var text: String? {
-		didSet {
-			if true == text?.isEmpty && !isFirstResponder() {
-			}
-		}
-	}
-	/// The placeholderLabel text value.
-	@IBInspectable public var placeholder: String? {
-		get {
-			return placeholderLabel.text
-		}
-		set(value) {
-			placeholderLabel.text = value
-			if let v: String = value {
-				placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderColor])
-			}
-		}
-	}
-	/// The placeholder UILabel.
-	@IBInspectable public private(set) lazy var placeholderLabel: UILabel = UILabel(frame: CGRectZero)
-	/// Placeholder textColor.
-	@IBInspectable public var placeholderColor: UIColor = MaterialColor.darkText.others {
-		didSet {
-			if !editing {
-				if let v: String = placeholder {
-					placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderColor])
-				}
-			}
-		}
-	}
-	/// Placeholder active textColor.
-	@IBInspectable public var placeholderActiveColor: UIColor = MaterialColor.blue.base {
-		didSet {
-			if editing {
-				if let v: String = placeholder {
-					placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderActiveColor])
-				}
-			}
-			tintColor = placeholderActiveColor
-		}
-	}
-	/// The detailLabel UILabel that is displayed.
-	@IBInspectable public private(set) lazy var detailLabel: UILabel = UILabel(frame: CGRectZero)
-	/// The detailLabel text value.
-	@IBInspectable public var detail: String? {
-		get {
-			return detailLabel.text
-		}
-		set(value) {
-			detailLabel.text = value
-			if let v: String = value {
-				detailLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: detailColor])
-			}
-			layoutDetailLabel()
-		}
-	}
-	/// Detail textColor.
-	@IBInspectable public var detailColor: UIColor = MaterialColor.darkText.others {
-		didSet {
-			if let v: String = detailLabel.text {
-				detailLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: detailColor])
-			}
-		}
-	}
-	/// Handles the textAlignment of the placeholderLabel.
-	public override var textAlignment: NSTextAlignment {
-		get {
-			return super.textAlignment
-		}
-		set(value) {
-			super.textAlignment = value
-			placeholderLabel.textAlignment = value
-			detailLabel.textAlignment = value
-		}
-	}
-	/**
-	An initializer that initializes the object with a NSCoder object.
-	- Parameter aDecoder: A NSCoder instance.
-	*/
-	public required init?(coder aDecoder: NSCoder) {
-		super.init(coder: aDecoder)
-		prepareView()
-	}
-	/**
-	An initializer that initializes the object with a CGRect object.
-	If AutoLayout is used, it is better to initilize the instance
-	using the init() initializer.
-	- Parameter frame: A CGRect instance.
-	- Parameter textContainer: A NSTextContainer instance.
-	*/
-	public override init(frame: CGRect, textContainer: NSTextContainer?) {
-		super.init(frame: frame, textContainer: textContainer)
-		prepareView()
-	}
-	/**
-	A convenience initializer that is mostly used with AutoLayout.
-	- Parameter textContainer: A NSTextContainer instance.
-	*/
-	public convenience init(textContainer: NSTextContainer?) {
-		self.init(frame: CGRectZero, textContainer: textContainer)
-	}
-	/// Convenience initializer.
-	public convenience init() {
-		let layoutManager: NSLayoutManager = NSLayoutManager()
-		let textContainer: NSTextContainer = NSTextContainer(size: CGSizeZero)
-		layoutManager.addTextContainer(textContainer)
-		self.init(frame: CGRectZero, textContainer: textContainer)
-		mText.textStorage.addLayoutManager(layoutManager)
-		mText.delegate = self
-	}
-	/** Denitializer. This should never be called unless you know
-	what you are doing.
-	*/
-	deinit {
-		removeNotificationHandlers()
-	}
-	/// Overriding the layout callback for subviews.
-	public override func layoutSubviews() {
-		super.layoutSubviews()
-		layoutToSize()
-	}
-	public override func layoutSublayersOfLayer(layer: CALayer) {
-		super.layoutSublayersOfLayer(layer)
-		if self.layer == layer {
-			layoutDivider()
-		}
-	}
-	/**
-	A method that accepts CAAnimation objects and executes them on the
-	view's backing layer.
-	- Parameter animation: A CAAnimation instance.
-	*/
-	public func animate(animation: CAAnimation) {
-		animation.delegate = self
-		if let a: CABasicAnimation = animation as? CABasicAnimation {
-			a.fromValue = (nil == layer.presentationLayer() ? layer : layer.presentationLayer() as! CALayer).valueForKeyPath(a.keyPath!)
-		}
-		if let a: CAPropertyAnimation = animation as? CAPropertyAnimation {
-			layer.addAnimation(a, forKey: a.keyPath!)
-		} else if let a: CAAnimationGroup = animation as? CAAnimationGroup {
-			layer.addAnimation(a, forKey: nil)
-		} else if let a: CATransition = animation as? CATransition {
-			layer.addAnimation(a, forKey: kCATransition)
-		}
-	}
-	/**
-	A delegation method that is executed when the backing layer starts
-	running an animation.
-	- Parameter anim: The currently running CAAnimation instance.
-	*/
-	public override func animationDidStart(anim: CAAnimation) {
-		(delegate as? MaterialAnimationDelegate)?.materialAnimationDidStart?(anim)
-	}
-	/**
-	A delegation method that is executed when the backing layer stops
-	running an animation.
-	- Parameter anim: The CAAnimation instance that stopped running.
-	- Parameter flag: A boolean that indicates if the animation stopped
-	because it was completed or interrupted. True if completed, false
-	if interrupted.
-	*/
-	public override func animationDidStop(anim: CAAnimation, finished flag: Bool) {
-		if let a: CAPropertyAnimation = anim as? CAPropertyAnimation {
-			if let b: CABasicAnimation = a as? CABasicAnimation {
-				if let v: AnyObject = b.toValue {
-					if let k: String = b.keyPath {
-						layer.setValue(v, forKeyPath: k)
-						layer.removeAnimationForKey(k)
-					}
-				}
-			}
-			(delegate as? MaterialAnimationDelegate)?.materialAnimationDidStop?(anim, finished: flag)
-		} else if let a: CAAnimationGroup = anim as? CAAnimationGroup {
-			for x in a.animations! {
-				animationDidStop(x, finished: true)
-			}
-		}
-	}
-	/// Notification handler for when text editing began.
-	internal func handleTextViewTextDidBegin() {
-		editing = true
-		dividerEditingDidBeginAnimation()
-		placeholderEditingDidBeginAnimation()
-	}
-	/// Notification handler for when text changed.
-	internal func handleTextViewTextDidChange() {
-	}
-	/// Notification handler for when text editing ended.
-	internal func handleTextViewTextDidEnd() {
-		editing = false
-		dividerEditingDidEndAnimation()
-		placeholderEditingDidEndAnimation()
-	}
-	/**
-	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 func prepareView() {
-		contentScaleFactor = MaterialDevice.scale
-		textContainerInset = UIEdgeInsetsZero
-		backgroundColor = MaterialColor.white
-		masksToBounds = false
-		textColor = MaterialColor.darkText.primary
-		font = RobotoFont.regularWithSize(16)
-		prepareDivider()
-		preparePlaceholderLabel()
-		prepareDetailLabel()
-		prepareNotificationHandlers()
-	}
-	/// Ensures that the components are sized correctly.
-	public func layoutToSize() {
-		if !animating {
-			layoutPlaceholderLabel()
-			layoutDetailLabel()
-		}
-	}
-	/// Layout the divider.
-	public func layoutDivider() {
-		divider.frame = CGRectMake(0, height, width, editing ? dividerActiveHeight : dividerHeight)
-	}
-	/// Layout the placeholderLabel.
-	public func layoutPlaceholderLabel() {
-		if !editing && true == text?.isEmpty {
-			placeholderLabel.frame = bounds
-		} else if CGAffineTransformIsIdentity(placeholderLabel.transform) {
-			placeholderLabel.frame = bounds
-			placeholderLabel.transform = CGAffineTransformMakeScale(0.75, 0.75)
-			switch textAlignment {
-			case .Left, .Natural:
-				placeholderLabel.frame.origin.x = 0
-			case .Right:
-				placeholderLabel.frame.origin.x = width - placeholderLabel.frame.width
-			default:break
-			}
-			placeholderLabel.frame.origin.y = -placeholderLabel.frame.size.height
-			placeholderLabel.textColor = placeholderColor
-		} else {
-			switch textAlignment {
-			case .Left, .Natural:
-				placeholderLabel.frame.origin.x = 0
-			case .Right:
-				placeholderLabel.frame.origin.x = width - placeholderLabel.frame.width
-			case .Center:
-				placeholderLabel.center.x = width / 2
-			default:break
-			}
-			placeholderLabel.frame.size.width = width * 0.75
-		}
-	}
-	/// Layout the detailLabel.
-	public func layoutDetailLabel() {
-		let h: CGFloat = nil == detail ? 12 : detailLabel.font.stringSize(detail!, constrainedToWidth: Double(width)).height
-		detailLabel.frame = CGRectMake(0, divider.frame.origin.y + 8, width, h)
-	}
-	/// The animation for the divider when editing begins.
-	public func dividerEditingDidBeginAnimation() {
-		divider.frame.size.height = dividerActiveHeight
-		divider.backgroundColor = nil == dividerActiveColor ? placeholderActiveColor.CGColor : dividerActiveColor!.CGColor
-	}
-	/// The animation for the divider when editing ends.
-	public func dividerEditingDidEndAnimation() {
-		divider.frame.size.height = dividerHeight
-		divider.backgroundColor = dividerColor.CGColor
-	}
-	/// The animation for the placeholder when editing begins.
-	public func placeholderEditingDidBeginAnimation() {
-		if CGAffineTransformIsIdentity(placeholderLabel.transform) {
-			animating = true
-			UIView.animateWithDuration(0.15, animations: { [weak self] in
-				if let v: MTextView = self {
-					v.placeholderLabel.transform = CGAffineTransformMakeScale(0.75, 0.75)
-					switch v.textAlignment {
-					case .Left, .Natural:
-						v.placeholderLabel.frame.origin.x = 0
-					case .Right:
-						v.placeholderLabel.frame.origin.x = v.width - v.placeholderLabel.frame.width
-					default:break
-					}
-					v.placeholderLabel.frame.origin.y = -v.placeholderLabel.frame.size.height
-					v.placeholderLabel.textColor = v.placeholderActiveColor
-				}
-			}) { [weak self] _ in
-				self?.animating = false
-			}
-		} else if editing {
-			placeholderLabel.textColor = placeholderActiveColor
-		}
-	}
-	/// The animation for the placeholder when editing ends.
-	public func placeholderEditingDidEndAnimation() {
-		if !CGAffineTransformIsIdentity(placeholderLabel.transform) && true == text?.isEmpty {
-			animating = true
-			UIView.animateWithDuration(0.15, animations: { [weak self] in
-				if let v: MTextView = self {
-					v.placeholderLabel.transform = CGAffineTransformIdentity
-					v.placeholderLabel.frame.origin.x = 0
-					v.placeholderLabel.frame.origin.y = 0
-					v.placeholderLabel.textColor = v.placeholderColor
-				}
-			}) { [weak self] _ in
-				self?.animating = false
-			}
-		} else if !editing {
-			placeholderLabel.textColor = placeholderColor
-		}
-	}
-	/// Prepares the divider.
-	private func prepareDivider() {
-		dividerColor = MaterialColor.darkText.dividers
-		layer.addSublayer(divider)
-	}
-	/// Prepares the placeholderLabel.
-	private func preparePlaceholderLabel() {
-		placeholderColor = MaterialColor.darkText.others
-		addSubview(placeholderLabel)
-	}
-	/// Prepares the detailLabel.
-	private func prepareDetailLabel() {
-		detailLabel.font = RobotoFont.regularWithSize(12)
-		detailColor = MaterialColor.darkText.others
-		addSubview(detailLabel)
-	}
-	/// Prepares the Notification handlers.
-	private func prepareNotificationHandlers() {
-		NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(handleTextViewTextDidBegin), name: UITextViewTextDidBeginEditingNotification, object: nil)
-		NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(handleTextViewTextDidChange), name: UITextViewTextDidChangeNotification, object: nil)
-		NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(handleTextViewTextDidEnd), name: UITextViewTextDidEndEditingNotification, object: nil)
-	}
-	/// Removes the Notification handlers.
-	private func removeNotificationHandlers() {
-		NSNotificationCenter.defaultCenter().removeObserver(self, name: UITextViewTextDidBeginEditingNotification, object: nil)
-		NSNotificationCenter.defaultCenter().removeObserver(self, name: UITextViewTextDidChangeNotification, object: nil)
-		NSNotificationCenter.defaultCenter().removeObserver(self, name: UITextViewTextDidEndEditingNotification, object: nil)
-	}
-}
--- a/Sources/iOS/MaterialEditorViewController.swift
+++ b/Sources/iOS/MaterialEditorViewController.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.
-*/
-import UIKit
-public class MaterialEditorViewController : ToolbarController {
-	/**
-	An initializer that initializes the object with a NSCoder object.
-	- Parameter aDecoder: A NSCoder instance.
-	*/
-	public required init?(coder aDecoder: NSCoder) {
-		super.init(coder: aDecoder)
-	}
-	/// Initializer used for default setup.
-	public init() {
-		super.init(rootViewController: MaterialNoteViewController())
-	}
-	/**
-	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()
-		view.backgroundColor = MaterialColor.white
-		prepareToolbar()
-	}
-	/// Prepares the toolbar.
-	private func prepareToolbar() {
-		toolbarController?.toolbar.depth = .None
-	}
-}
\ No newline at end of file
--- a/Sources/iOS/MaterialNoteViewController.swift
+++ b/Sources/iOS/MaterialNoteViewController.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.
-*/
-import UIKit
-public class MaterialNoteViewController : UIViewController {
-	/// Reference to the textView.
-	public private(set) var textView: MTextView!
-	public override func viewDidLoad() {
-		super.viewDidLoad()
-		prepareView()
-	}
-	public override func viewWillDisappear(animated: Bool) {
-		super.viewWillDisappear(animated)
-		textView.resignFirstResponder()
-	}
-	public override func viewWillLayoutSubviews() {
-		super.viewWillLayoutSubviews()
-		layoutTextView()
-	}
-	/// Prepares the view.
-	public func prepareView() {
-		view.backgroundColor = MaterialColor.white
-		prepareTextView()
-	}
-	/// Layout the textView.
-	public func layoutTextView() {
-		textView.frame = view.bounds
-	}
-	/// Prepares the textView.
-	private func prepareTextView() {
-		textView = MTextView()
-		textView.placeholder = "Placeholder"
-		view.addSubview(textView)
-	}
-}