Skip to content

Commit 93f4707

Browse files
author
Baris Sencan
committed
Merge pull request #6 from isair/dev-0.4.0
0.4.0
2 parents ae4caad + b5f4fc8 commit 93f4707

22 files changed

+982
-768
lines changed

ManualLayout.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ManualLayout'
3-
s.version = '0.3.1'
3+
s.version = '0.4.0'
44
s.license = { :type => 'MIT', :file => 'LICENSE' }
55
s.summary = 'Easy to use and flexible AutoLayout alternative for iOS 8+. Supports AsyncDisplayKit.'
66

ManualLayout.xcodeproj/project.pbxproj

Lines changed: 32 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,18 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
5F67BC0A1A9D43FE00347483 /* FastAccessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC091A9D43FE00347483 /* FastAccessTests.swift */; };
11-
5F67BC3F1A9E970300347483 /* UIViewController+LayoutGuides.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */; };
12-
5F67BC4C1A9FAB4B00347483 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4B1A9FAB4B00347483 /* Operators.swift */; };
13-
5F67BC4E1A9FB1A600347483 /* OperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */; };
10+
5F3026921AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */; };
11+
5F3026941AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */; };
12+
5F67BC0A1A9D43FE00347483 /* UIViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */; };
13+
5F67BC3F1A9E970300347483 /* UIViewController+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */; };
14+
5F67BC4C1A9FAB4B00347483 /* SmartAssign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */; };
15+
5F67BC4E1A9FB1A600347483 /* SmartAssignTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */; };
1416
5F67BC501A9FDDD900347483 /* HelperFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */; };
1517
5F67BC521A9FE35C00347483 /* HelperFunctionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */; };
16-
5F875C581A9BC8BF003CACDD /* Enums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C571A9BC8BF003CACDD /* Enums.swift */; };
17-
5F875C5B1A9BCBB2003CACDD /* UIView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */; };
18-
5F875C5F1A9BD55D003CACDD /* ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */; };
19-
5F875C651A9BE2D3003CACDD /* UIViewManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */; };
20-
5F875C691A9BE99F003CACDD /* CALayer+FastAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */; };
21-
5F875C6D1A9BFC7E003CACDD /* UIView+FastAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */; };
22-
5F875C6F1A9BFE01003CACDD /* CALayer+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */; };
18+
5F875C691A9BE99F003CACDD /* CALayer+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */; };
19+
5F875C6D1A9BFC7E003CACDD /* UIView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */; };
2320
5FB4CBEF1A9BBE7500C2FB4F /* ManualLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
2421
5FB4CBF51A9BBE7500C2FB4F /* ManualLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */; };
25-
5FB4CBFC1A9BBE7500C2FB4F /* ManualLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */; };
2622
/* End PBXBuildFile section */
2723

2824
/* Begin PBXContainerItemProxy section */
@@ -36,25 +32,21 @@
3632
/* End PBXContainerItemProxy section */
3733

3834
/* Begin PBXFileReference section */
39-
5F67BC091A9D43FE00347483 /* FastAccessTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FastAccessTests.swift; sourceTree = "<group>"; };
40-
5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+LayoutGuides.swift"; sourceTree = "<group>"; };
41-
5F67BC4B1A9FAB4B00347483 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
42-
5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperatorTests.swift; sourceTree = "<group>"; };
35+
5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ManualLayout.swift"; sourceTree = "<group>"; };
36+
5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIScrollViewManualLayoutTests.swift; sourceTree = "<group>"; };
37+
5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewManualLayoutTests.swift; sourceTree = "<group>"; };
38+
5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+ManualLayout.swift"; sourceTree = "<group>"; };
39+
5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartAssign.swift; sourceTree = "<group>"; };
40+
5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartAssignTests.swift; sourceTree = "<group>"; };
4341
5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperFunctions.swift; sourceTree = "<group>"; };
4442
5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperFunctionTests.swift; sourceTree = "<group>"; };
45-
5F875C571A9BC8BF003CACDD /* Enums.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enums.swift; sourceTree = "<group>"; };
46-
5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+ManualLayout.swift"; sourceTree = "<group>"; };
47-
5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManualLayout.swift; sourceTree = "<group>"; };
48-
5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewManualLayoutTests.swift; sourceTree = "<group>"; };
49-
5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+FastAccess.swift"; sourceTree = "<group>"; };
50-
5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+FastAccess.swift"; sourceTree = "<group>"; };
51-
5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+ManualLayout.swift"; sourceTree = "<group>"; };
43+
5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CALayer+ManualLayout.swift"; sourceTree = "<group>"; };
44+
5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+ManualLayout.swift"; sourceTree = "<group>"; };
5245
5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ManualLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5346
5FB4CBED1A9BBE7500C2FB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5447
5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ManualLayout.h; sourceTree = "<group>"; };
5548
5FB4CBF41A9BBE7500C2FB4F /* ManualLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ManualLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5649
5FB4CBFA1A9BBE7500C2FB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57-
5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualLayoutTests.swift; sourceTree = "<group>"; };
5850
/* End PBXFileReference section */
5951

