Skip to content

Commit

Permalink
Merge pull request #6 from isair/dev-0.4.0
Browse files Browse the repository at this point in the history 
0.4.0
  • Loading branch information
Baris Sencan committed Mar 6, 2015
2 parents ae4caad + b5f4fc8 commit 93f4707
Show file tree
Hide file tree
Showing 22 changed files with 982 additions and 768 deletions.
2 changes: 1 addition & 1 deletion ManualLayout.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ManualLayout'
s.version = '0.3.1'
s.version = '0.4.0'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'Easy to use and flexible AutoLayout alternative for iOS 8+. Supports AsyncDisplayKit.'

Expand Down
80 changes: 32 additions & 48 deletions ManualLayout.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
5F67BC0A1A9D43FE00347483 /* FastAccessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC091A9D43FE00347483 /* FastAccessTests.swift */; };
5F67BC3F1A9E970300347483 /* UIViewController+LayoutGuides.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */; };
5F67BC4C1A9FAB4B00347483 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4B1A9FAB4B00347483 /* Operators.swift */; };
5F67BC4E1A9FB1A600347483 /* OperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */; };
5F3026921AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */; };
5F3026941AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */; };
5F67BC0A1A9D43FE00347483 /* UIViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */; };
5F67BC3F1A9E970300347483 /* UIViewController+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */; };
5F67BC4C1A9FAB4B00347483 /* SmartAssign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */; };
5F67BC4E1A9FB1A600347483 /* SmartAssignTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */; };
5F67BC501A9FDDD900347483 /* HelperFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */; };
5F67BC521A9FE35C00347483 /* HelperFunctionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */; };
5F875C581A9BC8BF003CACDD /* Enums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C571A9BC8BF003CACDD /* Enums.swift */; };
5F875C5B1A9BCBB2003CACDD /* UIView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */; };
5F875C5F1A9BD55D003CACDD /* ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */; };
5F875C651A9BE2D3003CACDD /* UIViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */; };
5F875C691A9BE99F003CACDD /* CALayer+FastAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */; };
5F875C6D1A9BFC7E003CACDD /* UIView+FastAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */; };
5F875C6F1A9BFE01003CACDD /* CALayer+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */; };
5F875C691A9BE99F003CACDD /* CALayer+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */; };
5F875C6D1A9BFC7E003CACDD /* UIView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */; };
5FB4CBEF1A9BBE7500C2FB4F /* ManualLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
5FB4CBF51A9BBE7500C2FB4F /* ManualLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */; };
5FB4CBFC1A9BBE7500C2FB4F /* ManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -36,25 +32,21 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
5F67BC091A9D43FE00347483 /* FastAccessTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FastAccessTests.swift; sourceTree = "<group>"; };
5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+LayoutGuides.swift"; sourceTree = "<group>"; };
5F67BC4B1A9FAB4B00347483 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorTests.swift; sourceTree = "<group>"; };
5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ManualLayout.swift"; sourceTree = "<group>"; };
5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIScrollViewManualLayoutTests.swift; sourceTree = "<group>"; };
5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewManualLayoutTests.swift; sourceTree = "<group>"; };
5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+ManualLayout.swift"; sourceTree = "<group>"; };
5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartAssign.swift; sourceTree = "<group>"; };
5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartAssignTests.swift; sourceTree = "<group>"; };
5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperFunctions.swift; sourceTree = "<group>"; };
5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperFunctionTests.swift; sourceTree = "<group>"; };
5F875C571A9BC8BF003CACDD /* Enums.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enums.swift; sourceTree = "<group>"; };
5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+ManualLayout.swift"; sourceTree = "<group>"; };
5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManualLayout.swift; sourceTree = "<group>"; };
5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewManualLayoutTests.swift; sourceTree = "<group>"; };
5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+FastAccess.swift"; sourceTree = "<group>"; };
5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+FastAccess.swift"; sourceTree = "<group>"; };
5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+ManualLayout.swift"; sourceTree = "<group>"; };
5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+ManualLayout.swift"; sourceTree = "<group>"; };
5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+ManualLayout.swift"; sourceTree = "<group>"; };
5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ManualLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5FB4CBED1A9BBE7500C2FB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ManualLayout.h; sourceTree = "<group>"; };
5FB4CBF41A9BBE7500C2FB4F /* ManualLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ManualLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5FB4CBFA1A9BBE7500C2FB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualLayoutTests.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -98,15 +90,12 @@
isa = PBXGroup;
children = (
5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */,
5F875C571A9BC8BF003CACDD /* Enums.swift */,
5F67BC4B1A9FAB4B00347483 /* Operators.swift */,
5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */,
5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */,
5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */,
5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */,
5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */,
5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */,
5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */,
5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */,
5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */,
5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */,
5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */,
5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */,
5FB4CBEC1A9BBE7500C2FB4F /* Supporting Files */,
);
path = ManualLayout;
Expand All @@ -123,11 +112,10 @@
5FB4CBF81A9BBE7500C2FB4F /* ManualLayoutTests */ = {
isa = PBXGroup;
children = (
5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */,
5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */,
5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */,
5F67BC091A9D43FE00347483 /* FastAccessTests.swift */,
5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */,
5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */,
5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */,
5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */,
5FB4CBF91A9BBE7500C2FB4F /* Supporting Files */,
);
path = ManualLayoutTests;
Expand Down Expand Up @@ -248,15 +236,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5F875C691A9BE99F003CACDD /* CALayer+FastAccess.swift in Sources */,
5F67BC3F1A9E970300347483 /* UIViewController+LayoutGuides.swift in Sources */,
5F875C691A9BE99F003CACDD /* CALayer+ManualLayout.swift in Sources */,
5F67BC3F1A9E970300347483 /* UIViewController+ManualLayout.swift in Sources */,
5F67BC501A9FDDD900347483 /* HelperFunctions.swift in Sources */,
5F875C5F1A9BD55D003CACDD /* ManualLayout.swift in Sources */,
5F875C5B1A9BCBB2003CACDD /* UIView+ManualLayout.swift in Sources */,
5F875C6D1A9BFC7E003CACDD /* UIView+FastAccess.swift in Sources */,
5F67BC4C1A9FAB4B00347483 /* Operators.swift in Sources */,
5F875C581A9BC8BF003CACDD /* Enums.swift in Sources */,
5F875C6F1A9BFE01003CACDD /* CALayer+ManualLayout.swift in Sources */,
5F875C6D1A9BFC7E003CACDD /* UIView+ManualLayout.swift in Sources */,
5F67BC4C1A9FAB4B00347483 /* SmartAssign.swift in Sources */,
5F3026921AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -265,10 +250,9 @@
buildActionMask = 2147483647;
files = (
5F67BC521A9FE35C00347483 /* HelperFunctionTests.swift in Sources */,
5F875C651A9BE2D3003CACDD /* UIViewManualLayoutTests.swift in Sources */,
5F67BC4E1A9FB1A600347483 /* OperatorTests.swift in Sources */,
5F67BC0A1A9D43FE00347483 /* FastAccessTests.swift in Sources */,
5FB4CBFC1A9BBE7500C2FB4F /* ManualLayoutTests.swift in Sources */,
5F3026941AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift in Sources */,
5F67BC4E1A9FB1A600347483 /* SmartAssignTests.swift in Sources */,
5F67BC0A1A9D43FE00347483 /* UIViewManualLayoutTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
207 changes: 0 additions & 207 deletions ManualLayout/CALayer+FastAccess.swift
View file

This file was deleted.

Loading

0 comments on commit 93f4707

Please sign in to comment.