Skip to content

M
Material
Commit cecb946a by Daniel Dahan
Options

MaterialLayout now supports sibling alignment

parent 50ae46f4
Showing with 187 additions and 455 deletions
Examples/MaterialKit.xcworkspace/contents.xcworkspacedata
......@@ -63,13 +63,6 @@
location = "group:Programmatic/ImageCardView/ImageCardView.xcodeproj">
</FileRef>
</Group>
<Group
location = "container:"
name = "StackView">
<FileRef
location = "group:Programmatic/StackView/StackView.xcodeproj">
</FileRef>
</Group>
</Group>
<Group
location = "container:"
......
Examples/Programmatic/MaterialLayout/MaterialLayout/ViewController.swift
......@@ -25,7 +25,8 @@ class ViewController: UIViewController {
prepareView()
// Examples of using MaterialLayout.
prepareAlignCollectionToParentHorizontallyExample()
prepareAlignToParentHorizontallyExample()
// prepareAlignToParentVerticallyExample()
}
/**
......@@ -37,40 +38,105 @@ class ViewController: UIViewController {
}
/**
:name: prepareAlignCollectionToParentHorizontallyExample
:description: General usage example.
:name: prepareAlignToParentHorizontallyExample
:description: Laying out views horizontally with equal width.
*/
private func prepareAlignCollectionToParentHorizontallyExample() {
let view1: MaterialView = MaterialView()
view1.translatesAutoresizingMaskIntoConstraints = false
view1.backgroundColor = MaterialColor.blueGrey.base
view.addSubview(view1)
let view2: MaterialView = MaterialView()
view2.translatesAutoresizingMaskIntoConstraints = false
view2.backgroundColor = MaterialColor.blueGrey.darken1
view.addSubview(view2)
let view3: MaterialView = MaterialView()
view3.translatesAutoresizingMaskIntoConstraints = false
view3.backgroundColor = MaterialColor.blueGrey.darken2
view.addSubview(view3)
let view4: MaterialView = MaterialView()
view4.translatesAutoresizingMaskIntoConstraints = false
view4.backgroundColor = MaterialColor.blueGrey.darken3
view.addSubview(view4)
let view5: MaterialView = MaterialView()
view5.translatesAutoresizingMaskIntoConstraints = false
view5.backgroundColor = MaterialColor.blueGrey.darken4
view.addSubview(view5)
// let children: Array<UIView> = [view1, view2, view3, view4, view5]
// MaterialLayout.alignChildrenToParentHorizontally(view, children: children, left: 10, right: 10, options: [NSLayoutFormatOptions.AlignAllCenterX])
// for v in children {
// MaterialLayout.height(view, child: v, height: 100)
// }
private func prepareAlignToParentHorizontallyExample() {
let label1: UILabel = UILabel()
label1.translatesAutoresizingMaskIntoConstraints = false
label1.backgroundColor = MaterialColor.red.base
label1.text = "A"
label1.textAlignment = .Center
view.addSubview(label1)
let label2: UILabel = UILabel()
label2.translatesAutoresizingMaskIntoConstraints = false
label2.backgroundColor = MaterialColor.green.base
label2.text = "B"
label2.textAlignment = .Center
view.addSubview(label2)
let label3: UILabel = UILabel()
label3.translatesAutoresizingMaskIntoConstraints = false
label3.backgroundColor = MaterialColor.blue.base
label3.text = "C"
label3.textAlignment = .Center
view.addSubview(label3)
let label4: UILabel = UILabel()
label4.translatesAutoresizingMaskIntoConstraints = false
label4.backgroundColor = MaterialColor.yellow.base
label4.text = "D"
label4.textAlignment = .Center
view.addSubview(label4)
let children: Array<UIView> = [label1, label2, label3, label4]
// Align the labels horizontally with an equal width.
MaterialLayout.alignToParentHorizontally(view, children: children, left: 30, right: 30, spacing: 30)
// Individually set the labels' vertical alignment.
// If this is left out, the intrinsic value is used for the view.
for v in children {
MaterialLayout.alignToParentVertically(view, child: v, top: 100, bottom: 100)
}
// Print out the dimensions of the labels.
for v in children {
v.layoutIfNeeded()
print(v.frame)
}
}
/**
:name: prepareAlignToParentVerticallyExample
:description: Laying out views vertically with equal height.
*/
private func prepareAlignToParentVerticallyExample() {
let label1: UILabel = UILabel()
label1.translatesAutoresizingMaskIntoConstraints = false
label1.backgroundColor = MaterialColor.red.base
label1.text = "A"
label1.textAlignment = .Center
view.addSubview(label1)
let label2: UILabel = UILabel()
label2.translatesAutoresizingMaskIntoConstraints = false
label2.backgroundColor = MaterialColor.green.base
label2.text = "B"
label2.textAlignment = .Center
view.addSubview(label2)
let label3: UILabel = UILabel()
label3.translatesAutoresizingMaskIntoConstraints = false
label3.backgroundColor = MaterialColor.blue.base
label3.text = "C"
label3.textAlignment = .Center
view.addSubview(label3)
let label4: UILabel = UILabel()
label4.translatesAutoresizingMaskIntoConstraints = false
label4.backgroundColor = MaterialColor.yellow.base
label4.text = "D"
label4.textAlignment = .Center
view.addSubview(label4)
let children: Array<UIView> = [label1, label2, label3, label4]
// Align the labels vertically with an equal height.
MaterialLayout.alignToParentVertically(view, children: children, top: 100, bottom: 100, spacing: 100)
// Individually set the labels' horizontal alignment.
// If this is left out, the intrinsic value is used for the view.
for v in children {
MaterialLayout.alignToParentHorizontally(view, child: v, left: 100, right: 100)
}
// Print out the dimensions of the labels.
for v in children {
v.layoutIfNeeded()
print(v.frame)
}
}
}
Examples/Programmatic/StackView/StackView/ViewController.swift → Examples/Programmatic/StackView/MaterialStackView/ViewController.swift
......@@ -43,7 +43,53 @@ class ViewController: UIViewController {
:description: General usage example.
*/
private func prepareGeneralStackViewExample() {
let materialStackView: UIStackView = UIStackView()
materialStackView.distribution = .
view.addSubview(materialStackView)
materialStackView.translatesAutoresizingMaskIntoConstraints = false
MaterialLayout.alignToParent(view, child: materialStackView)
materialStackView.addArrangedSubview(createEntry())
materialStackView.addArrangedSubview(createEntry())
materialStackView.addArrangedSubview(createEntry())
}
private func createEntry() -> CardView {
let cardView: CardView = CardView()
// Title label.
let titleLabel: UILabel = UILabel()
titleLabel.text = "Welcome Back!"
titleLabel.textColor = MaterialColor.blue.darken1
titleLabel.font = RobotoFont.mediumWithSize(20)
cardView.titleLabel = titleLabel
// Detail label
let detailLabel: UILabel = UILabel()
detailLabel.text = "It’s been a while, have you read any new books lately?"
detailLabel.numberOfLines = 0
cardView.detailLabel = detailLabel
// Yes button.
let btn1: FlatButton = FlatButton()
btn1.pulseColor = MaterialColor.blue.lighten1
btn1.pulseFill = true
btn1.pulseScale = false
btn1.setTitle("YES", forState: .Normal)
btn1.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
// No button.
let btn2: FlatButton = FlatButton()
btn2.pulseColor = MaterialColor.blue.lighten1
btn2.pulseFill = true
btn2.pulseScale = false
btn2.setTitle("NO", forState: .Normal)
btn2.setTitleColor(MaterialColor.blue.darken1, forState: .Normal)
// Add buttons to left side.
cardView.leftButtons = [btn1, btn2]
return cardView
}
}
Examples/Programmatic/StackView/StackView.xcodeproj/project.pbxproj deleted 100644 → 0
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
9608ABB61C1908DD0000BB93 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9608ABB51C1908DD0000BB93 /* AppDelegate.swift */; };
9608ABB81C1908DD0000BB93 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9608ABB71C1908DD0000BB93 /* ViewController.swift */; };
9608ABBD1C1908DD0000BB93 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9608ABBC1C1908DD0000BB93 /* Assets.xcassets */; };
9608ABC01C1908DD0000BB93 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9608ABBE1C1908DD0000BB93 /* LaunchScreen.storyboard */; };
9608ABC81C190B2B0000BB93 /* MaterialKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9608ABC71C190B2B0000BB93 /* MaterialKit.framework */; };
9608ABC91C190B2B0000BB93 /* MaterialKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9608ABC71C190B2B0000BB93 /* MaterialKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
9608ABCA1C190B2B0000BB93 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
9608ABC91C190B2B0000BB93 /* MaterialKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
9608ABB21C1908DD0000BB93 /* StackView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StackView.app; sourceTree = BUILT_PRODUCTS_DIR; };
9608ABB51C1908DD0000BB93 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
9608ABB71C1908DD0000BB93 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
9608ABBC1C1908DD0000BB93 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
9608ABBF1C1908DD0000BB93 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
9608ABC11C1908DD0000BB93 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9608ABC71C190B2B0000BB93 /* MaterialKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = MaterialKit.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/MaterialKit-anypxbsecgdqqxevbavirvnffqxd/Build/Products/Debug-iphoneos/MaterialKit.framework"; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
9608ABAF1C1908DD0000BB93 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9608ABC81C190B2B0000BB93 /* MaterialKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
9608ABA91C1908DD0000BB93 = {
isa = PBXGroup;
children = (
9608ABC71C190B2B0000BB93 /* MaterialKit.framework */,
9608ABB41C1908DD0000BB93 /* StackView */,
9608ABB31C1908DD0000BB93 /* Products */,
);
sourceTree = "<group>";
};
9608ABB31C1908DD0000BB93 /* Products */ = {
isa = PBXGroup;
children = (
9608ABB21C1908DD0000BB93 /* StackView.app */,
);
name = Products;
sourceTree = "<group>";
};
9608ABB41C1908DD0000BB93 /* StackView */ = {
isa = PBXGroup;
children = (
9608ABB51C1908DD0000BB93 /* AppDelegate.swift */,
9608ABB71C1908DD0000BB93 /* ViewController.swift */,
9608ABBC1C1908DD0000BB93 /* Assets.xcassets */,
9608ABBE1C1908DD0000BB93 /* LaunchScreen.storyboard */,
9608ABC11C1908DD0000BB93 /* Info.plist */,
);
path = StackView;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
9608ABB11C1908DD0000BB93 /* StackView */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9608ABC41C1908DD0000BB93 /* Build configuration list for PBXNativeTarget "StackView" */;
buildPhases = (
9608ABAE1C1908DD0000BB93 /* Sources */,
9608ABAF1C1908DD0000BB93 /* Frameworks */,
9608ABB01C1908DD0000BB93 /* Resources */,
9608ABCA1C190B2B0000BB93 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = StackView;
productName = StackView;
productReference = 9608ABB21C1908DD0000BB93 /* StackView.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
9608ABAA1C1908DD0000BB93 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = {
9608ABB11C1908DD0000BB93 = {
CreatedOnToolsVersion = 7.1.1;
};
};
};
buildConfigurationList = 9608ABAD1C1908DD0000BB93 /* Build configuration list for PBXProject "StackView" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 9608ABA91C1908DD0000BB93;
productRefGroup = 9608ABB31C1908DD0000BB93 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
9608ABB11C1908DD0000BB93 /* StackView */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
9608ABB01C1908DD0000BB93 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9608ABC01C1908DD0000BB93 /* LaunchScreen.storyboard in Resources */,
9608ABBD1C1908DD0000BB93 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
9608ABAE1C1908DD0000BB93 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9608ABB81C1908DD0000BB93 /* ViewController.swift in Sources */,
9608ABB61C1908DD0000BB93 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
9608ABBE1C1908DD0000BB93 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
9608ABBF1C1908DD0000BB93 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
9608ABC21C1908DD0000BB93 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
9608ABC31C1908DD0000BB93 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
9608ABC51C1908DD0000BB93 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = StackView/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.StackView;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
9608ABC61C1908DD0000BB93 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = StackView/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.StackView;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
9608ABAD1C1908DD0000BB93 /* Build configuration list for PBXProject "StackView" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9608ABC21C1908DD0000BB93 /* Debug */,
9608ABC31C1908DD0000BB93 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9608ABC41C1908DD0000BB93 /* Build configuration list for PBXNativeTarget "StackView" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9608ABC51C1908DD0000BB93 /* Debug */,
9608ABC61C1908DD0000BB93 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 9608ABAA1C1908DD0000BB93 /* Project object */;
}
Examples/Programmatic/StackView/StackView.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:StackView.xcodeproj">
</FileRef>
</Workspace>
MK.podspec
Pod::Spec.new do |s|
s.name = 'MK'
s.version = '1.24.10'
s.version = '1.24.11'
s.license = { :type => "AGPL-3.0", :file => "LICENSE" }
s.summary = 'Beautiful Material Design in Swift.'
s.homepage = 'http://materialkit.io'
......
MaterialKit.xcodeproj/project.pbxproj
......@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
9608ABCD1C190B8B0000BB93 /* StackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9608ABCC1C190B8B0000BB93 /* StackView.swift */; };
963832421B88DFD80015F710 /* MaterialKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963832361B88DFD80015F710 /* MaterialKit.framework */; };
9638325A1B88E31A0015F710 /* MaterialKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832581B88E31A0015F710 /* MaterialKitTests.swift */; };
96D88C1E1C1328D800B91418 /* CaptureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88BF51C1328D800B91418 /* CaptureView.swift */; };
......@@ -93,7 +92,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
9608ABCC1C190B8B0000BB93 /* StackView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackView.swift; sourceTree = "<group>"; };
963832361B88DFD80015F710 /* MaterialKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MaterialKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
963832411B88DFD80015F710 /* MaterialKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MaterialKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
963832581B88E31A0015F710 /* MaterialKitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialKitTests.swift; sourceTree = "<group>"; };
......@@ -159,14 +157,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
9608ABCB1C190B7C0000BB93 /* Stack */ = {
isa = PBXGroup;
children = (
9608ABCC1C190B8B0000BB93 /* StackView.swift */,
);
name = Stack;
sourceTree = "<group>";
};
9638322C1B88DFD80015F710 = {
isa = PBXGroup;
children = (
......@@ -214,7 +204,6 @@
96D88C4A1C13294200B91418 /* Type */,
96D88C491C13292700B91418 /* Capture */,
96D88C471C1328F500B91418 /* Font */,
9608ABCB1C190B7C0000BB93 /* Stack */,
);
path = Sources;
sourceTree = "<group>";
......@@ -531,7 +520,6 @@
96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */,
96D88C281C1328D800B91418 /* MaterialAnimation.swift in Sources */,
96D88C451C1328D800B91418 /* RobotoFont.swift in Sources */,
9608ABCD1C190B8B0000BB93 /* StackView.swift in Sources */,
96D88C1F1C1328D800B91418 /* CardView.swift in Sources */,
96D88C2C1C1328D800B91418 /* MaterialColor.swift in Sources */,
96D88C301C1328D800B91418 /* MaterialEdgeInsets.swift in Sources */,
......
Sources/Info.plist
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.24.10</string>
<string>1.24.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
Sources/MaterialButton.swift
......@@ -335,9 +335,9 @@ public class MaterialButton : UIButton {
}
/**
:name: animation
:name: animate
*/
public func animation(animation: CAAnimation) {
public func animate(animation: CAAnimation) {
animation.delegate = self
if let a: CABasicAnimation = animation as? CABasicAnimation {
a.fromValue = (nil == layer.presentationLayer() ? layer : layer.presentationLayer() as! CALayer).valueForKeyPath(a.keyPath!)
......
Sources/MaterialLayer.swift
......@@ -225,9 +225,9 @@ public class MaterialLayer : CAShapeLayer {
}
/**
:name: animation
:name: animate
*/
public func animation(animation: CAAnimation) {
public func animate(animation: CAAnimation) {
animation.delegate = self
if let a: CABasicAnimation = animation as? CABasicAnimation {
a.fromValue = valueForKeyPath(a.keyPath!)
......
Sources/MaterialLayout.swift
......@@ -45,39 +45,39 @@ public struct MaterialLayout {
MaterialLayout.height(parent, child: child, height: height)
}
// /**
// :name: alignChildrenToParentHorizontally
// */
// public static func alignChildrenToParentHorizontally(parent: UIView, children: Array<UIView>, left: CGFloat = 0, right: CGFloat = 0, minimumInteritemSpacing: CGFloat = 0, options: NSLayoutFormatOptions = []) {
// if 0 < children.count {
// var format: String = "H:"
// var i: Int = 1
// var views: Dictionary<String, UIView> = Dictionary<String, UIView>()
// for v in children {
// let k: String = "view\(i++)"
// views[k] = v
// format += i > children.count ? "[\(k)]" : "[\(k)]"
// }
// print(format)
// parent.addConstraints(constraint(format, options: options, metrics: ["left" : left, "right": right, "minimumInteritemSpacing": minimumInteritemSpacing], views: views))
// }
// }
//
// /**
// :name: alignChildrenToParentVertically
// */
// public static func alignChildrenToParentVertically(parent: UIView, children: Array<UIView>, top: CGFloat = 0, bottom: CGFloat = 0, minimumLineSpacing: CGFloat = 0, options: NSLayoutFormatOptions = []) {
// if 0 < children.count {
// var format: String = "V:|-(left)-"
// var i: Int = 1
// var views: Dictionary<String, UIView> = Dictionary<String, UIView>()
// for v in children {
// views["view\(i++)"] = v
// format += i == children.count ? "[view\(i++)]-(right)-|" : "[view\(i++)]-(>=minimumLineSpacing)-"
// }
// parent.addConstraints(constraint(format, options: options, metrics: ["top" : top, "bottom": bottom, "minimumLineSpacing": minimumLineSpacing], views: views))
// }
// }
/**
:name: alignToParentHorizontally
*/
public static func alignToParentHorizontally(parent: UIView, children: Array<UIView>, left: CGFloat = 0, right: CGFloat = 0, spacing: CGFloat = 0, options: NSLayoutFormatOptions = []) {
if 0 < children.count {
var format: String = "H:|-(left)-"
var i: Int = 1
var views: Dictionary<String, UIView> = Dictionary<String, UIView>()
for v in children {
let k: String = "view\(i++)"
views[k] = v
format += i > children.count ? "[\(k)(==view1)]-(right)-|" : "[\(k)(==view1)]-(spacing)-"
}
parent.addConstraints(constraint(format, options: options, metrics: ["left" : left, "right": right, "spacing": spacing], views: views))
}
}
/**
:name: alignToParentVertically
*/
public static func alignToParentVertically(parent: UIView, children: Array<UIView>, top: CGFloat = 0, bottom: CGFloat = 0, spacing: CGFloat = 0, options: NSLayoutFormatOptions = []) {
if 0 < children.count {
var format: String = "V:|-(top)-"
var i: Int = 1
var views: Dictionary<String, UIView> = Dictionary<String, UIView>()
for v in children {
let k: String = "view\(i++)"
views[k] = v
format += i > children.count ? "[\(k)(==view1)]-(bottom)-|" : "[\(k)(==view1)]-(spacing)-"
}
parent.addConstraints(constraint(format, options: options, metrics: ["top" : top, "bottom": bottom, "spacing": spacing], views: views))
}
}
/**
:name: alignToParentHorizontally
......
Sources/MaterialView.swift
......@@ -336,9 +336,9 @@ public class MaterialView : UIView {
}
/**
:name: animation
:name: animate
*/
public func animation(animation: CAAnimation) {
public func animate(animation: CAAnimation) {
animation.delegate = self
if let a: CABasicAnimation = animation as? CABasicAnimation {
a.fromValue = (nil == layer.presentationLayer() ? layer : layer.presentationLayer() as! CALayer).valueForKeyPath(a.keyPath!)
......
Sources/StackView.swift deleted 100644 → 0
//
// Copyright (C) 2015 CosmicMind, Inc. <http://cosmicmind.io> and other CosmicMind contributors
//
// This program is free software: you can redistribute it and/or modify
// 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
@available(iOS 9.0, *)
public class StackView : UIStackView {
/**
:name: init
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
prepareView()
}
/**
:name: init
*/
public override init(frame: CGRect) {
super.init(frame: frame)
prepareView()
}
/**
:name: init
*/
public convenience init() {
self.init(frame: CGRectNull)
}
/**
:name: prepareView
*/
private func prepareView() {
}
}
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