Skip to content

M
Material
Commit e59a6f3e by Daniel Dahan
Options

updated prepareView to be public for overriding privileges

parent e73889da
Showing with 157 additions and 147 deletions
MK.podspec
Pod::Spec.new do |s|
s.name = 'MK'
s.version = '1.21.2'
s.version = '1.22.0'
s.license = { :type => "AGPLv3+", :file => "LICENSE" }
s.summary = 'A Material Design Framework In Swift'
s.homepage = 'http://materialkit.io'
......
MaterialKit.xcodeproj/project.pbxproj
......@@ -60,6 +60,11 @@
964B17D91BBB3911002A9CA0 /* BasicCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 964B17D81BBB3911002A9CA0 /* BasicCardView.swift */; settings = {ASSET_TAGS = (); }; };
965C17C51BC8273D00B1059A /* MaterialCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965C17C41BC8273D00B1059A /* MaterialCollectionViewCell.swift */; settings = {ASSET_TAGS = (); }; };
965C17C71BC8279F00B1059A /* BasicCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965C17C61BC8279F00B1059A /* BasicCollectionViewCell.swift */; settings = {ASSET_TAGS = (); }; };
965C17C81BC82FEF00B1059A /* MaterialLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65AD15E91BC05B3A0068AF9C /* MaterialLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17C91BC82FEF00B1059A /* MaterialTextLayer.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9699879B1BC5FE49006D678E /* MaterialTextLayer.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17CA1BC82FEF00B1059A /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D26BFC1BC23649006478BD /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17CB1BC82FEF00B1059A /* MaterialCollectionViewCell.swift in Headers */ = {isa = PBXBuildFile; fileRef = 965C17C41BC8273D00B1059A /* MaterialCollectionViewCell.swift */; settings = {ATTRIBUTES = (Public, ); }; };
965C17CC1BC82FEF00B1059A /* BasicCollectionViewCell.swift in Headers */ = {isa = PBXBuildFile; fileRef = 965C17C61BC8279F00B1059A /* BasicCollectionViewCell.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9699879C1BC5FE49006D678E /* MaterialTextLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9699879B1BC5FE49006D678E /* MaterialTextLayer.swift */; settings = {ASSET_TAGS = (); }; };
96C4FABE1BC3168900E4FFC3 /* MaterialTransitionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96C4FABD1BC3168900E4FFC3 /* MaterialTransitionAnimation.swift */; settings = {ASSET_TAGS = (); }; };
96D26BFD1BC23649006478BD /* ImageCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D26BFC1BC23649006478BD /* ImageCardView.swift */; settings = {ASSET_TAGS = (); }; };
......@@ -354,6 +359,11 @@
964B17D51BBB31C2002A9CA0 /* MaterialAnimation.swift in Headers */,
964B17D61BBB31C2002A9CA0 /* MaterialLayout.swift in Headers */,
6585D21A1BBCDFBF00426D22 /* BasicCardView.swift in Headers */,
965C17C81BC82FEF00B1059A /* MaterialLayer.swift in Headers */,
965C17C91BC82FEF00B1059A /* MaterialTextLayer.swift in Headers */,
965C17CA1BC82FEF00B1059A /* ImageCardView.swift in Headers */,
965C17CB1BC82FEF00B1059A /* MaterialCollectionViewCell.swift in Headers */,
965C17CC1BC82FEF00B1059A /* BasicCollectionViewCell.swift in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Source/BasicCardView.swift
......@@ -237,6 +237,33 @@ public class BasicCardView : MaterialPulseView {
}
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.basicCardView.userInteractionEnabled
backgroundColor = MaterialTheme.basicCardView.backgroundColor
contentInsetsRef = MaterialTheme.basicCardView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.basicCardView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.basicCardView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.basicCardView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.basicCardView.rightButtonsInsetsRef
contentsRect = MaterialTheme.basicCardView.contentsRect
contentsCenter = MaterialTheme.basicCardView.contentsCenter
contentsScale = MaterialTheme.basicCardView.contentsScale
contentsGravity = MaterialTheme.basicCardView.contentsGravity
shadowDepth = MaterialTheme.basicCardView.shadowDepth
shadowColor = MaterialTheme.basicCardView.shadowColor
zPosition = MaterialTheme.basicCardView.zPosition
masksToBounds = MaterialTheme.basicCardView.masksToBounds
cornerRadius = MaterialTheme.basicCardView.cornerRadius
borderWidth = MaterialTheme.basicCardView.borderWidth
borderColor = MaterialTheme.basicCardView.bordercolor
dividerColor = MaterialTheme.basicCardView.dividerColor
}
/**
:name: reloadView
*/
public func reloadView() {
......@@ -390,31 +417,4 @@ public class BasicCardView : MaterialPulseView {
self.leftButtons = leftButtons
self.rightButtons = rightButtons
}
//
// :name: prepareView
//
internal override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.basicCardView.userInteractionEnabled
backgroundColor = MaterialTheme.basicCardView.backgroundColor
contentInsetsRef = MaterialTheme.basicCardView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.basicCardView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.basicCardView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.basicCardView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.basicCardView.rightButtonsInsetsRef
contentsRect = MaterialTheme.basicCardView.contentsRect
contentsCenter = MaterialTheme.basicCardView.contentsCenter
contentsScale = MaterialTheme.basicCardView.contentsScale
contentsGravity = MaterialTheme.basicCardView.contentsGravity
shadowDepth = MaterialTheme.basicCardView.shadowDepth
shadowColor = MaterialTheme.basicCardView.shadowColor
zPosition = MaterialTheme.basicCardView.zPosition
masksToBounds = MaterialTheme.basicCardView.masksToBounds
cornerRadius = MaterialTheme.basicCardView.cornerRadius
borderWidth = MaterialTheme.basicCardView.borderWidth
borderColor = MaterialTheme.basicCardView.bordercolor
dividerColor = MaterialTheme.basicCardView.dividerColor
}
}
Source/BasicCollectionViewCell.swift
......@@ -39,10 +39,10 @@ public class BasicCollectionViewCell : MaterialCollectionViewCell {
*/
public private(set) lazy var rightLayer: MaterialLayer = MaterialLayer()
//
// :name: prepareView
//
internal override func prepareView() {
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
// title
......
Source/FabButton.swift
......@@ -19,10 +19,10 @@
import UIKit
public class FabButton : MaterialButton {
//
// :name: prepareView
//
internal override func prepareView() {
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
setTitleColor(MaterialTheme.fabButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel!.font = MaterialTheme.fabButton.titleLabelFont
......
Source/FlatButton.swift
......@@ -19,10 +19,10 @@
import UIKit
public class FlatButton : MaterialButton {
//
// :name: prepareView
//
internal override func prepareView() {
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
setTitleColor(MaterialTheme.flatButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel!.font = MaterialTheme.flatButton.titleLabelFont
......
Source/ImageCardView.swift
......@@ -321,6 +321,35 @@ public class ImageCardView : MaterialPulseView {
}
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.imageCardView.userInteractionEnabled
backgroundColor = MaterialTheme.imageCardView.backgroundColor
contentInsetsRef = MaterialTheme.imageCardView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.imageCardView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.imageCardView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.imageCardView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.imageCardView.rightButtonsInsetsRef
contentsRect = MaterialTheme.imageCardView.contentsRect
contentsCenter = MaterialTheme.imageCardView.contentsCenter
contentsScale = MaterialTheme.imageCardView.contentsScale
contentsGravity = MaterialTheme.imageCardView.contentsGravity
shadowDepth = MaterialTheme.imageCardView.shadowDepth
shadowColor = MaterialTheme.imageCardView.shadowColor
zPosition = MaterialTheme.imageCardView.zPosition
masksToBounds = MaterialTheme.imageCardView.masksToBounds
cornerRadius = MaterialTheme.imageCardView.cornerRadius
borderWidth = MaterialTheme.imageCardView.borderWidth
borderColor = MaterialTheme.imageCardView.bordercolor
dividerColor = MaterialTheme.imageCardView.dividerColor
visualLayer.masksToBounds = true
}
/**
:name: reloadView
*/
public func reloadView() {
......@@ -490,33 +519,4 @@ public class ImageCardView : MaterialPulseView {
self.leftButtons = leftButtons
self.rightButtons = rightButtons
}
//
// :name: prepareView
//
internal override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.imageCardView.userInteractionEnabled
backgroundColor = MaterialTheme.imageCardView.backgroundColor
contentInsetsRef = MaterialTheme.imageCardView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.imageCardView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.imageCardView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.imageCardView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.imageCardView.rightButtonsInsetsRef
contentsRect = MaterialTheme.imageCardView.contentsRect
contentsCenter = MaterialTheme.imageCardView.contentsCenter
contentsScale = MaterialTheme.imageCardView.contentsScale
contentsGravity = MaterialTheme.imageCardView.contentsGravity
shadowDepth = MaterialTheme.imageCardView.shadowDepth
shadowColor = MaterialTheme.imageCardView.shadowColor
zPosition = MaterialTheme.imageCardView.zPosition
masksToBounds = MaterialTheme.imageCardView.masksToBounds
cornerRadius = MaterialTheme.imageCardView.cornerRadius
borderWidth = MaterialTheme.imageCardView.borderWidth
borderColor = MaterialTheme.imageCardView.bordercolor
dividerColor = MaterialTheme.imageCardView.dividerColor
visualLayer.masksToBounds = true
}
}
Source/Info.plist
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.21.2</string>
<string>1.22.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
Source/MaterialButton.swift
......@@ -445,10 +445,10 @@ public class MaterialButton : UIButton {
return nil // returning nil enables the animations for the layer property that are normally disabled.
}
//
// :name: prepareView
//
internal func prepareView() {
/**
:name: prepareView
*/
public func prepareView() {
// visualLayer
visualLayer.zPosition = -1
layer.addSublayer(visualLayer)
......
Source/MaterialCollectionViewCell.swift
......@@ -424,6 +424,39 @@ public class MaterialCollectionViewCell : UICollectionViewCell, UIGestureRecogni
return false
}
/**
:name: prepareView
*/
public func prepareView() {
userInteractionEnabled = MaterialTheme.flatButton.userInteractionEnabled
backgroundColor = MaterialTheme.flatButton.backgroundColor
pulseColorOpacity = MaterialTheme.flatButton.pulseColorOpacity
pulseColor = MaterialTheme.flatButton.pulseColor
shadowDepth = MaterialTheme.flatButton.shadowDepth
shadowColor = MaterialTheme.flatButton.shadowColor
zPosition = MaterialTheme.flatButton.zPosition
masksToBounds = MaterialTheme.flatButton.masksToBounds
cornerRadius = MaterialTheme.flatButton.cornerRadius
borderWidth = MaterialTheme.flatButton.borderWidth
borderColor = MaterialTheme.flatButton.bordercolor
shape = MaterialTheme.flatButton.shape
// visualLayer
visualLayer.zPosition = -1
layer.addSublayer(visualLayer)
// pulseLayer
pulseLayer.hidden = true
pulseLayer.zPosition = 1
visualLayer.addSublayer(pulseLayer)
// gesture
panRecognizer = UIPanGestureRecognizer(target: self, action: "handlePanGesture:")
panRecognizer.delegate = self
addGestureRecognizer(panRecognizer)
}
//
// :name: handlePanGesture
//
......@@ -461,39 +494,6 @@ public class MaterialCollectionViewCell : UICollectionViewCell, UIGestureRecogni
}
//
// :name: prepareView
//
internal func prepareView() {
userInteractionEnabled = MaterialTheme.flatButton.userInteractionEnabled
backgroundColor = MaterialTheme.flatButton.backgroundColor
pulseColorOpacity = MaterialTheme.flatButton.pulseColorOpacity
pulseColor = MaterialTheme.flatButton.pulseColor
shadowDepth = MaterialTheme.flatButton.shadowDepth
shadowColor = MaterialTheme.flatButton.shadowColor
zPosition = MaterialTheme.flatButton.zPosition
masksToBounds = MaterialTheme.flatButton.masksToBounds
cornerRadius = MaterialTheme.flatButton.cornerRadius
borderWidth = MaterialTheme.flatButton.borderWidth
borderColor = MaterialTheme.flatButton.bordercolor
shape = MaterialTheme.flatButton.shape
// visualLayer
visualLayer.zPosition = -1
layer.addSublayer(visualLayer)
// pulseLayer
pulseLayer.hidden = true
pulseLayer.zPosition = 1
visualLayer.addSublayer(pulseLayer)
// gesture
panRecognizer = UIPanGestureRecognizer(target: self, action: "handlePanGesture:")
panRecognizer.delegate = self
addGestureRecognizer(panRecognizer)
}
//
// :name: prepareShape
//
internal func prepareShape() {
......
Source/MaterialLabel.swift
......@@ -126,10 +126,10 @@ public class MaterialLabel : UILabel {
return textLayer.stringSize(constrainedToWidth: width)
}
//
// :name: prepareView
//
internal func prepareView() {
/**
:name: prepareView
*/
public func prepareView() {
textAlignment = MaterialTheme.label.textAlignment
wrapped = MaterialTheme.label.wrapped
contentsScale = MaterialTheme.label.contentsScale
......
Source/MaterialPulseView.swift
......@@ -137,10 +137,10 @@ public class MaterialPulseView : MaterialView {
return nil // returning nil enables the animations for the layer property that are normally disabled.
}
//
// :name: prepareView
//
internal override func prepareView() {
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.pulseView.userInteractionEnabled
backgroundColor = MaterialTheme.pulseView.backgroundColor
......
Source/MaterialView.swift
......@@ -372,7 +372,7 @@ public class MaterialView : UIView {
//
// :name: prepareView
//
internal func prepareView() {
public func prepareView() {
userInteractionEnabled = MaterialTheme.view.userInteractionEnabled
backgroundColor = MaterialTheme.view.backgroundColor
......
Source/NavigationBarView.swift
......@@ -201,6 +201,33 @@ public class NavigationBarView : MaterialView {
}
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.navigationBarView.userInteractionEnabled
backgroundColor = MaterialTheme.navigationBarView.backgroundColor
statusBarStyle = MaterialTheme.navigationBarView.statusBarStyle
contentInsetsRef = MaterialTheme.navigationBarView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.navigationBarView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.navigationBarView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.navigationBarView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.navigationBarView.rightButtonsInsetsRef
contentsRect = MaterialTheme.navigationBarView.contentsRect
contentsCenter = MaterialTheme.navigationBarView.contentsCenter
contentsScale = MaterialTheme.navigationBarView.contentsScale
contentsGravity = MaterialTheme.navigationBarView.contentsGravity
shadowDepth = MaterialTheme.navigationBarView.shadowDepth
shadowColor = MaterialTheme.navigationBarView.shadowColor
zPosition = MaterialTheme.navigationBarView.zPosition
masksToBounds = MaterialTheme.navigationBarView.masksToBounds
cornerRadius = MaterialTheme.navigationBarView.cornerRadius
borderWidth = MaterialTheme.navigationBarView.borderWidth
borderColor = MaterialTheme.navigationBarView.bordercolor
}
/**
:name: reloadView
*/
public func reloadView() {
......@@ -329,31 +356,4 @@ public class NavigationBarView : MaterialView {
self.leftButtons = leftButtons
self.rightButtons = rightButtons
}
//
// :name: prepareView
//
internal override func prepareView() {
super.prepareView()
userInteractionEnabled = MaterialTheme.navigationBarView.userInteractionEnabled
backgroundColor = MaterialTheme.navigationBarView.backgroundColor
statusBarStyle = MaterialTheme.navigationBarView.statusBarStyle
contentInsetsRef = MaterialTheme.navigationBarView.contentInsetsRef
titleLabelInsetsRef = MaterialTheme.navigationBarView.titleLabelInsetsRef
detailLabelInsetsRef = MaterialTheme.navigationBarView.detailLabelInsetsRef
leftButtonsInsetsRef = MaterialTheme.navigationBarView.leftButtonsInsetsRef
rightButtonsInsetsRef = MaterialTheme.navigationBarView.rightButtonsInsetsRef
contentsRect = MaterialTheme.navigationBarView.contentsRect
contentsCenter = MaterialTheme.navigationBarView.contentsCenter
contentsScale = MaterialTheme.navigationBarView.contentsScale
contentsGravity = MaterialTheme.navigationBarView.contentsGravity
shadowDepth = MaterialTheme.navigationBarView.shadowDepth
shadowColor = MaterialTheme.navigationBarView.shadowColor
zPosition = MaterialTheme.navigationBarView.zPosition
masksToBounds = MaterialTheme.navigationBarView.masksToBounds
cornerRadius = MaterialTheme.navigationBarView.cornerRadius
borderWidth = MaterialTheme.navigationBarView.borderWidth
borderColor = MaterialTheme.navigationBarView.bordercolor
}
}
Source/RaisedButton.swift
......@@ -19,10 +19,10 @@
import UIKit
public class RaisedButton : MaterialButton {
//
// :name: prepareView
//
internal override func prepareView() {
/**
:name: prepareView
*/
public override func prepareView() {
super.prepareView()
setTitleColor(MaterialTheme.raisedButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel!.font = MaterialTheme.raisedButton.titleLabelFont
......
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