Skip to content

M
Material
Commit 12cb5f8f by Daniel Dahan
Options

removed files not for release

parent 936d407a
Showing with 0 additions and 339 deletions
MaterialKit.xcodeproj/project.pbxproj
...@@ -60,9 +60,7 @@ ...@@ -60,9 +60,7 @@
965C17C81BC82FEF00B1059A /* MaterialLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65AD15E91BC05B3A0068AF9C /* MaterialLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 965C17C81BC82FEF00B1059A /* MaterialLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65AD15E91BC05B3A0068AF9C /* MaterialLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17C91BC82FEF00B1059A /* MaterialTextLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9699879B1BC5FE49006D678E /* MaterialTextLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 965C17C91BC82FEF00B1059A /* MaterialTextLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9699879B1BC5FE49006D678E /* MaterialTextLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17CA1BC82FEF00B1059A /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D26BFC1BC23649006478BD /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 965C17CA1BC82FEF00B1059A /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D26BFC1BC23649006478BD /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9688D06D1BD4587200A70097 /* SearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9688D06C1BD4587200A70097 /* SearchBarView.swift */; };
9688D0701BD45B8C00A70097 /* SideNavigationViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9693BF981BCDC1450087054A /* SideNavigationViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 9688D0701BD45B8C00A70097 /* SideNavigationViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9693BF981BCDC1450087054A /* SideNavigationViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9688D0711BD45B8C00A70097 /* SearchBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9688D06C1BD4587200A70097 /* SearchBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9693BF861BCB0E0A0087054A /* Material+UIFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9693BF851BCB0E0A0087054A /* Material+UIFont.swift */; }; 9693BF861BCB0E0A0087054A /* Material+UIFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9693BF851BCB0E0A0087054A /* Material+UIFont.swift */; };
9693BF8B1BCB35910087054A /* Material+UIFont.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9693BF851BCB0E0A0087054A /* Material+UIFont.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 9693BF8B1BCB35910087054A /* Material+UIFont.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9693BF851BCB0E0A0087054A /* Material+UIFont.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9693BF8D1BCB35910087054A /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65D2BEC61BBED1E400800B7B /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 9693BF8D1BCB35910087054A /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65D2BEC61BBED1E400800B7B /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
...@@ -124,7 +122,6 @@ ...@@ -124,7 +122,6 @@
963832631B88E5BF0015F710 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; 963832631B88E5BF0015F710 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
964B17B31BBA447F002A9CA0 /* MaterialLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayout.swift; sourceTree = "<group>"; }; 964B17B31BBA447F002A9CA0 /* MaterialLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayout.swift; sourceTree = "<group>"; };
964B17B51BBA4BEA002A9CA0 /* MaterialStatusBarStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialStatusBarStyle.swift; sourceTree = "<group>"; }; 964B17B51BBA4BEA002A9CA0 /* MaterialStatusBarStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialStatusBarStyle.swift; sourceTree = "<group>"; };
9688D06C1BD4587200A70097 /* SearchBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBarView.swift; sourceTree = "<group>"; };
9693BF851BCB0E0A0087054A /* Material+UIFont.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIFont.swift"; sourceTree = "<group>"; }; 9693BF851BCB0E0A0087054A /* Material+UIFont.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIFont.swift"; sourceTree = "<group>"; };
9693BF951BCCCB520087054A /* BasicCardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCardView.swift; sourceTree = "<group>"; }; 9693BF951BCCCB520087054A /* BasicCardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCardView.swift; sourceTree = "<group>"; };
9693BF981BCDC1450087054A /* SideNavigationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavigationViewController.swift; sourceTree = "<group>"; }; 9693BF981BCDC1450087054A /* SideNavigationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavigationViewController.swift; sourceTree = "<group>"; };
...@@ -246,7 +243,6 @@ ...@@ -246,7 +243,6 @@
65AD15E81BC05B0E0068AF9C /* Layer */, 65AD15E81BC05B0E0068AF9C /* Layer */,
65B965851B8BEEB00055B139 /* View */, 65B965851B8BEEB00055B139 /* View */,
965C17C21BC7258100B1059A /* Navigation */, 965C17C21BC7258100B1059A /* Navigation */,
9688D06B1BD4585800A70097 /* Search */,
65BDD1551BB6FC60006F7F2B /* Button */, 65BDD1551BB6FC60006F7F2B /* Button */,
65BDD1701BB8CD56006F7F2B /* Label */, 65BDD1701BB8CD56006F7F2B /* Label */,
964B17D71BBB38E2002A9CA0 /* Card */, 964B17D71BBB38E2002A9CA0 /* Card */,
...@@ -307,14 +303,6 @@ ...@@ -307,14 +303,6 @@
name = Navigation; name = Navigation;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9688D06B1BD4585800A70097 /* Search */ = {
isa = PBXGroup;
children = (
9688D06C1BD4587200A70097 /* SearchBarView.swift */,
);
name = Search;
sourceTree = "<group>";
};
9693BF841BCB0DEE0087054A /* Extensions */ = { 9693BF841BCB0DEE0087054A /* Extensions */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -386,7 +374,6 @@ ...@@ -386,7 +374,6 @@
9693BF8E1BCB35910087054A /* MaterialKeyframeAnimation.swift in Headers */, 9693BF8E1BCB35910087054A /* MaterialKeyframeAnimation.swift in Headers */,
9693BF8F1BCB35910087054A /* MaterialTransitionAnimation.swift in Headers */, 9693BF8F1BCB35910087054A /* MaterialTransitionAnimation.swift in Headers */,
9688D0701BD45B8C00A70097 /* SideNavigationViewController.swift in Headers */, 9688D0701BD45B8C00A70097 /* SideNavigationViewController.swift in Headers */,
9688D0711BD45B8C00A70097 /* SearchBarView.swift in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -499,7 +486,6 @@ ...@@ -499,7 +486,6 @@
65BDD16C1BB88D1A006F7F2B /* MaterialShape.swift in Sources */, 65BDD16C1BB88D1A006F7F2B /* MaterialShape.swift in Sources */,
65AD15EA1BC05B3A0068AF9C /* MaterialLayer.swift in Sources */, 65AD15EA1BC05B3A0068AF9C /* MaterialLayer.swift in Sources */,
65BDD1521BB6EE7C006F7F2B /* RobotoFont.swift in Sources */, 65BDD1521BB6EE7C006F7F2B /* RobotoFont.swift in Sources */,
9688D06D1BD4587200A70097 /* SearchBarView.swift in Sources */,
9693BF991BCDC1450087054A /* SideNavigationViewController.swift in Sources */, 9693BF991BCDC1450087054A /* SideNavigationViewController.swift in Sources */,
9693BF961BCCCB520087054A /* BasicCardView.swift in Sources */, 9693BF961BCCCB520087054A /* BasicCardView.swift in Sources */,
96D26BFD1BC23649006478BD /* ImageCardView.swift in Sources */, 96D26BFD1BC23649006478BD /* ImageCardView.swift in Sources */,
......
Source/SearchBarView.swift deleted 100644 → 0
//
// Copyright (C) 2015 GraphKit, Inc. <http://graphkit.io> and other GraphKit contributors.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published
// by the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program located at the root of the software package
// in a file called LICENSE. If not, see <http://www.gnu.org/licenses/>.
//
import UIKit
@objc(SearchBarViewDelegate)
public protocol SearchBarViewDelegate : MaterialDelegate {
optional func materialSearchBarDidBeginEditing(searchBarView: SearchBarView)
optional func materialSearchBarDidEndEditing(searchBarView: SearchBarView)
}
@objc(SearchBarView)
public class SearchBarView : MaterialView, UITextFieldDelegate {
/**
:name: internalBackgroundColor
*/
internal var internalBackgroundColor: UIColor?
/**
:name: editingBackgroundColor
*/
public var editingBackgroundColor: UIColor?
/**
:name: statusBarStyle
*/
public var statusBarStyle: MaterialStatusBarStyle! {
didSet {
UIApplication.sharedApplication().setStatusBarStyle(.LightContent == statusBarStyle ? .LightContent : .Default, animated: true)
}
}
/**
:name: textField
*/
public private(set) lazy var textField: UITextField = UITextField()
/**
:name: contentInsets
*/
public var contentInsets: MaterialInsets = .None {
didSet {
contentInsetsRef = MaterialInsetsToValue(contentInsets)
}
}
/**
:name: contentInsetsRef
*/
public var contentInsetsRef: MaterialInsetsType = MaterialTheme.searchBarView.contentInsetsRef {
didSet {
reloadView()
}
}
/**
:name: textFieldInsets
*/
public var textFieldInsets: MaterialInsets = .None {
didSet {
textFieldInsetsRef = MaterialInsetsToValue(textFieldInsets)
}
}
/**
:name: textFieldInsetsRef
*/
public var textFieldInsetsRef: MaterialInsetsType = MaterialTheme.searchBarView.textFieldInsetsRef {
didSet {
reloadView()
}
}
/**
:name: leftButtonsInsets
*/
public var leftButtonsInsets: MaterialInsets = .None {
didSet {
leftButtonsInsetsRef = MaterialInsetsToValue(leftButtonsInsets)
}
}
/**
:name: leftButtonsInsetsRef
*/
public var leftButtonsInsetsRef: MaterialInsetsType = MaterialTheme.searchBarView.leftButtonsInsetsRef {
didSet {
reloadView()
}
}
/**
:name: leftButtons
*/
public var leftButtons: Array<UIButton>? {
didSet {
if let v = leftButtons {
for b in v {
b.translatesAutoresizingMaskIntoConstraints = false
}
}
reloadView()
}
}
/**
:name: rightButtonsInsets
*/
public var rightButtonsInsets: MaterialInsets = .None {
didSet {
rightButtonsInsetsRef = MaterialInsetsToValue(rightButtonsInsets)
}
}
/**
:name: rightButtonsInsetsRef
*/
public var rightButtonsInsetsRef: MaterialInsetsType = MaterialTheme.searchBarView.rightButtonsInsetsRef {
didSet {
reloadView()
}
}
/**
:name: rightButtons
*/
public var rightButtons: Array<UIButton>? {
didSet {
if let v = rightButtons {
for b in v {
b.translatesAutoresizingMaskIntoConstraints = false
}
}
reloadView()
}
}
/**
:name: init
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
/**
:name: init
*/
public override init(frame: CGRect) {
super.init(frame: frame)
}
/**
:name: init
*/
public convenience init() {
self.init(frame: CGRectMake(MaterialTheme.searchBarView.x, MaterialTheme.searchBarView.y, MaterialTheme.searchBarView.width, MaterialTheme.searchBarView.height))
}
/**
:name: init
*/
public convenience init?(leftButtons: Array<UIButton>? = nil, rightButtons: Array<UIButton>? = nil) {
self.init(frame: CGRectMake(MaterialTheme.searchBarView.x, MaterialTheme.searchBarView.y, MaterialTheme.searchBarView.width, MaterialTheme.searchBarView.height))
prepareProperties(leftButtons, rightButtons: rightButtons)
}
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.searchBarView.userInteractionEnabled
backgroundColor = MaterialTheme.searchBarView.backgroundColor
contentsRect = MaterialTheme.searchBarView.contentsRect
contentsCenter = MaterialTheme.searchBarView.contentsCenter
contentsScale = MaterialTheme.searchBarView.contentsScale
contentsGravity = MaterialTheme.searchBarView.contentsGravity
shadowDepth = MaterialTheme.searchBarView.shadowDepth
shadowColor = MaterialTheme.searchBarView.shadowColor
zPosition = MaterialTheme.searchBarView.zPosition
borderWidth = MaterialTheme.searchBarView.borderWidth
borderColor = MaterialTheme.searchBarView.bordercolor
prepareTextField()
reloadView()
}
/**
:name: reloadView
*/
public func reloadView() {
// clear constraints so new ones do not conflict
removeConstraints(constraints)
for v in subviews {
v.removeFromSuperview()
}
var verticalFormat: String = "V:|"
var views: Dictionary<String, AnyObject> = Dictionary<String, AnyObject>()
var metrics: Dictionary<String, AnyObject> = Dictionary<String, AnyObject>()
verticalFormat += "-(insetTop)"
metrics["insetTop"] = contentInsetsRef.top + textFieldInsetsRef.top
// textField
verticalFormat += "-[textField]"
views["textField"] = textField
addSubview(textField)
MaterialLayout.alignToParentHorizontally(self, child: textField, left: contentInsetsRef.left + textFieldInsetsRef.left, right: contentInsetsRef.right + textFieldInsetsRef.right)
// leftButtons
if let v = leftButtons {
if 0 < v.count {
var h: String = "H:|"
var d: Dictionary<String, AnyObject> = Dictionary<String, AnyObject>()
var i: Int = 0
for b in v {
let k: String = "b\(i)"
d[k] = b
if 0 == i++ {
h += "-(left)-"
} else {
h += "-(left_right)-"
}
h += "[\(k)]"
addSubview(b)
MaterialLayout.alignFromBottom(self, child: b, bottom: contentInsetsRef.bottom + leftButtonsInsetsRef.bottom)
}
addConstraints(MaterialLayout.constraint(h, options: [], metrics: ["left" : contentInsetsRef.left + leftButtonsInsetsRef.left, "left_right" : leftButtonsInsetsRef.left + leftButtonsInsetsRef.right], views: d))
}
}
// rightButtons
if let v = rightButtons {
if 0 < v.count {
var h: String = "H:"
var d: Dictionary<String, AnyObject> = Dictionary<String, AnyObject>()
var i: Int = v.count - 1
for b in v {
let k: String = "b\(i)"
d[k] = b
h += "[\(k)]"
if 0 == i-- {
h += "-(right)-"
} else {
h += "-(right_left)-"
}
addSubview(b)
MaterialLayout.alignFromBottom(self, child: b, bottom: contentInsetsRef.bottom + rightButtonsInsetsRef.bottom)
}
addConstraints(MaterialLayout.constraint(h + "|", options: [], metrics: ["right" : contentInsetsRef.right + rightButtonsInsetsRef.right, "right_left" : rightButtonsInsetsRef.right + rightButtonsInsetsRef.left], views: d))
}
}
if nil == metrics["insetC"] {
metrics["insetBottom"] = contentInsetsRef.bottom + textFieldInsetsRef.bottom
} else {
metrics["insetC"] = (metrics["insetC"] as! CGFloat) + textFieldInsetsRef.bottom
}
if 0 < views.count {
verticalFormat += "-(insetBottom)-|"
addConstraints(MaterialLayout.constraint(verticalFormat, options: [], metrics: metrics, views: views))
}
}
//
// :name: prepareProperties
//
internal func prepareProperties(leftButtons: Array<UIButton>?, rightButtons: Array<UIButton>?) {
self.leftButtons = leftButtons
self.rightButtons = rightButtons
}
//
// :name: prepareTextField
//
internal func prepareTextField() {
textField.translatesAutoresizingMaskIntoConstraints = false
textField.delegate = self
}
public func textFieldDidBeginEditing(textField: UITextField) {
if let v: UIColor = editingBackgroundColor {
internalBackgroundColor = backgroundColor
backgroundColor = v
}
(delegate as? SearchBarViewDelegate)?.materialSearchBarDidBeginEditing?(self)
}
public func textFieldDidEndEditing(textField: UITextField) {
backgroundColor = internalBackgroundColor
internalBackgroundColor = nil
(delegate as? SearchBarViewDelegate)?.materialSearchBarDidEndEditing?(self)
}
}
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