Skip to content

M
Material
Commit 286cf1e9 by Daniel Dahan
Options

added type to tuples

parent 181d9e7c
Showing with 32 additions and 6 deletions
MaterialKit.xcodeproj/project.pbxproj
......@@ -18,6 +18,17 @@
65BDD1591BB6FE3E006F7F2B /* FlatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDD1581BB6FE3E006F7F2B /* FlatButton.swift */; settings = {ASSET_TAGS = (); }; };
65BDD15B1BB7095E006F7F2B /* MaterialRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDD15A1BB7095E006F7F2B /* MaterialRadius.swift */; settings = {ASSET_TAGS = (); }; };
65BDD15D1BB70D60006F7F2B /* MaterialInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BDD15C1BB70D60006F7F2B /* MaterialInsets.swift */; settings = {ASSET_TAGS = (); }; };
65BDD15E1BB7111E006F7F2B /* MaterialTheme.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD14C1BB5ED9F006F7F2B /* MaterialTheme.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD15F1BB7111E006F7F2B /* MaterialColor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1481BB5DC98006F7F2B /* MaterialColor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1601BB7111E006F7F2B /* MaterialGravity.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD14E1BB5EE4A006F7F2B /* MaterialGravity.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1611BB7111E006F7F2B /* MaterialShadow.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1531BB6F473006F7F2B /* MaterialShadow.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1621BB7111E006F7F2B /* MaterialRadius.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD15A1BB7095E006F7F2B /* MaterialRadius.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1631BB7111E006F7F2B /* MaterialInsets.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD15C1BB70D60006F7F2B /* MaterialInsets.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1641BB7111E006F7F2B /* MaterialFont.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD14A1BB5DD02006F7F2B /* MaterialFont.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1651BB7111E006F7F2B /* RobotoFont.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1511BB6EE7C006F7F2B /* RobotoFont.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1661BB7111E006F7F2B /* MaterialView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1461BB5B916006F7F2B /* MaterialView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1671BB7111E006F7F2B /* MaterialButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1561BB6FC82006F7F2B /* MaterialButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65BDD1681BB7111E006F7F2B /* FlatButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65BDD1581BB6FE3E006F7F2B /* FlatButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
65DBE4201B9A9244000C804F /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65DBE41E1B9A9244000C804F /* Roboto-Bold.ttf */; };
65DBE4211B9A9244000C804F /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65DBE41F1B9A9244000C804F /* Roboto-Thin.ttf */; };
962F3E531BACA68C0004B8AD /* NavigationBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962F3E521BACA68C0004B8AD /* NavigationBarView.swift */; };
......@@ -202,6 +213,17 @@
buildActionMask = 2147483647;
files = (
962F3E541BACA7FB0004B8AD /* NavigationBarView.swift in Headers */,
65BDD15E1BB7111E006F7F2B /* MaterialTheme.swift in Headers */,
65BDD15F1BB7111E006F7F2B /* MaterialColor.swift in Headers */,
65BDD1601BB7111E006F7F2B /* MaterialGravity.swift in Headers */,
65BDD1611BB7111E006F7F2B /* MaterialShadow.swift in Headers */,
65BDD1621BB7111E006F7F2B /* MaterialRadius.swift in Headers */,
65BDD1631BB7111E006F7F2B /* MaterialInsets.swift in Headers */,
65BDD1641BB7111E006F7F2B /* MaterialFont.swift in Headers */,
65BDD1651BB7111E006F7F2B /* RobotoFont.swift in Headers */,
65BDD1661BB7111E006F7F2B /* MaterialView.swift in Headers */,
65BDD1671BB7111E006F7F2B /* MaterialButton.swift in Headers */,
65BDD1681BB7111E006F7F2B /* FlatButton.swift in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Source/MaterialButton.swift
......@@ -133,7 +133,7 @@ public class MaterialButton : UIButton {
*/
public var shadow: MaterialShadow! {
didSet {
let value: (offset: CGSize, opacity: Float, radius: CGFloat) = MaterialShadowToValues(shadow)
let value: MaterialShadowType = MaterialShadowToValues(shadow)
shadowOffset = value.offset
shadowOpacity = value.opacity
shadowRadius = value.radius
......@@ -154,8 +154,8 @@ public class MaterialButton : UIButton {
*/
public var contentInsets: MaterialInsets! {
didSet {
let inset: (top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat) = MaterialInsetsToValues(contentInsets)
contentEdgeInsets = UIEdgeInsetsMake(inset.top, inset.left, inset.bottom, inset.right)
let value: MaterialInsetsType = MaterialInsetsToValues(contentInsets)
contentEdgeInsets = UIEdgeInsetsMake(value.top, value.left, value.bottom, value.right)
}
}
......
Source/MaterialInsets.swift
......@@ -18,6 +18,8 @@
import UIKit
public typealias MaterialInsetsType = (top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat)
public enum MaterialInsets {
case Inset0
case Inset1
......@@ -30,7 +32,7 @@ public enum MaterialInsets {
/**
:name: MaterialInsetsToValues
*/
public func MaterialInsetsToValues(inset: MaterialInsets) -> (top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat) {
public func MaterialInsetsToValues(inset: MaterialInsets) -> MaterialInsetsType {
switch inset {
case .Inset0:
return (top: 0, left: 0, bottom: 0, right: 0)
......
Source/MaterialShadow.swift
......@@ -18,6 +18,8 @@
import UIKit
public typealias MaterialShadowType = (offset: CGSize, opacity: Float, radius: CGFloat)
public enum MaterialShadow {
case Depth0
case Depth1
......@@ -30,7 +32,7 @@ public enum MaterialShadow {
/**
:name: MaterialShadowToValues
*/
public func MaterialShadowToValues(shadow: MaterialShadow) -> (offset: CGSize, opacity: Float, radius: CGFloat) {
public func MaterialShadowToValues(shadow: MaterialShadow) -> MaterialShadowType {
switch shadow {
case .Depth0:
return (offset: CGSizeZero, opacity: 0, radius: 0)
......
Source/MaterialView.swift
......@@ -178,7 +178,7 @@ public class MaterialView: UIView {
*/
public var shadow: MaterialShadow! {
didSet {
let value: (offset: CGSize, opacity: Float, radius: CGFloat) = MaterialShadowToValues(shadow)
let value: MaterialShadowType = MaterialShadowToValues(shadow)
shadowOffset = value.offset
shadowOpacity = value.opacity
shadowRadius = value.radius
......
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