Skip to content

M
Material
Commit cbedb1d7 by Daniel Dahan
Options

updated example projects to reflect latest changes with pulse animations

parent 7b65a669
Showing with 44 additions and 273 deletions
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
......@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
96162C6C1CA71C8700E3A235 /* VideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96162C6B1CA71C8700E3A235 /* VideoViewController.swift */; };
96162C6E1CA7274E00E3A235 /* PhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96162C6D1CA7274E00E3A235 /* PhotoViewController.swift */; };
9658F20E1CD6C77D00B902C1 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9658F20D1CD6C77D00B902C1 /* Material.framework */; };
9658F20F1CD6C77D00B902C1 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9658F20D1CD6C77D00B902C1 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9663F9321C7A744600AF0965 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9311C7A744600AF0965 /* AppDelegate.swift */; };
9663F9341C7A744600AF0965 /* RecommendationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9331C7A744600AF0965 /* RecommendationViewController.swift */; };
9663F9391C7A744600AF0965 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9663F9381C7A744600AF0965 /* Assets.xcassets */; };
......@@ -28,6 +30,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9658F20F1CD6C77D00B902C1 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -37,6 +40,7 @@
/* Begin PBXFileReference section */
96162C6B1CA71C8700E3A235 /* VideoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoViewController.swift; sourceTree = "<group>"; };
96162C6D1CA7274E00E3A235 /* PhotoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoViewController.swift; sourceTree = "<group>"; };
9658F20D1CD6C77D00B902C1 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-bshwisidfobstlbomegqyybbrygh/Build/Products/Debug-iphonesimulator/Material.framework"; sourceTree = "<absolute>"; };
9663F92E1C7A744600AF0965 /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
9663F9311C7A744600AF0965 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9663F9331C7A744600AF0965 /* RecommendationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendationViewController.swift; sourceTree = "<group>"; };
......@@ -56,6 +60,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9658F20E1CD6C77D00B902C1 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -65,6 +70,7 @@
9663F9251C7A744500AF0965 = {
isa = PBXGroup;
children = (
9658F20D1CD6C77D00B902C1 /* Material.framework */,
9663F9301C7A744600AF0965 /* App */,
9663F92F1C7A744600AF0965 /* Products */,
);
......
Examples/Programmatic/App/App/AppSearchBarViewController.swift
......@@ -78,7 +78,6 @@ class AppSearchBarController: SearchBarController {
// Back button.
let backButton: FlatButton = FlatButton()
backButton.pulseScale = false
backButton.pulseColor = MaterialColor.grey.base
backButton.tintColor = MaterialColor.grey.darken4
backButton.setImage(image, forState: .Normal)
......@@ -88,7 +87,6 @@ class AppSearchBarController: SearchBarController {
// More button.
image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton()
moreButton.pulseScale = false
moreButton.pulseColor = MaterialColor.grey.base
moreButton.tintColor = MaterialColor.grey.darken4
moreButton.setImage(image, forState: .Normal)
......
Examples/Programmatic/App/App/ItemViewController.swift
......@@ -121,7 +121,6 @@ class ItemViewController: UIViewController {
private func prepareShareButton() {
let image: UIImage? = MaterialIcon.cm.share
shareButton = FlatButton()
shareButton.pulseScale = false
shareButton.pulseColor = MaterialColor.white
shareButton.setImage(image, forState: .Normal)
shareButton.setImage(image, forState: .Highlighted)
......@@ -146,7 +145,6 @@ class ItemViewController: UIViewController {
imageCardView = ImageCardView()
imageCardView.pulseScale = false
imageCardView.pulseColor = nil
imageCardView.divider = false
imageCardView.depth = .None
......
Examples/Programmatic/App/App/RecipesViewController.swift
......@@ -230,7 +230,6 @@ class RecipesViewController: UIViewController {
private func prepareMenuButton() {
let image: UIImage? = MaterialIcon.cm.menu
menuButton = FlatButton()
menuButton.pulseScale = false
menuButton.pulseColor = MaterialColor.white
menuButton.setImage(image, forState: .Normal)
menuButton.setImage(image, forState: .Highlighted)
......@@ -246,7 +245,6 @@ class RecipesViewController: UIViewController {
private func prepareSearchButton() {
let image: UIImage? = MaterialIcon.cm.search
searchButton = FlatButton()
searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white
searchButton.setImage(image, forState: .Normal)
searchButton.setImage(image, forState: .Highlighted)
......
Examples/Programmatic/CardView/CardView/Assets.xcassets/ic_favorite_white.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_favorite_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_favorite_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_favorite_white@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/CardView/CardView/Assets.xcassets/ic_search_white.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_search_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_search_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_search_white@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/CardView/CardView/ViewController.swift
......@@ -36,28 +36,18 @@ class ViewController: UIViewController {
super.viewDidLoad()
prepareView()
// Examples of using CardView.
// Uncomment different examples and read
// the comments below.
prepareGeneralCardViewExample()
prepareBasicCardViewExample()
// prepareCardViewWithoutPulseBackgroundImageExample()
// prepareCardViewWithPulseBackgroundImageExample()
// prepareCardViewButtonBarExample()
}
/**
:name: prepareView
:description: General preparation statements.
*/
/// General preparation statements.
private func prepareView() {
view.backgroundColor = MaterialColor.white
}
/**
:name: prepareGeneralCardViewExample
:description: General usage example.
*/
private func prepareGeneralCardViewExample() {
private func prepareBasicCardViewExample() {
let cardView: CardView = CardView()
// Title label.
......@@ -76,14 +66,12 @@ class ViewController: UIViewController {
// Yes button.
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blue.lighten1
btn1.pulseScale = false
btn1.setTitle("YES", forState: .Normal)
btn1.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
// No button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blue.lighten1
btn2.pulseScale = false
btn2.setTitle("NO", forState: .Normal)
btn2.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
......@@ -97,18 +85,13 @@ class ViewController: UIViewController {
MaterialLayout.alignToParentHorizontally(view, child: cardView, left: 20, right: 20)
}
/**
:name: prepareCardViewWithoutPulseBackgroundImageExample
:description: An example of the CardView without the pulse animation and an added background image.
*/
private func prepareCardViewWithoutPulseBackgroundImageExample() {
let cardView: CardView = CardView()
cardView.divider = false
cardView.backgroundColor = MaterialColor.red.base
cardView.pulseScale = false
cardView.pulseColor = nil
cardView.image = UIImage(named: "Material-iTunesArtWork")?.resize(toHeight: 150)
cardView.image = UIImage(named: "Material-iTunesArtWork")?.resize(toHeight: 75)
cardView.contentsGravityPreset = .BottomRight
// Title label.
......@@ -125,11 +108,11 @@ class ViewController: UIViewController {
detailLabel.numberOfLines = 0
cardView.detailView = detailLabel
// Favorite button.
let img1: UIImage? = UIImage(named: "ic_favorite_white")
// Share button.
let img1: UIImage? = MaterialIcon.cm.share
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.white
btn1.pulseScale = false
btn1.tintColor = MaterialColor.white
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
......@@ -143,17 +126,13 @@ class ViewController: UIViewController {
MaterialLayout.alignToParentHorizontally(view, child: cardView, left: 20, right: 20)
}
/**
:name: prepareCardViewWithPulseBackgroundImageExample
:description: An example of the CardView with the pulse animation and an added background image.
*/
private func prepareCardViewWithPulseBackgroundImageExample() {
let cardView: CardView = CardView()
cardView.backgroundColor = MaterialColor.blue.base
cardView.divider = false
// Image.
cardView.image = UIImage(named: "Graph")?.resize(toHeight: 150)
cardView.image = UIImage(named: "Graph")?.resize(toHeight: 75)
cardView.contentsGravityPreset = .Right
// Title label.
......@@ -170,11 +149,11 @@ class ViewController: UIViewController {
detailLabel.numberOfLines = 0
cardView.detailView = detailLabel
// Favorite button.
let img1: UIImage? = UIImage(named: "ic_favorite_white")
// Share button.
let img1: UIImage? = MaterialIcon.cm.share
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.white
btn1.pulseScale = false
btn1.tintColor = MaterialColor.white
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
......@@ -188,29 +167,23 @@ class ViewController: UIViewController {
MaterialLayout.alignToParentHorizontally(view, child: cardView, left: 20, right: 20)
}
/**
:name: prepareCardViewButtonBarExample
:description: An example of the CardView with only buttons to create a button bar.
*/
private func prepareCardViewButtonBarExample() {
let cardView: CardView = CardView()
cardView.divider = false
cardView.pulseColor = nil
cardView.pulseScale = false
cardView.backgroundColor = MaterialColor.blueGrey.darken4
// Favorite button.
let img1: UIImage? = UIImage(named: "ic_search_white")
// Search button.
let img1: UIImage? = MaterialIcon.cm.search
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.white
btn1.pulseScale = false
btn1.tintColor = MaterialColor.white
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
// BUTTON 1 button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.teal.lighten3
btn2.pulseScale = false
btn2.setTitle("BUTTON 1", forState: .Normal)
btn2.setTitleColor(MaterialColor.teal.lighten3, forState: .Normal)
btn2.titleLabel!.font = RobotoFont.regularWithSize(20)
......@@ -218,7 +191,6 @@ class ViewController: UIViewController {
// BUTTON 2 button.
let btn3: FlatButton = FlatButton()
btn3.pulseColor = MaterialColor.teal.lighten3
btn3.pulseScale = false
btn3.setTitle("BUTTON 2", forState: .Normal)
btn3.setTitleColor(MaterialColor.teal.lighten3, forState: .Normal)
btn3.titleLabel!.font = RobotoFont.regularWithSize(20)
......
Examples/Programmatic/ControlView/ControlView/ViewController.swift
......@@ -52,7 +52,6 @@ class ViewController: UIViewController {
// Undo button.
let undoButton: FlatButton = FlatButton()
undoButton.pulseScale = false
undoButton.pulseColor = MaterialColor.white
undoButton.setTitle("UNDO", forState: .Normal)
undoButton.setTitleColor(MaterialColor.teal.accent1, forState: .Normal)
......
Examples/Programmatic/ImageCardView/ImageCardView/Assets.xcassets/ic_favorite_grey_darken_2.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_favorite_grey_darken_2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_favorite_grey_darken_2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_favorite_grey_darken_2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/ImageCardView/ImageCardView/Assets.xcassets/ic_share_grey_darken_2.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_share_grey_darken_2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_share_grey_darken_2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_share_grey_darken_2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/ImageCardView/ImageCardView/Assets.xcassets/ic_star_grey_darken_2.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_star_grey_darken_2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_star_grey_darken_2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_star_grey_darken_2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/ImageCardView/ImageCardView/ViewController.swift
......@@ -36,26 +36,16 @@ class ViewController: UIViewController {
super.viewDidLoad()
prepareView()
// Examples of using ImageCardView.
// Uncomment different examples and read
// the comments below.
// prepareGeneralImageCardViewExample()
// prepareBasicImageCardViewExample()
prepareImageCardViewWithoutDetailLabelAndDividerExample()
}
/**
:name: prepareView
:description: General preparation statements.
*/
/// General preparation statements.
private func prepareView() {
view.backgroundColor = MaterialColor.white
}
/**
:name: prepareGeneralImageCardViewExample
:description: General usage example.
*/
private func prepareGeneralImageCardViewExample() {
private func prepareBasicImageCardViewExample() {
let imageCardView: ImageCardView = ImageCardView()
imageCardView.maxImageHeight = 150
......@@ -80,14 +70,12 @@ class ViewController: UIViewController {
// Yes button.
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.cyan.lighten1
btn1.pulseScale = false
btn1.setTitle("YES", forState: .Normal)
btn1.setTitleColor(MaterialColor.cyan.darken1, forState: .Normal)
// No button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.cyan.lighten1
btn2.pulseScale = false
btn2.setTitle("NO", forState: .Normal)
btn2.setTitleColor(MaterialColor.cyan.darken1, forState: .Normal)
......@@ -101,10 +89,6 @@ class ViewController: UIViewController {
MaterialLayout.alignToParentHorizontally(view, child: imageCardView, left: 20, right: 20)
}
/**
:name: prepareImageCardViewWithoutDetailLabelAndDividerExample
:description: The following example removes the detailLabel to create a new look and feel.
*/
private func prepareImageCardViewWithoutDetailLabelAndDividerExample() {
let imageCardView: ImageCardView = ImageCardView()
imageCardView.divider = false
......@@ -122,26 +106,26 @@ class ViewController: UIViewController {
imageCardView.titleLabelInset.top = 80
// Star button.
let img1: UIImage? = UIImage(named: "ic_star_grey_darken_2")
let img1: UIImage? = MaterialIcon.cm.star
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blueGrey.lighten1
btn1.pulseScale = false
btn1.tintColor = MaterialColor.blueGrey.darken3
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
// Favorite button.
let img2: UIImage? = UIImage(named: "ic_favorite_grey_darken_2")
// Library button.
let img2: UIImage? = MaterialIcon.cm.audioLibrary
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blueGrey.lighten1
btn2.pulseScale = false
btn2.tintColor = MaterialColor.blueGrey.darken3
btn2.setImage(img2, forState: .Normal)
btn2.setImage(img2, forState: .Highlighted)
// Share button.
let img3: UIImage? = UIImage(named: "ic_share_grey_darken_2")
let img3: UIImage? = MaterialIcon.share
let btn3: FlatButton = FlatButton()
btn3.pulseColor = MaterialColor.blueGrey.lighten1
btn3.pulseScale = false
btn3.tintColor = MaterialColor.blueGrey.darken3
btn3.setImage(img3, forState: .Normal)
btn3.setImage(img3, forState: .Highlighted)
......
Examples/Programmatic/MaterialCollectionView/MaterialCollectionView/ViewController.swift
......@@ -40,8 +40,8 @@ class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
prepareItems()
prepareView()
prepareItems()
prepareCollectionView()
}
......@@ -74,7 +74,7 @@ class ViewController: UIViewController {
/// Prepares view.
private func prepareView() {
view.backgroundColor = MaterialColor.white
view.backgroundColor = MaterialColor.grey.lighten3
}
/// Prepares the tableView.
......@@ -114,45 +114,10 @@ extension ViewController: MaterialCollectionViewDataSource {
let cell: MaterialCollectionViewCell = collectionView.dequeueReusableCellWithReuseIdentifier("MaterialCollectionViewCell", forIndexPath: indexPath) as! MaterialCollectionViewCell
let item: MaterialDataSourceItem = dataSourceItems[indexPath.item]
if let data: Dictionary<String, AnyObject> = item.data as? Dictionary<String, AnyObject> {
cell.pulseColor = nil
cell.pulseScale = false
let textField: TextField = TextField(frame: CGRectMake(16, 16, view.bounds.width - 32, 32))
textField.delegate = self
textField.placeholder = "Email"
textField.placeholderTextColor = MaterialColor.grey.base
textField.font = RobotoFont.regularWithSize(20)
textField.textColor = MaterialColor.black
textField.titleLabel.font = RobotoFont.mediumWithSize(12)
textField.titleLabelColor = MaterialColor.grey.base
textField.titleLabelActiveColor = MaterialColor.blue.accent3
if let v: Bool = data["detailLabelHidden"] as? Bool {
/*
Used to display the error message, which is displayed when
the user presses the 'return' key.
*/
textField.detailLabel.text = "detail text..."
textField.detailLabel.font = RobotoFont.mediumWithSize(12)
textField.detailLabelActiveColor = MaterialColor.red.accent3
// textField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding.
textField.detailLabelHidden = v
}
cell.contentView.addSubview(textField)
if let _: Dictionary<String, AnyObject> = item.data as? Dictionary<String, AnyObject> {
cell.backgroundColor = MaterialColor.white
}
return cell
}
}
/// MaterialCollectionViewDelegate methods.
extension ViewController : TextFieldDelegate {
/// Handle textField return.
func textFieldShouldReturn(textField: UITextField) -> Bool {
(textField as? TextField)?.detailLabelHidden = false
return true
}
}
Examples/Programmatic/NavigationBar/NavigationBar/ViewController.swift
......@@ -91,7 +91,6 @@ class ViewController: UIViewController {
private func prepareMenuButton() {
let image: UIImage? = MaterialIcon.cm.menu
menuButton = FlatButton()
menuButton.pulseScale = false
menuButton.pulseColor = MaterialColor.white
menuButton.setImage(image, forState: .Normal)
menuButton.setImage(image, forState: .Highlighted)
......@@ -106,7 +105,6 @@ class ViewController: UIViewController {
private func prepareSearchButton() {
let image: UIImage? = MaterialIcon.cm.search
searchButton = FlatButton()
searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white
searchButton.setImage(image, forState: .Normal)
searchButton.setImage(image, forState: .Highlighted)
......
Examples/Programmatic/SearchBar/SearchBar/ViewController.swift
......@@ -58,7 +58,6 @@ class ViewController: UIViewController {
// Back button.
let backButton: FlatButton = FlatButton()
backButton.pulseScale = false
backButton.pulseColor = MaterialColor.grey.base
backButton.tintColor = MaterialColor.grey.darken4
backButton.setImage(image, forState: .Normal)
......@@ -70,7 +69,6 @@ class ViewController: UIViewController {
// More button.
image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton()
moreButton.pulseScale = false
moreButton.pulseColor = MaterialColor.grey.base
moreButton.tintColor = MaterialColor.grey.darken4
moreButton.setImage(image, forState: .Normal)
......
Examples/Programmatic/SearchBarController/SearchBarController/AppSearchBarController.swift
......@@ -81,7 +81,6 @@ class AppSearchBarController: SearchBarController {
// Back button.
let backButton: FlatButton = FlatButton()
backButton.pulseColor = nil
backButton.pulseScale = false
backButton.tintColor = MaterialColor.blueGrey.darken4
backButton.setImage(image, forState: .Normal)
backButton.setImage(image, forState: .Highlighted)
......@@ -91,7 +90,6 @@ class AppSearchBarController: SearchBarController {
image = MaterialIcon.cm.moreHorizontal
let moreButton: FlatButton = FlatButton()
moreButton.pulseColor = nil
moreButton.pulseScale = false
moreButton.tintColor = MaterialColor.blueGrey.darken4
moreButton.setImage(image, forState: .Normal)
moreButton.setImage(image, forState: .Highlighted)
......
Examples/Programmatic/TabBar/TabBar/ViewController.swift
......@@ -44,25 +44,21 @@ class ViewController: UIViewController {
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.white
btn1.pulseScale = false
btn1.setTitle("ONE", forState: .Normal)
btn1.setTitleColor(MaterialColor.white, forState: .Normal)
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.white
btn2.pulseScale = false
btn2.setTitle("TWO", forState: .Normal)
btn2.setTitleColor(MaterialColor.white, forState: .Normal)
let btn3: FlatButton = FlatButton()
btn3.pulseColor = MaterialColor.white
btn3.pulseScale = false
btn3.setTitle("THREE", forState: .Normal)
btn3.setTitleColor(MaterialColor.white, forState: .Normal)
let btn4: FlatButton = FlatButton()
btn4.pulseColor = MaterialColor.white
btn4.pulseScale = false
btn4.setTitle("FOUR", forState: .Normal)
btn4.setTitleColor(MaterialColor.white, forState: .Normal)
......
Examples/Programmatic/Toolbar/Toolbar/ViewController.swift
......@@ -72,7 +72,6 @@ class ViewController: UIViewController {
// Menu button.
let menuButton: FlatButton = FlatButton()
menuButton.pulseScale = false
menuButton.pulseColor = MaterialColor.white
menuButton.tintColor = MaterialColor.white
menuButton.setImage(image, forState: .Normal)
......@@ -84,7 +83,6 @@ class ViewController: UIViewController {
// Search button.
image = MaterialIcon.cm.search
let searchButton: FlatButton = FlatButton()
searchButton.pulseScale = false
searchButton.pulseColor = MaterialColor.white
searchButton.tintColor = MaterialColor.white
searchButton.setImage(image, forState: .Normal)
......
Examples/Programmatic/ToolbarController/ToolbarController/AppToolbarController.swift
......@@ -96,7 +96,6 @@ class AppToolbarController: ToolbarController {
// Menu button.
let menuButton: FlatButton = FlatButton()
menuButton.pulseColor = nil
menuButton.pulseScale = false
menuButton.tintColor = MaterialColor.white
menuButton.setImage(image, forState: .Normal)
menuButton.setImage(image, forState: .Highlighted)
......@@ -110,7 +109,6 @@ class AppToolbarController: ToolbarController {
image = MaterialIcon.cm.search
let searchButton: FlatButton = FlatButton()
searchButton.pulseColor = nil
searchButton.pulseScale = false
searchButton.tintColor = MaterialColor.white
searchButton.setImage(image, forState: .Normal)
searchButton.setImage(image, forState: .Highlighted)
......
Examples/Storyboards/CardView/CardView/ViewController.swift
......@@ -65,14 +65,12 @@ class ViewController: UIViewController {
// Yes button.
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blue.lighten1
btn1.pulseScale = false
btn1.setTitle("YES", forState: .Normal)
btn1.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
// No button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blue.lighten1
btn2.pulseScale = false
btn2.setTitle("NO", forState: .Normal)
btn2.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
......@@ -98,14 +96,12 @@ class ViewController: UIViewController {
// Yes button.
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blue.lighten1
btn1.pulseScale = false
btn1.setTitle("YES", forState: .Normal)
btn1.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
// No button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blue.lighten1
btn2.pulseScale = false
btn2.setTitle("NO", forState: .Normal)
btn2.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
......
Examples/Storyboards/ImageCardView/ImageCardView/ViewController.swift
......@@ -64,7 +64,6 @@ class ViewController: UIViewController {
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blueGrey.lighten1
btn1.tintColor = MaterialColor.blueGrey.lighten1
btn1.pulseScale = false
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
......@@ -73,7 +72,6 @@ class ViewController: UIViewController {
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blueGrey.lighten1
btn2.tintColor = MaterialColor.blueGrey.lighten1
btn2.pulseScale = false
btn2.setImage(img2, forState: .Normal)
btn2.setImage(img2, forState: .Highlighted)
......@@ -82,7 +80,6 @@ class ViewController: UIViewController {
let btn3: FlatButton = FlatButton()
btn3.pulseColor = MaterialColor.blueGrey.lighten1
btn3.tintColor = MaterialColor.blueGrey.lighten1
btn3.pulseScale = false
btn3.setImage(img3, forState: .Normal)
btn3.setImage(img3, forState: .Highlighted)
......
Examples/Storyboards/MaterialButton/MaterialButton/ViewController.swift
......@@ -32,7 +32,6 @@ import UIKit
import Material
class ViewController: UIViewController {
@IBOutlet weak var flatButton: FlatButton!
@IBOutlet weak var raisedButton: RaisedButton!
@IBOutlet weak var fabButton: FabButton!
......
Examples/Storyboards/TextField/TextField/Base.lproj/Main.storyboard
......@@ -17,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3zW-lR-Siu" customClass="TextField" customModule="Material">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3zW-lR-Siu" customClass="TextField" customModule="Material">
<rect key="frame" x="200" y="41" width="200" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="p7i-Yj-Kl0"/>
......@@ -25,7 +25,7 @@
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fUS-ww-GD9" customClass="TextField" customModule="Material">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fUS-ww-GD9" customClass="TextField" customModule="Material">
<rect key="frame" x="200" y="157" width="200" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="x7c-Zw-Abd"/>
......
Examples/Storyboards/TextField/TextField/ViewController.swift
......@@ -68,15 +68,11 @@ class ViewController: UIViewController, TextFieldDelegate {
Used to display the error message, which is displayed when
the user presses the 'return' key.
*/
emailField.detailLabel.text = "Email is incorrect."
emailField.detailLabel.font = RobotoFont.regularWithSize(12)
emailField.detailLabelActiveColor = MaterialColor.red.accent3
// emailField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding.
emailField.detail = "Email is incorrect."
}
/// Executed when the 'return' key is pressed when using the emailField.
func textFieldShouldReturn(textField: UITextField) -> Bool {
(textField as! TextField).detailLabelHidden = 0 == textField.text?.utf16.count
return false
}
}
Examples/Storyboards/Toolbar/Toolbar/ViewController.swift
......@@ -96,8 +96,7 @@ class ViewController: UIViewController {
// Menu button.
let img1: UIImage? = MaterialIcon.cm.menu
let btn1: FlatButton = FlatButton()
btn1.pulseScale = false
btn1.pulseColor = MaterialColor.white
btn1.pulseColor = MaterialColor.white
btn1.tintColor = MaterialColor.white
btn1.setImage(img1, forState: .Normal)
btn1.setImage(img1, forState: .Highlighted)
......@@ -105,8 +104,7 @@ class ViewController: UIViewController {
// Star button.
let img2: UIImage? = MaterialIcon.cm.star
let btn2: FlatButton = FlatButton()
btn2.pulseScale = false
btn2.pulseColor = MaterialColor.white
btn2.pulseColor = MaterialColor.white
btn2.tintColor = MaterialColor.white
btn2.setImage(img2, forState: .Normal)
btn2.setImage(img2, forState: .Highlighted)
......@@ -114,7 +112,6 @@ class ViewController: UIViewController {
// Search button.
let img3: UIImage? = MaterialIcon.cm.search
let btn3: FlatButton = FlatButton()
btn3.pulseScale = false
btn3.pulseColor = MaterialColor.white
btn3.tintColor = MaterialColor.white
btn3.setImage(img3, forState: .Normal)
......
Sources/iOS/MaterialCollectionViewCell.swift
......@@ -50,7 +50,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
public private(set) lazy var pulseLayers: Array<CAShapeLayer> = Array<CAShapeLayer>()
/// The opcaity value for the pulse animation.
@IBInspectable public var pulseOpacity: CGFloat = 0.25
@IBInspectable public var pulseOpacity: CGFloat = 0.12
/// The color of the pulse effect.
@IBInspectable public var pulseColor: UIColor?
......
Sources/iOS/MaterialPulseAnimation.swift
......@@ -50,7 +50,7 @@ internal extension MaterialAnimation {
let pLayer: CAShapeLayer = CAShapeLayer()
bLayer.addSublayer(pLayer)
pulseLayers.insert(bLayer, atIndex: 0)
visualLayer.insertSublayer(bLayer, atIndex: 0)
visualLayer.addSublayer(bLayer)
MaterialAnimation.animationDisabled({
bLayer.frame = visualLayer.bounds
pLayer.bounds = CGRectMake(0, 0, n, n)
......@@ -80,7 +80,7 @@ internal extension MaterialAnimation {
if let color: UIColor = pulseColor {
if let bLayer: CAShapeLayer = pulseLayers.popLast() {
let animated: Bool? = bLayer.valueForKey("animated") as? Bool
MaterialAnimation.delay(true == animated ? 0 : 0.10) {
MaterialAnimation.delay(true == animated ? 0 : 0.15) {
if let pLayer: CAShapeLayer = bLayer.sublayers?.first as? CAShapeLayer {
bLayer.addAnimation(MaterialAnimation.backgroundColor(color.colorWithAlphaComponent(0), duration: 0.35), forKey: nil)
pLayer.addAnimation(MaterialAnimation.animationGroup([
......
Sources/iOS/MaterialPulseView.swift
......@@ -38,7 +38,7 @@ public class MaterialPulseView : MaterialView {
public private(set) lazy var pulseLayers: Array<CAShapeLayer> = Array<CAShapeLayer>()
/// The opcaity value for the pulse animation.
@IBInspectable public var pulseOpacity: CGFloat = 0.25
@IBInspectable public var pulseOpacity: CGFloat = 0.12
/// The color of the pulse effect.
@IBInspectable public var pulseColor: UIColor?
......
Sources/iOS/MaterialTableViewCell.swift
......@@ -49,7 +49,7 @@ public class MaterialTableViewCell : UITableViewCell {
public private(set) lazy var pulseLayers: Array<CAShapeLayer> = Array<CAShapeLayer>()
/// The opcaity value for the pulse animation.
@IBInspectable public var pulseOpacity: CGFloat = 0.25
@IBInspectable public var pulseOpacity: CGFloat = 0.12
/// The color of the pulse effect.
@IBInspectable public var pulseColor: UIColor?
......
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