Skip to content

M
Material
Commit e8baec48 by Daniel Dahan
Options

fixed breaking examples

parent ab729ce6
Showing with 75 additions and 16 deletions
Examples/Programmatic/App/App/AppNavigationBarViewController.swift
...@@ -57,7 +57,8 @@ class AppNavigationBarViewController: NavigationBarViewController { ...@@ -57,7 +57,8 @@ class AppNavigationBarViewController: NavigationBarViewController {
} }
/// Prepares view. /// Prepares view.
private func prepareView() { override func prepareView() {
super.prepareView()
view.backgroundColor = MaterialColor.black view.backgroundColor = MaterialColor.black
} }
......
Examples/Programmatic/App/App/AppSearchBarViewController.swift
...@@ -68,7 +68,8 @@ class AppSearchBarViewController: SearchBarViewController { ...@@ -68,7 +68,8 @@ class AppSearchBarViewController: SearchBarViewController {
} }
/// Prepares view. /// Prepares view.
private func prepareView() { override func prepareView() {
super.prepareView()
view.backgroundColor = MaterialColor.black view.backgroundColor = MaterialColor.black
searchBarView.textField.becomeFirstResponder() searchBarView.textField.becomeFirstResponder()
} }
......
Examples/Programmatic/NavigationBarViewController/NavigationBarViewController/AppNavigationBarViewController.swift
...@@ -54,7 +54,8 @@ class AppNavigationBarViewController: NavigationBarViewController { ...@@ -54,7 +54,8 @@ class AppNavigationBarViewController: NavigationBarViewController {
} }
/// Prepares view. /// Prepares view.
private func prepareView() { override func prepareView() {
super.prepareView()
view.backgroundColor = MaterialColor.black view.backgroundColor = MaterialColor.black
} }
......
Examples/Programmatic/SearchBarViewController/SearchBarViewController/AppSearchBarViewController.swift
...@@ -78,7 +78,8 @@ class AppSearchBarViewController: SearchBarViewController { ...@@ -78,7 +78,8 @@ class AppSearchBarViewController: SearchBarViewController {
} }
/// Prepares view. /// Prepares view.
private func prepareView() { override func prepareView() {
super.prepareView()
view.backgroundColor = MaterialColor.black view.backgroundColor = MaterialColor.black
} }
......
Material.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.34.4' s.version = '1.34.5'
s.license = 'BSD' s.license = 'BSD'
s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.' s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
Material.xcodeproj/project.pbxproj
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
96CC08581C7E11430034FF84 /* MaterialCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */; }; 96CC08581C7E11430034FF84 /* MaterialCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */; };
96CC085A1C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */; }; 96CC085A1C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */; };
96CC085C1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */; }; 96CC085C1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */; };
96CC085E1C7E1D550034FF84 /* MaterialCollectionViewDataSourceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC085D1C7E1D550034FF84 /* MaterialCollectionViewDataSourceItem.swift */; };
96D88C1E1C1328D800B91418 /* CaptureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF51C1328D800B91418 /* CaptureView.swift */; }; 96D88C1E1C1328D800B91418 /* CaptureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF51C1328D800B91418 /* CaptureView.swift */; };
96D88C1F1C1328D800B91418 /* CardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF61C1328D800B91418 /* CardView.swift */; }; 96D88C1F1C1328D800B91418 /* CardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF61C1328D800B91418 /* CardView.swift */; };
96D88C201C1328D800B91418 /* CapturePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF71C1328D800B91418 /* CapturePreviewView.swift */; }; 96D88C201C1328D800B91418 /* CapturePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF71C1328D800B91418 /* CapturePreviewView.swift */; };
...@@ -174,6 +175,7 @@ ...@@ -174,6 +175,7 @@
96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionView.swift; sourceTree = "<group>"; }; 96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionView.swift; sourceTree = "<group>"; };
96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionViewDataSource.swift; sourceTree = "<group>"; }; 96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionViewDataSource.swift; sourceTree = "<group>"; };
96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionViewDelegate.swift; sourceTree = "<group>"; }; 96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionViewDelegate.swift; sourceTree = "<group>"; };
96CC085D1C7E1D550034FF84 /* MaterialCollectionViewDataSourceItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCollectionViewDataSourceItem.swift; sourceTree = "<group>"; };
96D88BF51C1328D800B91418 /* CaptureView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaptureView.swift; sourceTree = "<group>"; }; 96D88BF51C1328D800B91418 /* CaptureView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaptureView.swift; sourceTree = "<group>"; };
96D88BF61C1328D800B91418 /* CardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardView.swift; sourceTree = "<group>"; }; 96D88BF61C1328D800B91418 /* CardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardView.swift; sourceTree = "<group>"; };
96D88BF71C1328D800B91418 /* CapturePreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CapturePreviewView.swift; sourceTree = "<group>"; }; 96D88BF71C1328D800B91418 /* CapturePreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CapturePreviewView.swift; sourceTree = "<group>"; };
...@@ -339,6 +341,7 @@ ...@@ -339,6 +341,7 @@
96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */, 96CC08571C7E11430034FF84 /* MaterialCollectionView.swift */,
96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */, 96CC08591C7E16BD0034FF84 /* MaterialCollectionViewDataSource.swift */,
96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */, 96CC085B1C7E16F20034FF84 /* MaterialCollectionViewDelegate.swift */,
96CC085D1C7E1D550034FF84 /* MaterialCollectionViewDataSourceItem.swift */,
); );
name = CollectionView; name = CollectionView;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -736,6 +739,7 @@ ...@@ -736,6 +739,7 @@
96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */, 96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */,
96D88C281C1328D800B91418 /* MaterialAnimation.swift in Sources */, 96D88C281C1328D800B91418 /* MaterialAnimation.swift in Sources */,
96A71F301C72E41100C0C4AE /* NavigationBarViewController.swift in Sources */, 96A71F301C72E41100C0C4AE /* NavigationBarViewController.swift in Sources */,
96CC085E1C7E1D550034FF84 /* MaterialCollectionViewDataSourceItem.swift in Sources */,
960B232E1C383EAA00E96216 /* Material+UIImage.swift in Sources */, 960B232E1C383EAA00E96216 /* Material+UIImage.swift in Sources */,
96D88C451C1328D800B91418 /* RobotoFont.swift in Sources */, 96D88C451C1328D800B91418 /* RobotoFont.swift in Sources */,
96D88C1F1C1328D800B91418 /* CardView.swift in Sources */, 96D88C1F1C1328D800B91418 /* CardView.swift in Sources */,
......
Sources/Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.34.4</string> <string>1.34.5</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Sources/MaterialCollectionViewCell.swift
...@@ -419,7 +419,6 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -419,7 +419,6 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
/// Manages the layout for the visualLayer property. /// Manages the layout for the visualLayer property.
internal func layoutVisualLayer() { internal func layoutVisualLayer() {
visualLayer.frame = bounds visualLayer.frame = bounds
visualLayer.backgroundColor = MaterialColor.green.base.CGColor
visualLayer.position = CGPointMake(width / 2, height / 2) visualLayer.position = CGPointMake(width / 2, height / 2)
visualLayer.cornerRadius = layer.cornerRadius visualLayer.cornerRadius = layer.cornerRadius
} }
......
Sources/MaterialCollectionViewDataSource.swift
...@@ -29,5 +29,5 @@ ...@@ -29,5 +29,5 @@
*/ */
public protocol MaterialCollectionViewDataSource : MaterialDelegate, UICollectionViewDataSource { public protocol MaterialCollectionViewDataSource : MaterialDelegate, UICollectionViewDataSource {
func items() -> Array<AnyObject> func items() -> Array<MaterialCollectionViewDataSourceItem>
} }
\ No newline at end of file
Sources/MaterialCollectionViewDataSourceItem.swift 0 → 100644
/*
* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of Material nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
public struct MaterialCollectionViewDataSourceItem {
var data: AnyObject
var height: CGFloat
public init(data: AnyObject, height: CGFloat) {
self.data = data
self.height = height
}
}
\ No newline at end of file
Sources/MaterialCollectionViewLayout.swift
...@@ -33,17 +33,26 @@ import UIKit ...@@ -33,17 +33,26 @@ import UIKit
public class MaterialCollectionViewLayout : UICollectionViewLayout { public class MaterialCollectionViewLayout : UICollectionViewLayout {
private var contentSize: CGSize = CGSizeZero private var contentSize: CGSize = CGSizeZero
private var layoutItems: Array<(UICollectionViewLayoutAttributes, NSIndexPath)>? private var layoutItems: Array<(UICollectionViewLayoutAttributes, NSIndexPath)>?
public var height: CGFloat = 88 private var offset: CGFloat = 0
public var offset: CGFloat = 0
public override func layoutAttributesForItemAtIndexPath(indexPath: NSIndexPath) -> UICollectionViewLayoutAttributes? { public override func layoutAttributesForItemAtIndexPath(indexPath: NSIndexPath) -> UICollectionViewLayoutAttributes? {
let attributes: UICollectionViewLayoutAttributes = UICollectionViewLayoutAttributes(forCellWithIndexPath: indexPath) let attributes: UICollectionViewLayoutAttributes = UICollectionViewLayoutAttributes(forCellWithIndexPath: indexPath)
let dataSource: MaterialCollectionViewDataSource = collectionView!.dataSource as! MaterialCollectionViewDataSource
let items: Array<MaterialCollectionViewDataSourceItem> = dataSource.items()
if 0 == indexPath.row {
offset = 0
}
let item: MaterialCollectionViewDataSourceItem = items[indexPath.row]
let w: CGFloat = collectionView!.bounds.width let w: CGFloat = collectionView!.bounds.width
let r: CGFloat = CGFloat(indexPath.row) let h: CGFloat = item.height
let h: CGFloat = CGFloat(height)
attributes.frame = CGRectMake(0, offset, w, h)
attributes.frame = CGRectMake(0, r * CGFloat(h + (0 < r ? offset : 0)), w, h) offset += h
return attributes return attributes
} }
...@@ -68,15 +77,17 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout { ...@@ -68,15 +77,17 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout {
public override func prepareLayout() { public override func prepareLayout() {
let dataSource: MaterialCollectionViewDataSource = collectionView!.dataSource as! MaterialCollectionViewDataSource let dataSource: MaterialCollectionViewDataSource = collectionView!.dataSource as! MaterialCollectionViewDataSource
let items: Array<AnyObject> = dataSource.items() let items: Array<MaterialCollectionViewDataSourceItem> = dataSource.items()
layoutItems = Array<(UICollectionViewLayoutAttributes, NSIndexPath)>() layoutItems = Array<(UICollectionViewLayoutAttributes, NSIndexPath)>()
var indexPath: NSIndexPath? var indexPath: NSIndexPath?
var count: Int = 0 var count: Int = 0
for _ in items { var height: CGFloat = 0
for item in items {
indexPath = NSIndexPath(forItem: count++, inSection: 0) indexPath = NSIndexPath(forItem: count++, inSection: 0)
layoutItems?.append((layoutAttributesForItemAtIndexPath(indexPath!)!, indexPath!)) layoutItems?.append((layoutAttributesForItemAtIndexPath(indexPath!)!, indexPath!))
height += item.height
} }
let w: CGFloat = collectionView!.bounds.width let w: CGFloat = collectionView!.bounds.width
......
Sources/NavigationBarViewController.swift
...@@ -143,8 +143,8 @@ public class NavigationBarViewController: StatusBarViewController { ...@@ -143,8 +143,8 @@ public class NavigationBarViewController: StatusBarViewController {
when subclassing. when subclassing.
*/ */
public override func prepareView() { public override func prepareView() {
prepareNavigationBarView()
super.prepareView() super.prepareView()
prepareNavigationBarView()
} }
/// Prepares the NavigationBarView. /// Prepares the NavigationBarView.
......
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