Skip to content

M
Material
Commit 3cafeeb0 by Daniel Dahan
Options

issue-229: Added clearButtonAutoHandleEnabled flag to remove handler for… 

issue-229: Added clearButtonAutoHandleEnabled flag to remove handler for clearing text on clearButton.
parent 41566ca2
Showing with 66 additions and 79 deletions
Examples/Programmatic/App/App/AppMenuViewController.swift
...@@ -110,7 +110,7 @@ class AppMenuViewController: MenuViewController { ...@@ -110,7 +110,7 @@ class AppMenuViewController: MenuViewController {
/// Prepares the add button. /// Prepares the add button.
private func prepareMenuView() { private func prepareMenuView() {
var image: UIImage? = MaterialIcon.add var image: UIImage? = MaterialIcon.cm.add
let menuButton: FabButton = FabButton() let menuButton: FabButton = FabButton()
menuButton.tintColor = MaterialColor.white menuButton.tintColor = MaterialColor.white
menuButton.setImage(image, forState: .Normal) menuButton.setImage(image, forState: .Normal)
...@@ -118,7 +118,7 @@ class AppMenuViewController: MenuViewController { ...@@ -118,7 +118,7 @@ class AppMenuViewController: MenuViewController {
menuButton.addTarget(self, action: #selector(handleMenu), forControlEvents: .TouchUpInside) menuButton.addTarget(self, action: #selector(handleMenu), forControlEvents: .TouchUpInside)
menuView.addSubview(menuButton) menuView.addSubview(menuButton)
image = MaterialIcon.pen image = MaterialIcon.cm.pen
let blueButton: FabButton = FabButton() let blueButton: FabButton = FabButton()
blueButton.tintColor = MaterialColor.white blueButton.tintColor = MaterialColor.white
blueButton.backgroundColor = MaterialColor.blue.base blueButton.backgroundColor = MaterialColor.blue.base
...@@ -127,7 +127,7 @@ class AppMenuViewController: MenuViewController { ...@@ -127,7 +127,7 @@ class AppMenuViewController: MenuViewController {
menuView.addSubview(blueButton) menuView.addSubview(blueButton)
blueButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside) blueButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside)
image = MaterialIcon.photoCamera image = MaterialIcon.cm.photoCamera
let greenButton: FabButton = FabButton() let greenButton: FabButton = FabButton()
greenButton.tintColor = MaterialColor.white greenButton.tintColor = MaterialColor.white
greenButton.backgroundColor = MaterialColor.green.base greenButton.backgroundColor = MaterialColor.green.base
...@@ -136,7 +136,7 @@ class AppMenuViewController: MenuViewController { ...@@ -136,7 +136,7 @@ class AppMenuViewController: MenuViewController {
menuView.addSubview(greenButton) menuView.addSubview(greenButton)
greenButton.addTarget(self, action: #selector(handleGreenButton), forControlEvents: .TouchUpInside) greenButton.addTarget(self, action: #selector(handleGreenButton), forControlEvents: .TouchUpInside)
image = MaterialIcon.star image = MaterialIcon.cm.star
let yellowButton: FabButton = FabButton() let yellowButton: FabButton = FabButton()
yellowButton.tintColor = MaterialColor.white yellowButton.tintColor = MaterialColor.white
yellowButton.backgroundColor = MaterialColor.yellow.base yellowButton.backgroundColor = MaterialColor.yellow.base
...@@ -157,7 +157,7 @@ class AppMenuViewController: MenuViewController { ...@@ -157,7 +157,7 @@ class AppMenuViewController: MenuViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.image = MaterialIcon.photoLibrary tabBarItem.image = MaterialIcon.cm.photoLibrary
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected)
} }
......
Examples/Programmatic/App/App/AppSearchBarViewController.swift
...@@ -74,7 +74,7 @@ class AppSearchBarController: SearchBarController { ...@@ -74,7 +74,7 @@ class AppSearchBarController: SearchBarController {
/// Prepares the searchBar. /// Prepares the searchBar.
private func prepareSearchBar() { private func prepareSearchBar() {
var image: UIImage? = MaterialIcon.close var image: UIImage? = MaterialIcon.cm.close
let clearButton: FlatButton = FlatButton() let clearButton: FlatButton = FlatButton()
clearButton.pulseScale = false clearButton.pulseScale = false
...@@ -84,7 +84,7 @@ class AppSearchBarController: SearchBarController { ...@@ -84,7 +84,7 @@ class AppSearchBarController: SearchBarController {
clearButton.setImage(image, forState: .Highlighted) clearButton.setImage(image, forState: .Highlighted)
// Back button. // Back button.
image = MaterialIcon.arrowBack image = MaterialIcon.cm.arrowBack
let backButton: FlatButton = FlatButton() let backButton: FlatButton = FlatButton()
backButton.pulseScale = false backButton.pulseScale = false
backButton.pulseColor = MaterialColor.grey.darken4 backButton.pulseColor = MaterialColor.grey.darken4
...@@ -94,7 +94,7 @@ class AppSearchBarController: SearchBarController { ...@@ -94,7 +94,7 @@ class AppSearchBarController: SearchBarController {
backButton.addTarget(self, action: #selector(handleBackButton), forControlEvents: .TouchUpInside) backButton.addTarget(self, action: #selector(handleBackButton), forControlEvents: .TouchUpInside)
// More button. // More button.
image = MaterialIcon.moreHorizontal image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.pulseScale = false moreButton.pulseScale = false
moreButton.pulseColor = MaterialColor.grey.darken4 moreButton.pulseColor = MaterialColor.grey.darken4
......
Examples/Programmatic/App/App/ItemViewController.swift
...@@ -114,7 +114,7 @@ class ItemViewController: UIViewController { ...@@ -114,7 +114,7 @@ class ItemViewController: UIViewController {
/// Prepares the shareButton. /// Prepares the shareButton.
private func prepareShareButton() { private func prepareShareButton() {
let image: UIImage? = MaterialIcon.share let image: UIImage? = MaterialIcon.cm.share
shareButton = FlatButton() shareButton = FlatButton()
shareButton.pulseScale = false shareButton.pulseScale = false
shareButton.pulseColor = MaterialColor.white shareButton.pulseColor = MaterialColor.white
......
Examples/Programmatic/App/App/PhotoViewController.swift
...@@ -57,7 +57,7 @@ class PhotoViewController: UIViewController { ...@@ -57,7 +57,7 @@ class PhotoViewController: UIViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.image = MaterialIcon.photoCamera tabBarItem.image = MaterialIcon.cm.photoCamera
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected)
} }
......
Examples/Programmatic/App/App/RecipesViewController.swift
...@@ -229,7 +229,7 @@ class RecipesViewController: UIViewController { ...@@ -229,7 +229,7 @@ class RecipesViewController: UIViewController {
/// Prepares the menuButton. /// Prepares the menuButton.
private func prepareMenuButton() { private func prepareMenuButton() {
let image: UIImage? = MaterialIcon.menu let image: UIImage? = MaterialIcon.cm.menu
menuButton = FlatButton() menuButton = FlatButton()
menuButton.pulseScale = false menuButton.pulseScale = false
menuButton.pulseColor = MaterialColor.white menuButton.pulseColor = MaterialColor.white
...@@ -245,7 +245,7 @@ class RecipesViewController: UIViewController { ...@@ -245,7 +245,7 @@ class RecipesViewController: UIViewController {
/// Prepares the searchButton. /// Prepares the searchButton.
private func prepareSearchButton() { private func prepareSearchButton() {
let image: UIImage? = MaterialIcon.search let image: UIImage? = MaterialIcon.cm.search
searchButton = FlatButton() searchButton = FlatButton()
searchButton.pulseScale = false searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white searchButton.pulseColor = MaterialColor.white
......
Examples/Programmatic/App/App/VideoViewController.swift
...@@ -57,7 +57,7 @@ class VideoViewController: UIViewController { ...@@ -57,7 +57,7 @@ class VideoViewController: UIViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.image = MaterialIcon.videocam tabBarItem.image = MaterialIcon.cm.videocam
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.white, forState: .Selected)
} }
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController/LibraryViewController.swift
...@@ -58,7 +58,7 @@ class LibraryViewController: UIViewController { ...@@ -58,7 +58,7 @@ class LibraryViewController: UIViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = "Library" tabBarItem.title = "Library"
tabBarItem.image = MaterialIcon.photoLibrary tabBarItem.image = MaterialIcon.cm.photoLibrary
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
} }
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController/PhotoViewController.swift
...@@ -58,7 +58,7 @@ class PhotoViewController: UIViewController { ...@@ -58,7 +58,7 @@ class PhotoViewController: UIViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = "Photo" tabBarItem.title = "Photo"
tabBarItem.image = MaterialIcon.photoCamera tabBarItem.image = MaterialIcon.cm.photoCamera
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
} }
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController/VideoViewController.swift
...@@ -58,7 +58,7 @@ class VideoViewController: UIViewController { ...@@ -58,7 +58,7 @@ class VideoViewController: UIViewController {
/// Prepare tabBarItem. /// Prepare tabBarItem.
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = "Video" tabBarItem.title = "Video"
tabBarItem.image = MaterialIcon.videocam tabBarItem.image = MaterialIcon.cm.videocam
tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) tabBarItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) tabBarItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
} }
......
Examples/Programmatic/BottomTabBar/BottomTabBar/ViewController.swift
...@@ -53,15 +53,15 @@ class ViewController: UIViewController { ...@@ -53,15 +53,15 @@ class ViewController: UIViewController {
bottomTabBar.backgroundColor = MaterialColor.grey.darken4 bottomTabBar.backgroundColor = MaterialColor.grey.darken4
view.addSubview(bottomTabBar) view.addSubview(bottomTabBar)
let videoItem: UITabBarItem = UITabBarItem(title: "Video", image: MaterialIcon.videocam, selectedImage: nil) let videoItem: UITabBarItem = UITabBarItem(title: "Video", image: MaterialIcon.cm.videocam, selectedImage: nil)
videoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) videoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
videoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) videoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
let photoItem: UITabBarItem = UITabBarItem(title: "Photo", image: MaterialIcon.photoCamera, selectedImage: nil) let photoItem: UITabBarItem = UITabBarItem(title: "Photo", image: MaterialIcon.cm.photoCamera, selectedImage: nil)
photoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) photoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
photoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) photoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
let libraryItem: UITabBarItem = UITabBarItem(title: "Library", image: MaterialIcon.photoLibrary, selectedImage: nil) let libraryItem: UITabBarItem = UITabBarItem(title: "Library", image: MaterialIcon.cm.photoLibrary, selectedImage: nil)
libraryItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) libraryItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
libraryItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) libraryItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
......
Examples/Programmatic/Grid/Grid/ViewController.swift
...@@ -202,7 +202,7 @@ class ViewController: UIViewController { ...@@ -202,7 +202,7 @@ class ViewController: UIViewController {
titleLabel.backgroundColor = MaterialColor.clear titleLabel.backgroundColor = MaterialColor.clear
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
image = MaterialIcon.moreVertical image = MaterialIcon.cm.moreVertical
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.contentEdgeInsetsPreset = .None moreButton.contentEdgeInsetsPreset = .None
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.blueGrey.darken4
...@@ -299,7 +299,7 @@ class ViewController: UIViewController { ...@@ -299,7 +299,7 @@ class ViewController: UIViewController {
titleLabel.backgroundColor = MaterialColor.clear titleLabel.backgroundColor = MaterialColor.clear
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
image = MaterialIcon.moreVertical image = MaterialIcon.cm.moreVertical
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.contentEdgeInsetsPreset = .None moreButton.contentEdgeInsetsPreset = .None
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.blueGrey.darken4
...@@ -408,7 +408,7 @@ class ViewController: UIViewController { ...@@ -408,7 +408,7 @@ class ViewController: UIViewController {
titleLabel.backgroundColor = MaterialColor.clear titleLabel.backgroundColor = MaterialColor.clear
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
image = MaterialIcon.moreHorizontal image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.contentEdgeInsetsPreset = .None moreButton.contentEdgeInsetsPreset = .None
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.blueGrey.darken4
......
Examples/Programmatic/Menu/Menu/ViewController.swift
...@@ -80,12 +80,12 @@ class ViewController: UIViewController { ...@@ -80,12 +80,12 @@ class ViewController: UIViewController {
if fabMenu.opened { if fabMenu.opened {
fabMenu.close() fabMenu.close()
image = MaterialIcon.add image = MaterialIcon.cm.add
} else { } else {
fabMenu.open() { (v: UIView) in fabMenu.open() { (v: UIView) in
(v as? MaterialButton)?.pulse() (v as? MaterialButton)?.pulse()
} }
image = MaterialIcon.close image = MaterialIcon.cm.close
} }
// Add a nice rotation animation to the base button. // Add a nice rotation animation to the base button.
......
Examples/Programmatic/NavigationBar/NavigationBar/ViewController.swift
...@@ -89,7 +89,7 @@ class ViewController: UIViewController { ...@@ -89,7 +89,7 @@ class ViewController: UIViewController {
/// Prepares the menuButton. /// Prepares the menuButton.
private func prepareMenuButton() { private func prepareMenuButton() {
let image: UIImage? = MaterialIcon.menu let image: UIImage? = MaterialIcon.cm.menu
menuButton = FlatButton() menuButton = FlatButton()
menuButton.pulseScale = false menuButton.pulseScale = false
menuButton.pulseColor = MaterialColor.white menuButton.pulseColor = MaterialColor.white
...@@ -104,7 +104,7 @@ class ViewController: UIViewController { ...@@ -104,7 +104,7 @@ class ViewController: UIViewController {
/// Prepares the searchButton. /// Prepares the searchButton.
private func prepareSearchButton() { private func prepareSearchButton() {
let image: UIImage? = MaterialIcon.search let image: UIImage? = MaterialIcon.cm.search
searchButton = FlatButton() searchButton = FlatButton()
searchButton.pulseScale = false searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white searchButton.pulseColor = MaterialColor.white
......
Examples/Programmatic/SearchBar/SearchBar/ViewController.swift
...@@ -54,7 +54,7 @@ class ViewController: UIViewController { ...@@ -54,7 +54,7 @@ class ViewController: UIViewController {
/// Prepare toolbar. /// Prepare toolbar.
private func prepareSearchBar() { private func prepareSearchBar() {
var image: UIImage? = MaterialIcon.close var image: UIImage? = MaterialIcon.cm.close
let clearButton: FlatButton = FlatButton() let clearButton: FlatButton = FlatButton()
clearButton.pulseScale = false clearButton.pulseScale = false
...@@ -64,7 +64,7 @@ class ViewController: UIViewController { ...@@ -64,7 +64,7 @@ class ViewController: UIViewController {
clearButton.setImage(image, forState: .Highlighted) clearButton.setImage(image, forState: .Highlighted)
// Back button. // Back button.
image = MaterialIcon.arrowBack image = MaterialIcon.cm.arrowBack
let backButton: FlatButton = FlatButton() let backButton: FlatButton = FlatButton()
backButton.pulseScale = false backButton.pulseScale = false
backButton.pulseColor = MaterialColor.blueGrey.darken4 backButton.pulseColor = MaterialColor.blueGrey.darken4
...@@ -76,7 +76,7 @@ class ViewController: UIViewController { ...@@ -76,7 +76,7 @@ class ViewController: UIViewController {
let switchControl: MaterialSwitch = MaterialSwitch(state: .Off, style: .Default, size: .Small) let switchControl: MaterialSwitch = MaterialSwitch(state: .Off, style: .Default, size: .Small)
// More button. // More button.
image = MaterialIcon.moreHorizontal image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.pulseScale = false moreButton.pulseScale = false
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.blueGrey.darken4
......
Examples/Programmatic/SearchBarController/SearchBarController/AppSearchBarController.swift
...@@ -76,7 +76,7 @@ class AppSearchBarController: SearchBarController { ...@@ -76,7 +76,7 @@ class AppSearchBarController: SearchBarController {
/// Prepares the searchBar. /// Prepares the searchBar.
private func prepareSearchBar() { private func prepareSearchBar() {
var image: UIImage? = MaterialIcon.close var image: UIImage? = MaterialIcon.cm.close
let clearButton: FlatButton = FlatButton() let clearButton: FlatButton = FlatButton()
clearButton.pulseColor = nil clearButton.pulseColor = nil
...@@ -87,7 +87,7 @@ class AppSearchBarController: SearchBarController { ...@@ -87,7 +87,7 @@ class AppSearchBarController: SearchBarController {
clearButton.addTarget(self, action: #selector(handleYellowButton), forControlEvents: .TouchUpInside) clearButton.addTarget(self, action: #selector(handleYellowButton), forControlEvents: .TouchUpInside)
// Back button. // Back button.
image = MaterialIcon.arrowBack image = MaterialIcon.cm.arrowBack
let backButton: FlatButton = FlatButton() let backButton: FlatButton = FlatButton()
backButton.pulseColor = nil backButton.pulseColor = nil
backButton.pulseScale = false backButton.pulseScale = false
...@@ -97,7 +97,7 @@ class AppSearchBarController: SearchBarController { ...@@ -97,7 +97,7 @@ class AppSearchBarController: SearchBarController {
backButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside) backButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside)
// More button. // More button.
image = MaterialIcon.moreHorizontal image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.pulseColor = nil moreButton.pulseColor = nil
moreButton.pulseScale = false moreButton.pulseScale = false
......
Examples/Programmatic/Toolbar/Toolbar/ViewController.swift
...@@ -68,7 +68,7 @@ class ViewController: UIViewController { ...@@ -68,7 +68,7 @@ class ViewController: UIViewController {
detailLabel.textColor = MaterialColor.white detailLabel.textColor = MaterialColor.white
detailLabel.font = RobotoFont.regular detailLabel.font = RobotoFont.regular
var image: UIImage? = MaterialIcon.menu var image: UIImage? = MaterialIcon.cm.menu
// Menu button. // Menu button.
let menuButton: FlatButton = FlatButton() let menuButton: FlatButton = FlatButton()
...@@ -82,7 +82,7 @@ class ViewController: UIViewController { ...@@ -82,7 +82,7 @@ class ViewController: UIViewController {
let switchControl: MaterialSwitch = MaterialSwitch(state: .Off, style: .LightContent, size: .Small) let switchControl: MaterialSwitch = MaterialSwitch(state: .Off, style: .LightContent, size: .Small)
// Search button. // Search button.
image = MaterialIcon.search image = MaterialIcon.cm.search
let searchButton: FlatButton = FlatButton() let searchButton: FlatButton = FlatButton()
searchButton.pulseScale = false searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white searchButton.pulseColor = MaterialColor.white
......
Examples/Programmatic/ToolbarController/ToolbarController/AppToolbarController.swift
...@@ -91,7 +91,7 @@ class AppToolbarController: ToolbarController { ...@@ -91,7 +91,7 @@ class AppToolbarController: ToolbarController {
// detailLabel.font = RobotoFont.regular // detailLabel.font = RobotoFont.regular
// toolbar.detailLabel = detailLabel // toolbar.detailLabel = detailLabel
var image: UIImage? = MaterialIcon.menu var image: UIImage? = MaterialIcon.cm.menu
// Menu button. // Menu button.
let menuButton: FlatButton = FlatButton() let menuButton: FlatButton = FlatButton()
...@@ -107,7 +107,7 @@ class AppToolbarController: ToolbarController { ...@@ -107,7 +107,7 @@ class AppToolbarController: ToolbarController {
switchControl.delegate = self switchControl.delegate = self
// Search button. // Search button.
image = MaterialIcon.search image = MaterialIcon.cm.search
let searchButton: FlatButton = FlatButton() let searchButton: FlatButton = FlatButton()
searchButton.pulseColor = nil searchButton.pulseColor = nil
searchButton.pulseScale = false searchButton.pulseScale = false
......
Examples/Storyboards/BottomTabBar/BottomTabBar/ViewController.swift
...@@ -37,15 +37,15 @@ class ViewController: UIViewController { ...@@ -37,15 +37,15 @@ class ViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
let videoItem: UITabBarItem = UITabBarItem(title: "Video", image: MaterialIcon.videocam, selectedImage: nil) let videoItem: UITabBarItem = UITabBarItem(title: "Video", image: MaterialIcon.cm.videocam, selectedImage: nil)
videoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) videoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
videoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) videoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
let photoItem: UITabBarItem = UITabBarItem(title: "Photo", image: MaterialIcon.photoCamera, selectedImage: nil) let photoItem: UITabBarItem = UITabBarItem(title: "Photo", image: MaterialIcon.cm.photoCamera, selectedImage: nil)
photoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) photoItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
photoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) photoItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
let libraryItem: UITabBarItem = UITabBarItem(title: "Library", image: MaterialIcon.photoLibrary, selectedImage: nil) let libraryItem: UITabBarItem = UITabBarItem(title: "Library", image: MaterialIcon.cm.photoLibrary, selectedImage: nil)
libraryItem.setTitleColor(MaterialColor.grey.base, forState: .Normal) libraryItem.setTitleColor(MaterialColor.grey.base, forState: .Normal)
libraryItem.setTitleColor(MaterialColor.teal.base, forState: .Selected) libraryItem.setTitleColor(MaterialColor.teal.base, forState: .Selected)
......
Examples/Storyboards/TextField/TextField.xcodeproj/project.pbxproj
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
96BCB8671CB4AC9600C806FE /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96BCB8661CB4AC9600C806FE /* Material.framework */; };
96BCB8681CB4AC9600C806FE /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96BCB8661CB4AC9600C806FE /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96D528021C8198AD00D3BDD1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528011C8198AD00D3BDD1 /* AppDelegate.swift */; }; 96D528021C8198AD00D3BDD1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528011C8198AD00D3BDD1 /* AppDelegate.swift */; };
96D528041C8198AD00D3BDD1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528031C8198AD00D3BDD1 /* ViewController.swift */; }; 96D528041C8198AD00D3BDD1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528031C8198AD00D3BDD1 /* ViewController.swift */; };
96D528071C8198AD00D3BDD1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96D528051C8198AD00D3BDD1 /* Main.storyboard */; }; 96D528071C8198AD00D3BDD1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96D528051C8198AD00D3BDD1 /* Main.storyboard */; };
...@@ -21,6 +23,7 @@ ...@@ -21,6 +23,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
96BCB8681CB4AC9600C806FE /* Material.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -28,6 +31,7 @@ ...@@ -28,6 +31,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
96BCB8661CB4AC9600C806FE /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-bshwisidfobstlbomegqyybbrygh/Build/Products/Debug-iphoneos/Material.framework"; sourceTree = "<absolute>"; };
96D527FE1C8198AD00D3BDD1 /* TextField.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TextField.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96D527FE1C8198AD00D3BDD1 /* TextField.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TextField.app; sourceTree = BUILT_PRODUCTS_DIR; };
96D528011C8198AD00D3BDD1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 96D528011C8198AD00D3BDD1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
96D528031C8198AD00D3BDD1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 96D528031C8198AD00D3BDD1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
...@@ -42,6 +46,7 @@ ...@@ -42,6 +46,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96BCB8671CB4AC9600C806FE /* Material.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -51,6 +56,7 @@ ...@@ -51,6 +56,7 @@
96D527F51C8198AD00D3BDD1 = { 96D527F51C8198AD00D3BDD1 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96BCB8661CB4AC9600C806FE /* Material.framework */,
96D528001C8198AD00D3BDD1 /* TextField */, 96D528001C8198AD00D3BDD1 /* TextField */,
96D527FF1C8198AD00D3BDD1 /* Products */, 96D527FF1C8198AD00D3BDD1 /* Products */,
); );
......
Examples/Storyboards/TextField/TextField/Base.lproj/Main.storyboard
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
......
Examples/Storyboards/TextField/TextField/Info.plist
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
......
Examples/Storyboards/TextField/TextField/ViewController.swift
...@@ -61,22 +61,6 @@ class ViewController: UIViewController, TextFieldDelegate { ...@@ -61,22 +61,6 @@ class ViewController: UIViewController, TextFieldDelegate {
nameField.font = RobotoFont.regularWithSize(20) nameField.font = RobotoFont.regularWithSize(20)
nameField.textColor = MaterialColor.black nameField.textColor = MaterialColor.black
nameField.borderStyle = .None nameField.borderStyle = .None
nameField.titleLabel = UILabel()
nameField.titleLabel!.font = RobotoFont.mediumWithSize(12)
nameField.titleLabelColor = MaterialColor.grey.base
nameField.titleLabelActiveColor = MaterialColor.blue.accent3
let image: UIImage? = MaterialIcon.close
let clearButton: FlatButton = FlatButton()
clearButton.pulseColor = MaterialColor.grey.base
clearButton.pulseScale = false
clearButton.tintColor = MaterialColor.grey.base
clearButton.setImage(image, forState: .Normal)
clearButton.setImage(image, forState: .Highlighted)
nameField.clearButton = clearButton
} }
/// Prepares the email TextField. /// Prepares the email TextField.
...@@ -88,11 +72,6 @@ class ViewController: UIViewController, TextFieldDelegate { ...@@ -88,11 +72,6 @@ class ViewController: UIViewController, TextFieldDelegate {
emailField.textColor = MaterialColor.black emailField.textColor = MaterialColor.black
emailField.borderStyle = .None emailField.borderStyle = .None
emailField.titleLabel = UILabel()
emailField.titleLabel!.font = RobotoFont.mediumWithSize(12)
emailField.titleLabelColor = MaterialColor.grey.base
emailField.titleLabelActiveColor = MaterialColor.blue.accent3
/* /*
Used to display the error message, which is displayed when Used to display the error message, which is displayed when
the user presses the 'return' key. the user presses the 'return' key.
...@@ -102,17 +81,6 @@ class ViewController: UIViewController, TextFieldDelegate { ...@@ -102,17 +81,6 @@ class ViewController: UIViewController, TextFieldDelegate {
emailField.detailLabel!.font = RobotoFont.mediumWithSize(12) emailField.detailLabel!.font = RobotoFont.mediumWithSize(12)
emailField.detailLabelActiveColor = MaterialColor.red.accent3 emailField.detailLabelActiveColor = MaterialColor.red.accent3
// emailField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding. // emailField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding.
let image: UIImage? = MaterialIcon.close
let clearButton: FlatButton = FlatButton()
clearButton.pulseColor = MaterialColor.grey.base
clearButton.pulseScale = false
clearButton.tintColor = MaterialColor.grey.base
clearButton.setImage(image, forState: .Normal)
clearButton.setImage(image, forState: .Highlighted)
emailField.clearButton = clearButton
} }
/// Executed when the 'return' key is pressed when using the emailField. /// Executed when the 'return' key is pressed when using the emailField.
......
Examples/Storyboards/Toolbar/Toolbar/ViewController.swift
...@@ -94,7 +94,7 @@ class ViewController: UIViewController { ...@@ -94,7 +94,7 @@ class ViewController: UIViewController {
toolbar.detailLabel = detailLabel toolbar.detailLabel = detailLabel
// Menu button. // Menu button.
let img1: UIImage? = MaterialIcon.menu let img1: UIImage? = MaterialIcon.cm.menu
let btn1: FlatButton = FlatButton() let btn1: FlatButton = FlatButton()
btn1.pulseScale = false btn1.pulseScale = false
btn1.pulseColor = MaterialColor.white btn1.pulseColor = MaterialColor.white
...@@ -103,7 +103,7 @@ class ViewController: UIViewController { ...@@ -103,7 +103,7 @@ class ViewController: UIViewController {
btn1.setImage(img1, forState: .Highlighted) btn1.setImage(img1, forState: .Highlighted)
// Star button. // Star button.
let img2: UIImage? = MaterialIcon.star let img2: UIImage? = MaterialIcon.cm.star
let btn2: FlatButton = FlatButton() let btn2: FlatButton = FlatButton()
btn2.pulseScale = false btn2.pulseScale = false
btn2.pulseColor = MaterialColor.white btn2.pulseColor = MaterialColor.white
...@@ -112,7 +112,7 @@ class ViewController: UIViewController { ...@@ -112,7 +112,7 @@ class ViewController: UIViewController {
btn2.setImage(img2, forState: .Highlighted) btn2.setImage(img2, forState: .Highlighted)
// Search button. // Search button.
let img3: UIImage? = MaterialIcon.search let img3: UIImage? = MaterialIcon.cm.search
let btn3: FlatButton = FlatButton() let btn3: FlatButton = FlatButton()
btn3.pulseScale = false btn3.pulseScale = false
btn3.pulseColor = MaterialColor.white btn3.pulseColor = MaterialColor.white
......
Sources/iOS/NavigationBar.swift
...@@ -62,7 +62,7 @@ public class NavigationBar : UINavigationBar { ...@@ -62,7 +62,7 @@ public class NavigationBar : UINavigationBar {
return backIndicatorImage return backIndicatorImage
} }
set(value) { set(value) {
let image: UIImage? = nil == value ? MaterialIcon.arrowBack : value let image: UIImage? = nil == value ? MaterialIcon.cm.arrowBack : value
backIndicatorImage = image backIndicatorImage = image
backIndicatorTransitionMaskImage = image backIndicatorTransitionMaskImage = image
backButton.setImage(image, forState: .Normal) backButton.setImage(image, forState: .Normal)
......
Sources/iOS/TextField.swift
...@@ -275,6 +275,16 @@ public class TextField : UITextField { ...@@ -275,6 +275,16 @@ public class TextField : UITextField {
} }
} }
/// Handle the clearButton manually.
@IBInspectable public var clearButtonAutoHandleEnabled: Bool = true {
didSet {
clearButton.removeTarget(self, action: #selector(handleClearButton), forControlEvents: .TouchUpInside)
if clearButtonAutoHandleEnabled {
clearButton.addTarget(self, action: #selector(handleClearButton), forControlEvents: .TouchUpInside)
}
}
}
/// Reference to the clearButton. /// Reference to the clearButton.
public private(set) var clearButton: FlatButton! public private(set) var clearButton: FlatButton!
...@@ -624,7 +634,7 @@ public class TextField : UITextField { ...@@ -624,7 +634,7 @@ public class TextField : UITextField {
/// Prepares the clearButton. /// Prepares the clearButton.
private func prepareClearButton() { private func prepareClearButton() {
let image: UIImage? = MaterialIcon.close let image: UIImage? = MaterialIcon.cm.close
clearButton = FlatButton() clearButton = FlatButton()
clearButton.contentEdgeInsets = UIEdgeInsetsZero clearButton.contentEdgeInsets = UIEdgeInsetsZero
clearButton.pulseColor = MaterialColor.grey.base clearButton.pulseColor = MaterialColor.grey.base
...@@ -632,7 +642,9 @@ public class TextField : UITextField { ...@@ -632,7 +642,9 @@ public class TextField : UITextField {
clearButton.tintColor = MaterialColor.grey.base clearButton.tintColor = MaterialColor.grey.base
clearButton.setImage(image, forState: .Normal) clearButton.setImage(image, forState: .Normal)
clearButton.setImage(image, forState: .Highlighted) clearButton.setImage(image, forState: .Highlighted)
clearButton.addTarget(self, action: #selector(handleClearButton), forControlEvents: .TouchUpInside) if clearButtonAutoHandleEnabled {
clearButton.addTarget(self, action: #selector(handleClearButton), forControlEvents: .TouchUpInside)
}
clearButtonMode = .Never clearButtonMode = .Never
rightViewMode = .WhileEditing rightViewMode = .WhileEditing
rightView = clearButton rightView = clearButton
......
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