Skip to content

M
Material
Commit 33a575e0 by Daniel Dahan
Options

added Material OSX target

parent 6a47fbca
Showing with 14 additions and 14 deletions
Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme → Material.xcodeproj/xcshareddata/xcschemes/Material iOS.xcscheme
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832401B88DFD80015F710" BlueprintIdentifier = "963832401B88DFD80015F710"
BuildableName = "Material.xctest" BuildableName = "Material.xctest"
BlueprintName = "MaterialTests" BlueprintName = "Material iOS Tests"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
......
Sources/Material.h
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> #import <Foundation/Foundation.h>
//! Project version number for Material. //! Project version number for Material.
FOUNDATION_EXPORT double MaterialVersionNumber; FOUNDATION_EXPORT double MaterialVersionNumber;
......
Sources/TextField.swift
...@@ -592,9 +592,9 @@ public class TextField : UITextField { ...@@ -592,9 +592,9 @@ public class TextField : UITextField {
} else { } else {
v.alpha = 0 v.alpha = 0
} }
addTarget(self, action: "textFieldDidBegin", forControlEvents: .EditingDidBegin) addTarget(self, action: #selector(textFieldDidBegin), forControlEvents: .EditingDidBegin)
addTarget(self, action: "textFieldDidChange", forControlEvents: .EditingChanged) addTarget(self, action: #selector(textFieldDidChange), forControlEvents: .EditingChanged)
addTarget(self, action: "textFieldDidEnd", forControlEvents: .EditingDidEnd) addTarget(self, action: #selector(textFieldDidEnd), forControlEvents: .EditingDidEnd)
} }
} }
...@@ -609,11 +609,11 @@ public class TextField : UITextField { ...@@ -609,11 +609,11 @@ public class TextField : UITextField {
showDetailLabel() showDetailLabel()
} }
if nil == titleLabel { if nil == titleLabel {
addTarget(self, action: "textFieldDidBegin", forControlEvents: .EditingDidBegin) addTarget(self, action: #selector(textFieldDidBegin), forControlEvents: .EditingDidBegin)
addTarget(self, action: "textFieldDidChange", forControlEvents: .EditingChanged) addTarget(self, action: #selector(textFieldDidChange), forControlEvents: .EditingChanged)
addTarget(self, action: "textFieldDidEnd", forControlEvents: .EditingDidEnd) addTarget(self, action: #selector(textFieldDidEnd), forControlEvents: .EditingDidEnd)
} }
addTarget(self, action: "textFieldValueChanged", forControlEvents: .ValueChanged) addTarget(self, action: #selector(textFieldValueChanged), forControlEvents: .ValueChanged)
} }
} }
...@@ -632,7 +632,7 @@ public class TextField : UITextField { ...@@ -632,7 +632,7 @@ 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: "handleClearButton", forControlEvents: .TouchUpInside) 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