updated PulseView to MaterialPulseView

56d27cc9 · Daniel Dahan · fa84e1bf · 56d27cc9 · 56d27cc9 · 56d27cc9
Commit 56d27cc9 authored Aug 23, 2015 by Daniel Dahan
Hide whitespace changes
Inline Side-by-side

Showing with 37 additions and 25 deletions

MaterialKit.xcodeproj/project.pbxproj
+4 -12

Source/BasicCard.swift
+1 -1

Source/ImageCard.swift
+17 -7

Source/MaterialPulseView.swift
+15 -5

No files found.
--- a/MaterialKit.xcodeproj/project.pbxproj
+++ b/MaterialKit.xcodeproj/project.pbxproj
@@ -34,7 +34,7 @@
 		9A94D0FB1B895EA500F586A5 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38591B8956E300FE6B2D /* Roboto-Regular.ttf */; };
 		9A94D0FC1B895EA500F586A5 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38571B8956CF00FE6B2D /* Roboto-Medium.ttf */; };
 		9A94D0FD1B895EA500F586A5 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38551B8956C500FE6B2D /* Roboto-Light.ttf */; };
-		9A94D1091B8A3F5100F586A5 /* PulseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* PulseView.swift */; };
+		9A94D1091B8A3F5100F586A5 /* MaterialPulseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialPulseView.swift */; };
 		9A94D10B1B8A485C00F586A5 /* ImageCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D10A1B8A485C00F586A5 /* ImageCard.swift */; };
 		9AAC384D1B89528900FE6B2D /* BasicCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AAC384C1B89528900FE6B2D /* BasicCard.swift */; };
 		9AAC38541B89559900FE6B2D /* Roboto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AAC38531B89559900FE6B2D /* Roboto.swift */; };
@@ -69,7 +69,7 @@
 		963832671B88E5BF0015F710 /* TextStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextStorage.swift; sourceTree = "<group>"; };
 		963832681B88E5BF0015F710 /* TextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
 		963832871B8908180015F710 /* Layout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
-		9A94D1081B8A3F5100F586A5 /* PulseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PulseView.swift; sourceTree = "<group>"; };
+		9A94D1081B8A3F5100F586A5 /* MaterialPulseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialPulseView.swift; sourceTree = "<group>"; };
 		9A94D10A1B8A485C00F586A5 /* ImageCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCard.swift; sourceTree = "<group>"; };
 		9AAC384C1B89528900FE6B2D /* BasicCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCard.swift; sourceTree = "<group>"; };
 		9AAC38531B89559900FE6B2D /* Roboto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Roboto.swift; sourceTree = "<group>"; };
@@ -101,6 +101,7 @@
 			isa = PBXGroup;
 			children = (
 				65B965741B8A60A00055B139 /* MaterialView.swift */,
+				9A94D1081B8A3F5100F586A5 /* MaterialPulseView.swift */,
 				65B965711B8A578D0055B139 /* MaterialViewController.swift */,
 			);
 			name = View;
@@ -127,7 +128,6 @@
 		963832521B88E30F0015F710 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				9A94D1071B8A3F4200F586A5 /* Base */,
 				963832631B88E5BF0015F710 /* LICENSE */,
 				9638325C1B88E3420015F710 /* Supporting Files */,
 				9AAC38521B89553800FE6B2D /* Font */,
@@ -203,14 +203,6 @@
 			name = Layout;
 			sourceTree = "<group>";
 		};
-		9A94D1071B8A3F4200F586A5 /* Base */ = {
-			isa = PBXGroup;
-			children = (
-				9A94D1081B8A3F5100F586A5 /* PulseView.swift */,
-			);
-			name = Base;
-			sourceTree = "<group>";
-		};
 		9AAC384B1B89524E00FE6B2D /* Card */ = {
 			isa = PBXGroup;
 			children = (
@@ -355,7 +347,7 @@
 				963832691B88E5BF0015F710 /* Capture.swift in Sources */,
 				9A94D10B1B8A485C00F586A5 /* ImageCard.swift in Sources */,
 				9638326B1B88E5BF0015F710 /* FabButton.swift in Sources */,
-				9A94D1091B8A3F5100F586A5 /* PulseView.swift in Sources */,
+				9A94D1091B8A3F5100F586A5 /* MaterialPulseView.swift in Sources */,
 				9638326C1B88E5BF0015F710 /* FlatButton.swift in Sources */,
 				65B965751B8A60A00055B139 /* MaterialView.swift in Sources */,
 				963832711B88E5BF0015F710 /* Text.swift in Sources */,

--- a/Source/BasicCard.swift
+++ b/Source/BasicCard.swift
@@ -19,7 +19,7 @@
 import UIKit
 import QuartzCore
-public class BasicCard : PulseView {
+public class BasicCard : MaterialPulseView {
    public var cancelButton: FlatButton = FlatButton()
    public var otherButton: FlatButton = FlatButton()

--- a/Source/ImageCard.swift
+++ b/Source/ImageCard.swift
 //
-//  ImageCard.swift
+// Copyright (C) 2015 GraphKit, Inc. <http://graphkit.io> and other GraphKit contributors.
-//  MaterialKit
 //
-//  Created by Adam Dahan on 2015-08-23.
+// This program is free software: you can redistribute it and/or modify
-//  Copyright (c) 2015 GraphKit Inc. All rights reserved.
+// 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
-public class ImageCard : PulseView {
+public class ImageCard : MaterialPulseView {
    public lazy var imageView: UIImageView = UIImageView()
@@ -36,7 +46,7 @@ public class ImageCard : PulseView {
    internal override func constrainSubviews() {
        super.constrainSubviews()
-        addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|-(0)-[imageView]-(0)-|", options: nil, metrics: nil, views: views as [NSObject : AnyObject]))
+        addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|[imageView]|", options: nil, metrics: nil, views: views as [NSObject : AnyObject]))
-        addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|-(0)-[imageView]-(0)-|", options: nil, metrics: nil, views: views as [NSObject : AnyObject]))
+        addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|[imageView]|", options: nil, metrics: nil, views: views as [NSObject : AnyObject]))
    }
 }
--- a/Source/PulseView.swift
+++ b/Source/PulseView.swift
 //
-//  PulseView.swift
+// Copyright (C) 2015 GraphKit, Inc. <http://graphkit.io> and other GraphKit contributors.
-//  MaterialKit
 //
-//  Created by Adam Dahan on 2015-08-23.
+// This program is free software: you can redistribute it and/or modify
-//  Copyright (c) 2015 GraphKit Inc. All rights reserved.
+// 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
-public class PulseView : UIView {
+public class MaterialPulseView : MaterialView {
    internal lazy var views: NSMutableDictionary = NSMutableDictionary()