Skip to content

M
Material
Commit 19ab85bd by Daniel Dahan
Options

updated example App project

parent d7fae2bf
Showing with 28 additions and 28 deletions
Examples/Programmatic/App/App/AppLeftViewController.swift
...@@ -70,7 +70,7 @@ class AppLeftViewController: UIViewController { ...@@ -70,7 +70,7 @@ class AppLeftViewController: UIViewController {
/// General preparation statements. /// General preparation statements.
private func prepareView() { private func prepareView() {
view.backgroundColor = MaterialColor.blueGrey.darken4 view.backgroundColor = MaterialColor.grey.darken4
} }
/// Prepares the items that are displayed within the tableView. /// Prepares the items that are displayed within the tableView.
...@@ -137,10 +137,10 @@ extension AppLeftViewController: UITableViewDataSource { ...@@ -137,10 +137,10 @@ extension AppLeftViewController: UITableViewDataSource {
let item: Item = items[indexPath.row] let item: Item = items[indexPath.row]
cell.textLabel!.text = item.text cell.textLabel!.text = item.text
cell.textLabel!.textColor = MaterialColor.blueGrey.lighten2 cell.textLabel!.textColor = MaterialColor.grey.lighten2
cell.textLabel!.font = RobotoFont.medium cell.textLabel!.font = RobotoFont.medium
cell.imageView!.image = UIImage(named: item.imageName)?.imageWithRenderingMode(.AlwaysTemplate) cell.imageView!.image = UIImage(named: item.imageName)?.imageWithRenderingMode(.AlwaysTemplate)
cell.imageView!.tintColor = MaterialColor.blueGrey.lighten2 cell.imageView!.tintColor = MaterialColor.grey.lighten2
cell.backgroundColor = MaterialColor.clear cell.backgroundColor = MaterialColor.clear
return cell return cell
......
Examples/Programmatic/App/App/AppRightViewController.swift
...@@ -57,7 +57,7 @@ class AppRightViewController: UIViewController { ...@@ -57,7 +57,7 @@ class AppRightViewController: UIViewController {
/// General preparation statements. /// General preparation statements.
private func prepareView() { private func prepareView() {
view.backgroundColor = MaterialColor.blueGrey.darken4 view.backgroundColor = MaterialColor.grey.darken4
} }
override func viewWillAppear(animated: Bool) { override func viewWillAppear(animated: Bool) {
...@@ -104,10 +104,10 @@ extension AppRightViewController: UITableViewDataSource { ...@@ -104,10 +104,10 @@ extension AppRightViewController: UITableViewDataSource {
let item: Item = items[indexPath.row] let item: Item = items[indexPath.row]
cell.textLabel!.text = item.text cell.textLabel!.text = item.text
cell.textLabel!.textColor = MaterialColor.blueGrey.lighten2 cell.textLabel!.textColor = MaterialColor.grey.lighten2
cell.textLabel!.font = RobotoFont.medium cell.textLabel!.font = RobotoFont.medium
cell.imageView!.image = UIImage(named: item.imageName)?.imageWithRenderingMode(.AlwaysTemplate) cell.imageView!.image = UIImage(named: item.imageName)?.imageWithRenderingMode(.AlwaysTemplate)
cell.imageView!.tintColor = MaterialColor.blueGrey.lighten2 cell.imageView!.tintColor = MaterialColor.grey.lighten2
cell.backgroundColor = MaterialColor.clear cell.backgroundColor = MaterialColor.clear
return cell return cell
......
Examples/Programmatic/App/App/AppSearchBarViewController.swift
...@@ -84,18 +84,18 @@ class AppSearchBarViewController: SearchBarViewController { ...@@ -84,18 +84,18 @@ class AppSearchBarViewController: SearchBarViewController {
var image = UIImage(named: "ic_close_white")?.imageWithRenderingMode(.AlwaysTemplate) var image = UIImage(named: "ic_close_white")?.imageWithRenderingMode(.AlwaysTemplate)
let clearButton: FlatButton = FlatButton() let clearButton: FlatButton = FlatButton()
clearButton.pulseColor = MaterialColor.blueGrey.darken4 clearButton.pulseColor = MaterialColor.grey.darken4
clearButton.pulseScale = false clearButton.pulseScale = false
clearButton.tintColor = MaterialColor.blueGrey.darken4 clearButton.tintColor = MaterialColor.grey.darken4
clearButton.setImage(image, forState: .Normal) clearButton.setImage(image, forState: .Normal)
clearButton.setImage(image, forState: .Highlighted) clearButton.setImage(image, forState: .Highlighted)
// Back button. // Back button.
image = UIImage(named: "ic_arrow_back_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_arrow_back_white")?.imageWithRenderingMode(.AlwaysTemplate)
let backButton: FlatButton = FlatButton() let backButton: FlatButton = FlatButton()
backButton.pulseColor = MaterialColor.blueGrey.darken4 backButton.pulseColor = MaterialColor.grey.darken4
backButton.pulseScale = false backButton.pulseScale = false
backButton.tintColor = MaterialColor.blueGrey.darken4 backButton.tintColor = MaterialColor.grey.darken4
backButton.setImage(image, forState: .Normal) backButton.setImage(image, forState: .Normal)
backButton.setImage(image, forState: .Highlighted) backButton.setImage(image, forState: .Highlighted)
backButton.addTarget(self, action: "handleBackButton", forControlEvents: .TouchUpInside) backButton.addTarget(self, action: "handleBackButton", forControlEvents: .TouchUpInside)
...@@ -103,18 +103,18 @@ class AppSearchBarViewController: SearchBarViewController { ...@@ -103,18 +103,18 @@ class AppSearchBarViewController: SearchBarViewController {
// More button. // More button.
image = UIImage(named: "ic_more_horiz_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_more_horiz_white")?.imageWithRenderingMode(.AlwaysTemplate)
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.grey.darken4
moreButton.pulseScale = false moreButton.pulseScale = false
moreButton.tintColor = MaterialColor.blueGrey.darken4 moreButton.tintColor = MaterialColor.grey.darken4
moreButton.setImage(image, forState: .Normal) moreButton.setImage(image, forState: .Normal)
moreButton.setImage(image, forState: .Highlighted) moreButton.setImage(image, forState: .Highlighted)
moreButton.addTarget(self, action: "handleMoreButton", forControlEvents: .TouchUpInside) moreButton.addTarget(self, action: "handleMoreButton", forControlEvents: .TouchUpInside)
searchBarView.delegate = self searchBarView.delegate = self
searchBarView.placeholder = "Search" searchBarView.placeholder = "Search"
searchBarView.tintColor = MaterialColor.blueGrey.darken4 searchBarView.tintColor = MaterialColor.grey.darken4
searchBarView.textColor = MaterialColor.blueGrey.darken4 searchBarView.textColor = MaterialColor.grey.darken4
searchBarView.placeholderTextColor = MaterialColor.blueGrey.darken4 searchBarView.placeholderTextColor = MaterialColor.grey.darken4
searchBarView.textField.font = RobotoFont.regularWithSize(17) searchBarView.textField.font = RobotoFont.regularWithSize(17)
searchBarView.textField.delegate = self searchBarView.textField.delegate = self
......
Examples/Programmatic/App/App/FeedViewController.swift
...@@ -57,7 +57,7 @@ class FeedViewController: UIViewController { ...@@ -57,7 +57,7 @@ class FeedViewController: UIViewController {
/// Prepares view. /// Prepares view.
private func prepareView() { private func prepareView() {
view.backgroundColor = MaterialColor.blueGrey.lighten4 view.backgroundColor = MaterialColor.grey.lighten4
} }
/// Prepares the collectionView /// Prepares the collectionView
...@@ -169,23 +169,23 @@ extension FeedViewController: MaterialCollectionViewDataSource { ...@@ -169,23 +169,23 @@ extension FeedViewController: MaterialCollectionViewDataSource {
cardView!.depth = .None cardView!.depth = .None
let titleLabel: UILabel = UILabel() let titleLabel: UILabel = UILabel()
titleLabel.textColor = MaterialColor.blueGrey.darken4 titleLabel.textColor = MaterialColor.grey.darken4
titleLabel.font = RobotoFont.mediumWithSize(18) titleLabel.font = RobotoFont.regularWithSize(18)
titleLabel.text = data["title"] as? String titleLabel.text = data["title"] as? String
cardView!.titleLabel = titleLabel cardView!.titleLabel = titleLabel
let detailLabel: UILabel = UILabel() let detailLabel: UILabel = UILabel()
detailLabel.numberOfLines = 2 detailLabel.numberOfLines = 2
detailLabel.textColor = MaterialColor.blueGrey.darken2 detailLabel.textColor = MaterialColor.grey.darken2
detailLabel.font = RobotoFont.regular detailLabel.font = RobotoFont.regular
detailLabel.text = data["detail"] as? String detailLabel.text = data["detail"] as? String
cardView!.detailView = detailLabel cardView!.detailView = detailLabel
let image: UIImage? = UIImage(named: "ic_share_white")?.imageWithRenderingMode(.AlwaysTemplate) let image: UIImage? = UIImage(named: "ic_share_white_18pt")?.imageWithRenderingMode(.AlwaysTemplate)
let shareButton: FlatButton = FlatButton() let shareButton: FlatButton = FlatButton()
shareButton.pulseColor = MaterialColor.blueGrey.base shareButton.pulseColor = MaterialColor.grey.base
shareButton.tintColor = MaterialColor.blueGrey.base shareButton.tintColor = MaterialColor.grey.base
shareButton.setImage(image, forState: .Normal) shareButton.setImage(image, forState: .Normal)
shareButton.setImage(image, forState: .Highlighted) shareButton.setImage(image, forState: .Highlighted)
cardView!.rightButtons = [shareButton] cardView!.rightButtons = [shareButton]
......
Examples/Programmatic/App/App/InboxViewController.swift
...@@ -116,7 +116,7 @@ extension InboxViewController: UITableViewDataSource { ...@@ -116,7 +116,7 @@ extension InboxViewController: UITableViewDataSource {
cell.textLabel!.font = RobotoFont.regular cell.textLabel!.font = RobotoFont.regular
cell.detailTextLabel!.text = item.detail cell.detailTextLabel!.text = item.detail
cell.detailTextLabel!.font = RobotoFont.regular cell.detailTextLabel!.font = RobotoFont.regular
cell.detailTextLabel!.textColor = MaterialColor.blueGrey.darken1 cell.detailTextLabel!.textColor = MaterialColor.grey.darken1
cell.imageView!.image = item.image?.resize(toWidth: 40) cell.imageView!.image = item.image?.resize(toWidth: 40)
cell.imageView!.layer.cornerRadius = 20 cell.imageView!.layer.cornerRadius = 20
...@@ -130,7 +130,7 @@ extension InboxViewController: UITableViewDataSource { ...@@ -130,7 +130,7 @@ extension InboxViewController: UITableViewDataSource {
let label: UILabel = UILabel() let label: UILabel = UILabel()
label.font = RobotoFont.medium label.font = RobotoFont.medium
label.textColor = MaterialColor.blueGrey.darken1 label.textColor = MaterialColor.grey.darken1
label.text = "Today" label.text = "Today"
header.addSubview(label) header.addSubview(label)
......
Examples/Programmatic/App/App/SearchListViewController.swift
...@@ -106,7 +106,7 @@ extension SearchListViewController: UITableViewDataSource { ...@@ -106,7 +106,7 @@ extension SearchListViewController: UITableViewDataSource {
cell.textLabel!.font = RobotoFont.regular cell.textLabel!.font = RobotoFont.regular
cell.detailTextLabel!.text = item.detail cell.detailTextLabel!.text = item.detail
cell.detailTextLabel!.font = RobotoFont.regular cell.detailTextLabel!.font = RobotoFont.regular
cell.detailTextLabel!.textColor = MaterialColor.blueGrey.darken1 cell.detailTextLabel!.textColor = MaterialColor.grey.darken1
cell.imageView!.image = item.image?.resize(toWidth: 40) cell.imageView!.image = item.image?.resize(toWidth: 40)
cell.imageView!.layer.cornerRadius = 20 cell.imageView!.layer.cornerRadius = 20
...@@ -120,7 +120,7 @@ extension SearchListViewController: UITableViewDataSource { ...@@ -120,7 +120,7 @@ extension SearchListViewController: UITableViewDataSource {
let label: UILabel = UILabel() let label: UILabel = UILabel()
label.font = RobotoFont.medium label.font = RobotoFont.medium
label.textColor = MaterialColor.blueGrey.darken1 label.textColor = MaterialColor.grey.darken1
label.text = "Suggestions" label.text = "Suggestions"
header.addSubview(label) header.addSubview(label)
......
Material.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.34.7' s.version = '1.34.8'
s.license = 'BSD' s.license = 'BSD'
s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.' s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
Sources/Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.34.7</string> <string>1.34.8</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
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