Skip to content

M
Material
Commit 02fde322 by Daniel Dahan
Options

development: updated README for 2.2.0 release

parent 321dc6f2
Showing with 39 additions and 14 deletions
Examples/Programmatic/NavigationController/NavigationController/AppNavigationController.swift
...@@ -37,7 +37,7 @@ class AppNavigationController: NavigationController { ...@@ -37,7 +37,7 @@ class AppNavigationController: NavigationController {
guard let v = navigationBar as? NavigationBar else { guard let v = navigationBar as? NavigationBar else {
return return
} }
v.depthPreset = .none v.depthPreset = .none
v.dividerColor = Color.grey.lighten3 v.dividerColor = Color.grey.lighten3
} }
......
Examples/Programmatic/NavigationController/NavigationController/NextViewController.swift
...@@ -34,7 +34,7 @@ import Material ...@@ -34,7 +34,7 @@ import Material
class NextViewController: UIViewController { class NextViewController: UIViewController {
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.blue.base
prepareNavigationItem() prepareNavigationItem()
} }
......
Examples/Programmatic/NavigationController/NavigationController/RootViewController.swift
...@@ -76,7 +76,7 @@ class RootViewController: UIViewController { ...@@ -76,7 +76,7 @@ class RootViewController: UIViewController {
} }
private func prepareNextButton() { private func prepareNextButton() {
nextButton = FlatButton() nextButton = FlatButton(title: "Click To Open", titleColor: Color.grey.base)
nextButton.pulseAnimation = .none nextButton.pulseAnimation = .none
nextButton.addTarget(self, action: #selector(handleNextButton), for: .touchUpInside) nextButton.addTarget(self, action: #selector(handleNextButton), for: .touchUpInside)
view.layout(nextButton).edges() view.layout(nextButton).edges()
......
Examples/Programmatic/TextField/TextField.xcodeproj/project.pbxproj
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
......
Examples/Programmatic/TextField/TextField/ViewController.swift
...@@ -40,9 +40,9 @@ class ViewController: UIViewController { ...@@ -40,9 +40,9 @@ class ViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = .white view.backgroundColor = .white
prepareNameField() // prepareNameField()
prepareEmailField() prepareEmailField()
preparePasswordField() // preparePasswordField()
prepareResignResponderButton() prepareResignResponderButton()
} }
...@@ -56,7 +56,7 @@ class ViewController: UIViewController { ...@@ -56,7 +56,7 @@ class ViewController: UIViewController {
let btn = RaisedButton(title: "Resign", titleColor: Color.blue.base) let btn = RaisedButton(title: "Resign", titleColor: Color.blue.base)
btn.addTarget(self, action: #selector(handleResignResponderButton(button:)), for: .touchUpInside) btn.addTarget(self, action: #selector(handleResignResponderButton(button:)), for: .touchUpInside)
view.layout(btn).width(100).height(50).bottom(24).right(24) view.layout(btn).width(100).height(50).bottom(300).right(24)
} }
/// Handle the resign responder button. /// Handle the resign responder button.
...@@ -86,7 +86,7 @@ class ViewController: UIViewController { ...@@ -86,7 +86,7 @@ class ViewController: UIViewController {
let d: CGFloat = 32 let d: CGFloat = 32
let leftView = UIImageView(frame: CGRect(x: 0, y: 0, width: d, height: d)) let leftView = UIImageView(frame: CGRect(x: 0, y: 0, width: d, height: d))
leftView.image = Icon.cm.check?.tint(with: Color.cyan.base) leftView.image = Icon.email?.tint(with: Color.cyan.base)
leftView.contentMode = .center leftView.contentMode = .center
emailField = ErrorTextField(frame: CGRect(x: 40, y: 120, width: view.width - 80, height: d)) emailField = ErrorTextField(frame: CGRect(x: 40, y: 120, width: view.width - 80, height: d))
...@@ -99,9 +99,9 @@ class ViewController: UIViewController { ...@@ -99,9 +99,9 @@ class ViewController: UIViewController {
emailField.leftViewMode = .always emailField.leftViewMode = .always
emailField.divider.contentEdgeInsets.left = d emailField.divider.contentEdgeInsets.left = d
emailField.placeholderNormalColor = Color.amber.darken4 // emailField.placeholderNormalColor = Color.amber.darken4
emailField.placeholderActiveColor = Color.pink.base // emailField.placeholderActiveColor = Color.pink.base
emailField.dividerNormalColor = Color.cyan.base // emailField.dividerNormalColor = Color.cyan.base
view.addSubview(emailField) view.addSubview(emailField)
} }
......
Examples/Programmatic/ToolbarController/ToolbarController/RootViewController.swift
...@@ -34,7 +34,7 @@ import Material ...@@ -34,7 +34,7 @@ import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.white
prepareToolbar() prepareToolbar()
} }
......
Sources/Assets.xcassets/ic_email_white.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_email_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_email_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_email_white@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/iOS/Icon.swift
...@@ -67,7 +67,8 @@ public struct Icon { ...@@ -67,7 +67,8 @@ public struct Icon {
public static let clear = Icon.icon("ic_close_white") public static let clear = Icon.icon("ic_close_white")
public static let close = Icon.icon("ic_close_white") public static let close = Icon.icon("ic_close_white")
public static let edit = Icon.icon("ic_edit_white") public static let edit = Icon.icon("ic_edit_white")
public static let favorite = Icon.icon("ic_favorite_white") public static let email = Icon.icon("ic_email_white")
public static let favorite = Icon.icon("ic_favorite_white")
public static let favoriteBorder = Icon.icon("ic_favorite_border_white") public static let favoriteBorder = Icon.icon("ic_favorite_border_white")
public static let history = Icon.icon("ic_history_white") public static let history = Icon.icon("ic_history_white")
public static let home = Icon.icon("ic_home_white") public static let home = Icon.icon("ic_home_white")
......
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