Skip to content

M
Material
Commit 9243457e by Daniel Dahan
Options

update to Material Types

parent 0c9e543e
Showing with 20 additions and 48 deletions
MaterialKit.xcodeproj/project.pbxproj
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
96D88C341C1328D800B91418 /* MaterialLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0B1C1328D800B91418 /* MaterialLayer.swift */; }; 96D88C341C1328D800B91418 /* MaterialLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0B1C1328D800B91418 /* MaterialLayer.swift */; };
96D88C351C1328D800B91418 /* MaterialLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0C1C1328D800B91418 /* MaterialLayout.swift */; }; 96D88C351C1328D800B91418 /* MaterialLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0C1C1328D800B91418 /* MaterialLayout.swift */; };
96D88C361C1328D800B91418 /* MaterialPulseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0D1C1328D800B91418 /* MaterialPulseView.swift */; }; 96D88C361C1328D800B91418 /* MaterialPulseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0D1C1328D800B91418 /* MaterialPulseView.swift */; };
96D88C371C1328D800B91418 /* MaterialRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0E1C1328D800B91418 /* MaterialRadius.swift */; }; 96D88C371C1328D800B91418 /* MaterialCornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0E1C1328D800B91418 /* MaterialCornerRadius.swift */; };
96D88C381C1328D800B91418 /* MaterialShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0F1C1328D800B91418 /* MaterialShape.swift */; }; 96D88C381C1328D800B91418 /* MaterialShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0F1C1328D800B91418 /* MaterialShape.swift */; };
96D88C391C1328D800B91418 /* MaterialStatusBarStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C101C1328D800B91418 /* MaterialStatusBarStyle.swift */; };
96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */; }; 96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */; };
96D88C3B1C1328D800B91418 /* MaterialTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C121C1328D800B91418 /* MaterialTheme.swift */; }; 96D88C3B1C1328D800B91418 /* MaterialTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C121C1328D800B91418 /* MaterialTheme.swift */; };
96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; }; 96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */; };
...@@ -52,8 +51,7 @@ ...@@ -52,8 +51,7 @@
96D88C561C132ABF00B91418 /* MaterialTheme.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C121C1328D800B91418 /* MaterialTheme.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C561C132ABF00B91418 /* MaterialTheme.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C121C1328D800B91418 /* MaterialTheme.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C571C132ABF00B91418 /* CardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BF61C1328D800B91418 /* CardView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C571C132ABF00B91418 /* CardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BF61C1328D800B91418 /* CardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C581C132ABF00B91418 /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFB1C1328D800B91418 /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C581C132ABF00B91418 /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFB1C1328D800B91418 /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C591C132ABF00B91418 /* MaterialStatusBarStyle.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C101C1328D800B91418 /* MaterialStatusBarStyle.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C5A1C132ABF00B91418 /* MaterialCornerRadius.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C0E1C1328D800B91418 /* MaterialCornerRadius.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5A1C132ABF00B91418 /* MaterialRadius.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C0E1C1328D800B91418 /* MaterialRadius.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5B1C132ABF00B91418 /* MaterialShape.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C0F1C1328D800B91418 /* MaterialShape.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C5B1C132ABF00B91418 /* MaterialShape.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C0F1C1328D800B91418 /* MaterialShape.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5C1C132ABF00B91418 /* MaterialBorder.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C011C1328D800B91418 /* MaterialBorder.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C5C1C132ABF00B91418 /* MaterialBorder.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C011C1328D800B91418 /* MaterialBorder.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C031C1328D800B91418 /* MaterialColor.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C031C1328D800B91418 /* MaterialColor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
...@@ -123,9 +121,8 @@ ...@@ -123,9 +121,8 @@
96D88C0B1C1328D800B91418 /* MaterialLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayer.swift; sourceTree = "<group>"; }; 96D88C0B1C1328D800B91418 /* MaterialLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayer.swift; sourceTree = "<group>"; };
96D88C0C1C1328D800B91418 /* MaterialLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayout.swift; sourceTree = "<group>"; }; 96D88C0C1C1328D800B91418 /* MaterialLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLayout.swift; sourceTree = "<group>"; };
96D88C0D1C1328D800B91418 /* MaterialPulseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialPulseView.swift; sourceTree = "<group>"; }; 96D88C0D1C1328D800B91418 /* MaterialPulseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialPulseView.swift; sourceTree = "<group>"; };
96D88C0E1C1328D800B91418 /* MaterialRadius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialRadius.swift; sourceTree = "<group>"; }; 96D88C0E1C1328D800B91418 /* MaterialCornerRadius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCornerRadius.swift; sourceTree = "<group>"; };
96D88C0F1C1328D800B91418 /* MaterialShape.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialShape.swift; sourceTree = "<group>"; }; 96D88C0F1C1328D800B91418 /* MaterialShape.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialShape.swift; sourceTree = "<group>"; };
96D88C101C1328D800B91418 /* MaterialStatusBarStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialStatusBarStyle.swift; sourceTree = "<group>"; };
96D88C111C1328D800B91418 /* MaterialTextLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTextLayer.swift; sourceTree = "<group>"; }; 96D88C111C1328D800B91418 /* MaterialTextLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTextLayer.swift; sourceTree = "<group>"; };
96D88C121C1328D800B91418 /* MaterialTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTheme.swift; sourceTree = "<group>"; }; 96D88C121C1328D800B91418 /* MaterialTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTheme.swift; sourceTree = "<group>"; };
96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTransitionAnimation.swift; sourceTree = "<group>"; }; 96D88C131C1328D800B91418 /* MaterialTransitionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTransitionAnimation.swift; sourceTree = "<group>"; };
...@@ -246,8 +243,7 @@ ...@@ -246,8 +243,7 @@
96D88C4A1C13294200B91418 /* Type */ = { 96D88C4A1C13294200B91418 /* Type */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96D88C101C1328D800B91418 /* MaterialStatusBarStyle.swift */, 96D88C0E1C1328D800B91418 /* MaterialCornerRadius.swift */,
96D88C0E1C1328D800B91418 /* MaterialRadius.swift */,
96D88C0F1C1328D800B91418 /* MaterialShape.swift */, 96D88C0F1C1328D800B91418 /* MaterialShape.swift */,
96D88C011C1328D800B91418 /* MaterialBorder.swift */, 96D88C011C1328D800B91418 /* MaterialBorder.swift */,
96D88C041C1328D800B91418 /* MaterialDepth.swift */, 96D88C041C1328D800B91418 /* MaterialDepth.swift */,
...@@ -382,8 +378,7 @@ ...@@ -382,8 +378,7 @@
96D88C561C132ABF00B91418 /* MaterialTheme.swift in Headers */, 96D88C561C132ABF00B91418 /* MaterialTheme.swift in Headers */,
96D88C571C132ABF00B91418 /* CardView.swift in Headers */, 96D88C571C132ABF00B91418 /* CardView.swift in Headers */,
96D88C581C132ABF00B91418 /* ImageCardView.swift in Headers */, 96D88C581C132ABF00B91418 /* ImageCardView.swift in Headers */,
96D88C591C132ABF00B91418 /* MaterialStatusBarStyle.swift in Headers */, 96D88C5A1C132ABF00B91418 /* MaterialCornerRadius.swift in Headers */,
96D88C5A1C132ABF00B91418 /* MaterialRadius.swift in Headers */,
96D88C5B1C132ABF00B91418 /* MaterialShape.swift in Headers */, 96D88C5B1C132ABF00B91418 /* MaterialShape.swift in Headers */,
96D88C5C1C132ABF00B91418 /* MaterialBorder.swift in Headers */, 96D88C5C1C132ABF00B91418 /* MaterialBorder.swift in Headers */,
96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */, 96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */,
...@@ -505,14 +500,13 @@ ...@@ -505,14 +500,13 @@
96D88C3D1C1328D800B91418 /* MaterialView.swift in Sources */, 96D88C3D1C1328D800B91418 /* MaterialView.swift in Sources */,
96D88C291C1328D800B91418 /* MaterialBasicAnimation.swift in Sources */, 96D88C291C1328D800B91418 /* MaterialBasicAnimation.swift in Sources */,
96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */, 96D88C3A1C1328D800B91418 /* MaterialTextLayer.swift in Sources */,
96D88C371C1328D800B91418 /* MaterialRadius.swift in Sources */, 96D88C371C1328D800B91418 /* MaterialCornerRadius.swift in Sources */,
96D88C241C1328D800B91418 /* ImageCardView.swift in Sources */, 96D88C241C1328D800B91418 /* ImageCardView.swift in Sources */,
96D88C2B1C1328D800B91418 /* MaterialButton.swift in Sources */, 96D88C2B1C1328D800B91418 /* MaterialButton.swift in Sources */,
96D88C311C1328D800B91418 /* MaterialKeyframeAnimation.swift in Sources */, 96D88C311C1328D800B91418 /* MaterialKeyframeAnimation.swift in Sources */,
96D88C2E1C1328D800B91418 /* MaterialFont.swift in Sources */, 96D88C2E1C1328D800B91418 /* MaterialFont.swift in Sources */,
96D88C2A1C1328D800B91418 /* MaterialBorder.swift in Sources */, 96D88C2A1C1328D800B91418 /* MaterialBorder.swift in Sources */,
96D88C351C1328D800B91418 /* MaterialLayout.swift in Sources */, 96D88C351C1328D800B91418 /* MaterialLayout.swift in Sources */,
96D88C391C1328D800B91418 /* MaterialStatusBarStyle.swift in Sources */,
96D88C2F1C1328D800B91418 /* MaterialGravity.swift in Sources */, 96D88C2F1C1328D800B91418 /* MaterialGravity.swift in Sources */,
96D88C231C1328D800B91418 /* FlatButton.swift in Sources */, 96D88C231C1328D800B91418 /* FlatButton.swift in Sources */,
96D88C201C1328D800B91418 /* CapturePreviewView.swift in Sources */, 96D88C201C1328D800B91418 /* CapturePreviewView.swift in Sources */,
......
Sources/MaterialButton.swift
...@@ -215,10 +215,10 @@ public class MaterialButton : UIButton { ...@@ -215,10 +215,10 @@ public class MaterialButton : UIButton {
/** /**
:name: cornerRadius :name: cornerRadius
*/ */
public var cornerRadius: MaterialRadius? { public var cornerRadius: MaterialCornerRadius? {
didSet { didSet {
if let v: MaterialRadius = cornerRadius { if let v: MaterialCornerRadius = cornerRadius {
layer.cornerRadius = MaterialRadiusToValue(v) layer.cornerRadius = MaterialCornerRadiusToValue(v)
if .Circle == shape { if .Circle == shape {
shape = .None shape = .None
} }
......
Sources/MaterialRadius.swift → Sources/MaterialCornerRadius.swift
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
import UIKit import UIKit
public typealias MaterialRadiusType = CGFloat public typealias MaterialCornerRadiusType = CGFloat
public enum MaterialRadius { public enum MaterialCornerRadius {
case None case None
case Radius1 case Radius1
case Radius2 case Radius2
...@@ -29,9 +29,9 @@ public enum MaterialRadius { ...@@ -29,9 +29,9 @@ public enum MaterialRadius {
} }
/** /**
:name: MaterialRadiusToValue :name: MaterialCornerRadiusToValue
*/ */
public func MaterialRadiusToValue(radius: MaterialRadius) -> MaterialRadiusType { public func MaterialCornerRadiusToValue(radius: MaterialCornerRadius) -> MaterialCornerRadiusType {
switch radius { switch radius {
case .None: case .None:
return 0 return 0
......
Sources/MaterialStatusBarStyle.swift deleted 100644 → 0
//
// Copyright (C) 2015 CosmicMind, Inc. <http://cosmicmind.io> and other CosmicMind 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/>.
//
public enum MaterialStatusBarStyle : Int {
case Default
case LightContent
}
Sources/MaterialTheme.swift
...@@ -265,7 +265,7 @@ public extension MaterialTheme.flatButton { ...@@ -265,7 +265,7 @@ public extension MaterialTheme.flatButton {
public static var shadowColor: UIColor = MaterialColor.black public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var cornerRadius: MaterialRadius = .Radius1 public static var cornerRadius: MaterialCornerRadius = .Radius1
public static var contentInsets: MaterialEdgeInsets = .WideRectangle3 public static var contentInsets: MaterialEdgeInsets = .WideRectangle3
public static var shape: MaterialShape = .None public static var shape: MaterialShape = .None
...@@ -296,7 +296,7 @@ public extension MaterialTheme.raisedButton { ...@@ -296,7 +296,7 @@ public extension MaterialTheme.raisedButton {
public static var shadowColor: UIColor = MaterialColor.black public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var cornerRadius: MaterialRadius = .Radius1 public static var cornerRadius: MaterialCornerRadius = .Radius1
public static var contentInsets: MaterialEdgeInsets = .WideRectangle2 public static var contentInsets: MaterialEdgeInsets = .WideRectangle2
public static var shape: MaterialShape = .None public static var shape: MaterialShape = .None
......
Sources/MaterialView.swift
...@@ -210,10 +210,10 @@ public class MaterialView : UIView { ...@@ -210,10 +210,10 @@ public class MaterialView : UIView {
/** /**
:name: cornerRadius :name: cornerRadius
*/ */
public var cornerRadius: MaterialRadius { public var cornerRadius: MaterialCornerRadius {
didSet { didSet {
if let v: MaterialRadius = cornerRadius { if let v: MaterialCornerRadius = cornerRadius {
layer.cornerRadius = MaterialRadiusToValue(v) layer.cornerRadius = MaterialCornerRadiusToValue(v)
if .Circle == shape { if .Circle == shape {
shape = .None shape = .None
} }
......
Sources/NavigationBarView.swift
...@@ -22,9 +22,9 @@ public class NavigationBarView : MaterialView { ...@@ -22,9 +22,9 @@ public class NavigationBarView : MaterialView {
/** /**
:name: statusBarStyle :name: statusBarStyle
*/ */
public var statusBarStyle: MaterialStatusBarStyle! { public var statusBarStyle: UIStatusBarStyle = UIApplication.sharedApplication().statusBarStyle {
didSet { didSet {
UIApplication.sharedApplication().setStatusBarStyle(.LightContent == statusBarStyle ? .LightContent : .Default, animated: true) UIApplication.sharedApplication().statusBarStyle = statusBarStyle
} }
} }
......
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