Skip to content

M
Material
Commit 1314e6ff by Daniel Dahan
Options

prepare for release

parent dadbbd33
Showing with 31 additions and 38 deletions
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
9663F94E1C7A74EA00AF0965 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */; }; 9663F94E1C7A74EA00AF0965 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */; };
9663F9501C7A74FC00AF0965 /* AppRightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94F1C7A74FC00AF0965 /* AppRightViewController.swift */; }; 9663F9501C7A74FC00AF0965 /* AppRightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94F1C7A74FC00AF0965 /* AppRightViewController.swift */; };
9663F9521C7A751D00AF0965 /* ItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9511C7A751D00AF0965 /* ItemViewController.swift */; }; 9663F9521C7A751D00AF0965 /* ItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9511C7A751D00AF0965 /* ItemViewController.swift */; };
96AC822A1C97DE25007654F0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AC82291C97DE25007654F0 /* Material.framework */; };
96AC822B1C97DE25007654F0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96AC82291C97DE25007654F0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96CC08881C7FEBD60034FF84 /* RecipesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */; }; 96CC08881C7FEBD60034FF84 /* RecipesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -29,7 +27,6 @@ ...@@ -29,7 +27,6 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
96AC822B1C97DE25007654F0 /* Material.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -49,7 +46,6 @@ ...@@ -49,7 +46,6 @@
9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; }; 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; };
9663F94F1C7A74FC00AF0965 /* AppRightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppRightViewController.swift; sourceTree = "<group>"; }; 9663F94F1C7A74FC00AF0965 /* AppRightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppRightViewController.swift; sourceTree = "<group>"; };
9663F9511C7A751D00AF0965 /* ItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemViewController.swift; sourceTree = "<group>"; }; 9663F9511C7A751D00AF0965 /* ItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemViewController.swift; sourceTree = "<group>"; };
96AC82291C97DE25007654F0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-hbpnflxhoouqxebjcyhbbhqyesjd/Build/Products/Debug-iphoneos/Material.framework"; sourceTree = "<absolute>"; };
96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecipesViewController.swift; sourceTree = "<group>"; }; 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecipesViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -58,7 +54,6 @@ ...@@ -58,7 +54,6 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96AC822A1C97DE25007654F0 /* Material.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -68,7 +63,6 @@ ...@@ -68,7 +63,6 @@
9663F9251C7A744500AF0965 = { 9663F9251C7A744500AF0965 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96AC82291C97DE25007654F0 /* Material.framework */,
9663F9301C7A744600AF0965 /* App */, 9663F9301C7A744600AF0965 /* App */,
9663F92F1C7A744600AF0965 /* Products */, 9663F92F1C7A744600AF0965 /* Products */,
); );
......
Examples/Programmatic/App/App/Info.plist
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
......
Examples/Storyboards/CardView/CardView/Base.lproj/Main.storyboard
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
......
Examples/Storyboards/MaterialPulseView/MaterialPulseView/Assets.xcassets/ContentAppIcon.imageset/Contents.json → Examples/Storyboards/MaterialPulseView/MaterialPulseView/Assets.xcassets/CosmicMindInverted.imageset/Contents.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ContentAppIcon.png", "filename" : "CosmicMindInverted.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
......
Examples/Storyboards/MaterialPulseView/MaterialPulseView/Base.lproj/Main.storyboard
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<constraint firstAttribute="height" constant="200" id="HWq-yF-e3p"/> <constraint firstAttribute="height" constant="200" id="HWq-yF-e3p"/>
</constraints> </constraints>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="image" keyPath="image" value="ContentAppIcon"/> <userDefinedRuntimeAttribute type="image" keyPath="image" value="CosmicMindInverted"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="pulseFocus" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</view> </view>
</subviews> </subviews>
...@@ -45,6 +46,6 @@ ...@@ -45,6 +46,6 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="ContentAppIcon" width="1024" height="1024"/> <image name="CosmicMindInverted" width="250" height="250"/>
</resources> </resources>
</document> </document>
Examples/Storyboards/TextField/TextField/Base.lproj/Main.storyboard
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
......
Sources/CapturePreviewView.swift → Sources/CapturePreview.swift
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
import UIKit import UIKit
import AVFoundation import AVFoundation
public class CapturePreviewView : MaterialView { public class CapturePreview : MaterialView {
/** /**
:name: layerClass :name: layerClass
*/ */
......
Sources/CaptureView.swift
...@@ -203,7 +203,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -203,7 +203,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/** /**
:name: previewView :name: previewView
*/ */
public private(set) lazy var previewView: CapturePreviewView = CapturePreviewView() public private(set) lazy var previewView: CapturePreview = CapturePreview()
/** /**
:name: capture :name: capture
......
Sources/ImageCardView.swift
...@@ -127,7 +127,7 @@ public class ImageCardView : MaterialPulseView { ...@@ -127,7 +127,7 @@ public class ImageCardView : MaterialPulseView {
/** /**
:name: contentsRect :name: contentsRect
*/ */
public override var contentsRect: CGRect { @IBInspectable public override var contentsRect: CGRect {
didSet { didSet {
prepareImageLayer() prepareImageLayer()
imageLayer?.contentsRect = contentsRect imageLayer?.contentsRect = contentsRect
...@@ -137,7 +137,7 @@ public class ImageCardView : MaterialPulseView { ...@@ -137,7 +137,7 @@ public class ImageCardView : MaterialPulseView {
/** /**
:name: contentsCenter :name: contentsCenter
*/ */
public override var contentsCenter: CGRect { @IBInspectable public override var contentsCenter: CGRect {
didSet { didSet {
prepareImageLayer() prepareImageLayer()
imageLayer?.contentsCenter = contentsCenter imageLayer?.contentsCenter = contentsCenter
......
Sources/MaterialButton.swift
...@@ -147,7 +147,7 @@ public class MaterialButton : UIButton { ...@@ -147,7 +147,7 @@ public class MaterialButton : UIButton {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -177,7 +177,7 @@ public class MaterialButton : UIButton { ...@@ -177,7 +177,7 @@ public class MaterialButton : UIButton {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
......
Sources/MaterialCollectionViewCell.swift
...@@ -78,7 +78,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -78,7 +78,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
much greater flexibility than the contentsGravity property in much greater flexibility than the contentsGravity property in
terms of how the image is cropped and stretched. terms of how the image is cropped and stretched.
*/ */
public var contentsRect: CGRect { @IBInspectable public var contentsRect: CGRect {
get { get {
return visualLayer.contentsRect return visualLayer.contentsRect
} }
...@@ -91,7 +91,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -91,7 +91,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
A CGRect that defines a stretchable region inside the visualLayer A CGRect that defines a stretchable region inside the visualLayer
with a fixed border around the edge. with a fixed border around the edge.
*/ */
public var contentsCenter: CGRect { @IBInspectable public var contentsCenter: CGRect {
get { get {
return visualLayer.contentsCenter return visualLayer.contentsCenter
} }
...@@ -254,7 +254,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -254,7 +254,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -284,7 +284,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -284,7 +284,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
...@@ -392,7 +392,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell { ...@@ -392,7 +392,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
} }
/// A property that accesses the layer.position property. /// A property that accesses the layer.position property.
public var position: CGPoint { @IBInspectable public var position: CGPoint {
get { get {
return layer.position return layer.position
} }
......
Sources/MaterialTableViewCell.swift
...@@ -140,7 +140,7 @@ public class MaterialTableViewCell : UITableViewCell { ...@@ -140,7 +140,7 @@ public class MaterialTableViewCell : UITableViewCell {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -170,7 +170,7 @@ public class MaterialTableViewCell : UITableViewCell { ...@@ -170,7 +170,7 @@ public class MaterialTableViewCell : UITableViewCell {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
...@@ -257,7 +257,7 @@ public class MaterialTableViewCell : UITableViewCell { ...@@ -257,7 +257,7 @@ public class MaterialTableViewCell : UITableViewCell {
} }
/// A property that accesses the layer.position property. /// A property that accesses the layer.position property.
public var position: CGPoint { @IBInspectable public var position: CGPoint {
get { get {
return layer.position return layer.position
} }
......
Sources/MaterialView.swift
...@@ -63,7 +63,7 @@ public class MaterialView : UIView { ...@@ -63,7 +63,7 @@ public class MaterialView : UIView {
much greater flexibility than the contentsGravity property in much greater flexibility than the contentsGravity property in
terms of how the image is cropped and stretched. terms of how the image is cropped and stretched.
*/ */
public var contentsRect: CGRect { @IBInspectable public var contentsRect: CGRect {
get { get {
return visualLayer.contentsRect return visualLayer.contentsRect
} }
...@@ -76,7 +76,7 @@ public class MaterialView : UIView { ...@@ -76,7 +76,7 @@ public class MaterialView : UIView {
A CGRect that defines a stretchable region inside the visualLayer A CGRect that defines a stretchable region inside the visualLayer
with a fixed border around the edge. with a fixed border around the edge.
*/ */
public var contentsCenter: CGRect { @IBInspectable public var contentsCenter: CGRect {
get { get {
return visualLayer.contentsCenter return visualLayer.contentsCenter
} }
...@@ -202,7 +202,7 @@ public class MaterialView : UIView { ...@@ -202,7 +202,7 @@ public class MaterialView : UIView {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -232,7 +232,7 @@ public class MaterialView : UIView { ...@@ -232,7 +232,7 @@ public class MaterialView : UIView {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
......
Sources/SideNavigationViewController.swift → Sources/SideNavigationController.swift
...@@ -253,7 +253,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel ...@@ -253,7 +253,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
guard nil != rightView else { guard nil != rightView else {
return false return false
} }
return rightView!.x != view.bounds.width return rightView!.x != MaterialDevice.width
} }
/** /**
......
Sources/TextField.swift
...@@ -118,7 +118,7 @@ public class TextField : UITextField { ...@@ -118,7 +118,7 @@ public class TextField : UITextField {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -148,7 +148,7 @@ public class TextField : UITextField { ...@@ -148,7 +148,7 @@ public class TextField : UITextField {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
......
Sources/TextView.swift
...@@ -120,7 +120,7 @@ public class TextView: UITextView { ...@@ -120,7 +120,7 @@ public class TextView: UITextView {
} }
/// A property that accesses the backing layer's shadowOffset. /// A property that accesses the backing layer's shadowOffset.
public var shadowOffset: CGSize { @IBInspectable public var shadowOffset: CGSize {
get { get {
return layer.shadowOffset return layer.shadowOffset
} }
...@@ -150,7 +150,7 @@ public class TextView: UITextView { ...@@ -150,7 +150,7 @@ public class TextView: UITextView {
} }
/// A property that accesses the backing layer's shadowPath. /// A property that accesses the backing layer's shadowPath.
public var shadowPath: CGPath? { @IBInspectable public var shadowPath: CGPath? {
get { get {
return layer.shadowPath return layer.shadowPath
} }
...@@ -258,7 +258,7 @@ public class TextView: UITextView { ...@@ -258,7 +258,7 @@ public class TextView: UITextView {
} }
/// A property that accesses the layer.position property. /// A property that accesses the layer.position property.
public var position: CGPoint { @IBInspectable public var position: CGPoint {
get { get {
return layer.position return layer.position
} }
......
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