added lineLayer colors

c05511dc · Daniel Dahan · 588b6f70 · c05511dc · c05511dc · c05511dc
Commit c05511dc authored Apr 06, 2016 by Daniel Dahan
7 changed files
--- a/Examples/Programmatic/SearchBar/SearchBar.xcodeproj/project.pbxproj
+++ b/Examples/Programmatic/SearchBar/SearchBar.xcodeproj/project.pbxproj
@@ -7,8 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		96BCB86A1CB4B3D700C806FE /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96BCB8691CB4B3D700C806FE /* Material.framework */; };
-		96BCB86B1CB4B3D700C806FE /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96BCB8691CB4B3D700C806FE /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		96F2F1E51C97A5C800A5FE27 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F2F1DF1C97A5C800A5FE27 /* AppDelegate.swift */; };
 		96F2F1E61C97A5C800A5FE27 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96F2F1E01C97A5C800A5FE27 /* Assets.xcassets */; };
 		96F2F1E71C97A5C800A5FE27 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96F2F1E11C97A5C800A5FE27 /* LaunchScreen.storyboard */; };
@@ -22,7 +20,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				96BCB86B1CB4B3D700C806FE /* Material.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -31,7 +28,6 @@

 /* Begin PBXFileReference section */
 		96A71F041C718F8800C0C4AE /* SearchBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SearchBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		96BCB8691CB4B3D700C806FE /* 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>"; };
 		96F2F1DF1C97A5C800A5FE27 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		96F2F1E01C97A5C800A5FE27 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		96F2F1E21C97A5C800A5FE27 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -44,7 +40,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				96BCB86A1CB4B3D700C806FE /* Material.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -54,7 +49,6 @@
 		96A71EFB1C718F8800C0C4AE = {
 			isa = PBXGroup;
 			children = (
-				96BCB8691CB4B3D700C806FE /* Material.framework */,
 				96F2F1DE1C97A5C800A5FE27 /* SearchBar */,
 				96A71F051C718F8800C0C4AE /* Products */,
 			);

--- a/Examples/Programmatic/SearchBarController/SearchBarController/AppDelegate.swift
+++ b/Examples/Programmatic/SearchBarController/SearchBarController/AppDelegate.swift
@@ -37,7 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 	
 	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-		window = UIWindow(frame: UIScreen.mainScreen().bounds)
+		window = UIWindow(frame: UIScreen.mainScreen().bounds)
 		window!.rootViewController = AppSearchBarController(rootViewController: YellowViewController())
 		window!.makeKeyAndVisible()
 		return true

--- a/Examples/Programmatic/TextField/TextField/ViewController.swift
+++ b/Examples/Programmatic/TextField/TextField/ViewController.swift
@@ -53,23 +53,16 @@ class ViewController: UIViewController, TextFieldDelegate {
 	
 	/// Prepares the name TextField.
 	private func prepareNameField() {
-		let textField: TextField = TextField(frame: CGRectMake(57, 100, 300, 24))
+		let textField: TextField = TextField(frame: CGRectMake(57, 100, 300, 32))
 		textField.placeholder = "First Name"
-		textField.placeholderTextColor = MaterialColor.grey.base
-		textField.font = RobotoFont.regularWithSize(20)
-		textField.textColor = MaterialColor.black
-		
 		view.addSubview(textField)
 	}
 	
 	/// Prepares the email TextField.
 	private func prepareEmailField() {
-		let textField: TextField = TextField(frame: CGRectMake(57, 200, 300, 24))
+		let textField: TextField = TextField(frame: CGRectMake(57, 200, 300, 32))
 		textField.delegate = self
 		textField.placeholder = "Email"
-		textField.placeholderTextColor = MaterialColor.grey.base
-		textField.font = RobotoFont.regularWithSize(20)
-		textField.textColor = MaterialColor.black
 		
 		/*
 		Used to display the error message, which is displayed when
@@ -79,7 +72,7 @@ class ViewController: UIViewController, TextFieldDelegate {
 		textField.detailLabel!.text = "Email is incorrect."
 		textField.detailLabel!.font = RobotoFont.mediumWithSize(12)
 		textField.detailLabelActiveColor = MaterialColor.red.accent3
-//		textField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding.
+		textField.detailLabelAutoHideEnabled = false // Uncomment this line to have manual hiding.
 		
 		view.addSubview(textField)
 	}

--- a/Examples/Storyboards/TextField/TextField/ViewController.swift
+++ b/Examples/Storyboards/TextField/TextField/ViewController.swift
@@ -57,20 +57,12 @@ class ViewController: UIViewController, TextFieldDelegate {
 	/// Prepares the name TextField.
 	private func prepareNameField() {
 		nameField.placeholder = "First Name"
-		nameField.placeholderTextColor = MaterialColor.grey.base
-		nameField.font = RobotoFont.regularWithSize(20)
-		nameField.textColor = MaterialColor.black
-		nameField.borderStyle = .None
 	}
 	
 	/// Prepares the email TextField.
 	private func prepareEmailField() {
 		emailField.delegate = self
 		emailField.placeholder = "Email"
-		emailField.placeholderTextColor = MaterialColor.grey.base
-		emailField.font = RobotoFont.regularWithSize(20)
-		emailField.textColor = MaterialColor.black
-		emailField.borderStyle = .None
 		
 		/*
 		Used to display the error message, which is displayed when

--- a/README.md
+++ b/README.md
@@ -365,9 +365,11 @@ Add a new dimension of interactivity with CaptureView. CaptureView is a fully fu
 * TabBarController
 * Scrolling Techniques
 * Snackbar
+* BottomNavigationController with Snackbar.
 * Bottom Sheets
 * Dialogs
 * Collapsing Toolbar
+* RTL Support
 * Advanced Camera / Audio Toolset & Views
 * More Examples


--- a/Sources/iOS/SearchBar.swift
+++ b/Sources/iOS/SearchBar.swift
@@ -125,7 +125,7 @@ public class SearchBar : StatusBarView {
 		textField.font = RobotoFont.regularWithSize(20)
 		textField.backgroundColor = MaterialColor.clear
 		textField.clearButtonMode = .WhileEditing
-		tintColor = MaterialColor.grey.darken4
+		tintColor = MaterialColor.grey.base
 		textColor = MaterialColor.grey.darken4
 		placeholder = "Search"
 		placeholderTextColor = MaterialColor.grey.base
@@ -139,7 +139,7 @@ public class SearchBar : StatusBarView {
 		clearButton.contentEdgeInsets = UIEdgeInsetsZero
 		clearButton.pulseColor = MaterialColor.grey.base
 		clearButton.pulseScale = false
-		clearButton.tintColor = MaterialColor.grey.darken4
+		clearButton.tintColor = MaterialColor.grey.base
 		clearButton.setImage(image, forState: .Normal)
 		clearButton.setImage(image, forState: .Highlighted)
 		clearButtonAutoHandleEnabled = true

--- a/Sources/iOS/TextField.swift
+++ b/Sources/iOS/TextField.swift