6052
/* Begin PBXFrameworksBuildPhase section */
@@ -98,15 +90,12 @@
9890
isa = PBXGroup;
9991
children = (
10092
5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */,
101-
5F875C571A9BC8BF003CACDD /* Enums.swift */,
102-
5F67BC4B1A9FAB4B00347483 /* Operators.swift */,
93+
5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */,
10394
5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */,
104-
5F875C5E1A9BD55D003CACDD /* ManualLayout.swift */,
105-
5F875C681A9BE99F003CACDD /* CALayer+FastAccess.swift */,
106-
5F875C6E1A9BFE01003CACDD /* CALayer+ManualLayout.swift */,
107-
5F875C6C1A9BFC7E003CACDD /* UIView+FastAccess.swift */,
108-
5F875C5A1A9BCBB2003CACDD /* UIView+ManualLayout.swift */,
109-
5F67BC3E1A9E970300347483 /* UIViewController+LayoutGuides.swift */,
95+
5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */,
96+
5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */,
97+
5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */,
98+
5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */,
11099
5FB4CBEC1A9BBE7500C2FB4F /* Supporting Files */,
111100
);
112101
path = ManualLayout;
@@ -123,11 +112,10 @@
123112
5FB4CBF81A9BBE7500C2FB4F /* ManualLayoutTests */ = {
124113
isa = PBXGroup;
125114
children = (
126-
5F67BC4D1A9FB1A600347483 /* OperatorTests.swift */,
115+
5F67BC4D1A9FB1A600347483 /* SmartAssignTests.swift */,
127116
5F67BC511A9FE35C00347483 /* HelperFunctionTests.swift */,
128-
5F67BC091A9D43FE00347483 /* FastAccessTests.swift */,
129-
5FB4CBFB1A9BBE7500C2FB4F /* ManualLayoutTests.swift */,
130-
5F875C641A9BE2D3003CACDD /* UIViewManualLayoutTests.swift */,
117+
5F67BC091A9D43FE00347483 /* UIViewManualLayoutTests.swift */,
118+
5F3026931AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift */,
131119
5FB4CBF91A9BBE7500C2FB4F /* Supporting Files */,
132120
);
133121
path = ManualLayoutTests;
@@ -248,15 +236,12 @@
248236
isa = PBXSourcesBuildPhase;
249237
buildActionMask = 2147483647;
250238
files = (
251-
5F875C691A9BE99F003CACDD /* CALayer+FastAccess.swift in Sources */,
252-
5F67BC3F1A9E970300347483 /* UIViewController+LayoutGuides.swift in Sources */,
239+
5F875C691A9BE99F003CACDD /* CALayer+ManualLayout.swift in Sources */,
240+
5F67BC3F1A9E970300347483 /* UIViewController+ManualLayout.swift in Sources */,
253241
5F67BC501A9FDDD900347483 /* HelperFunctions.swift in Sources */,
254-
5F875C5F1A9BD55D003CACDD /* ManualLayout.swift in Sources */,
255-
5F875C5B1A9BCBB2003CACDD /* UIView+ManualLayout.swift in Sources */,
256-
5F875C6D1A9BFC7E003CACDD /* UIView+FastAccess.swift in Sources */,
257-
5F67BC4C1A9FAB4B00347483 /* Operators.swift in Sources */,
258-
5F875C581A9BC8BF003CACDD /* Enums.swift in Sources */,
259-
5F875C6F1A9BFE01003CACDD /* CALayer+ManualLayout.swift in Sources */,
242+
5F875C6D1A9BFC7E003CACDD /* UIView+ManualLayout.swift in Sources */,
243+
5F67BC4C1A9FAB4B00347483 /* SmartAssign.swift in Sources */,
244+
5F3026921AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift in Sources */,
260245
);
261246
runOnlyForDeploymentPostprocessing = 0;
262247
};
@@ -265,10 +250,9 @@
265250
buildActionMask = 2147483647;
266251
files = (
267252
5F67BC521A9FE35C00347483 /* HelperFunctionTests.swift in Sources */,
268-
5F875C651A9BE2D3003CACDD /* UIViewManualLayoutTests.swift in Sources */,
269-
5F67BC4E1A9FB1A600347483 /* OperatorTests.swift in Sources */,
270-
5F67BC0A1A9D43FE00347483 /* FastAccessTests.swift in Sources */,
271-
5FB4CBFC1A9BBE7500C2FB4F /* ManualLayoutTests.swift in Sources */,
253+
5F3026941AAA460E00F65A20 /* UIScrollViewManualLayoutTests.swift in Sources */,
254+
5F67BC4E1A9FB1A600347483 /* SmartAssignTests.swift in Sources */,
255+
5F67BC0A1A9D43FE00347483 /* UIViewManualLayoutTests.swift in Sources */,
272256
);
273257
runOnlyForDeploymentPostprocessing = 0;
274258
};

ManualLayout/CALayer+FastAccess.swift

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)