Skip to content

Commit 71c4199

Browse files
lucdionlucdion
authored
Merge pull request #8 from el-hoshino/NotAutoLayout
Adding a view that layouts with NotAutoLayout framework
2 parents 219be95 + 9235e15 commit 71c4199

7 files changed

Lines changed: 475 additions & 18 deletions

File tree

‎LayoutFrameworkBenchmark.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
24661D001F4EFFF5002CB883 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24661CFF1F4EFFF5002CB883 /* AppDelegate.swift */; };
2525
24661D071F4EFFF5002CB883 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24661D061F4EFFF5002CB883 /* Assets.xcassets */; };
2626
24661D0A1F4EFFF5002CB883 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24661D081F4EFFF5002CB883 /* LaunchScreen.storyboard */; };
27+
BF3DC69820B560A400536177 /* FeedItemNotAutoLayoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */; };
2728
/* End PBXBuildFile section */
2829

2930
/* Begin PBXFileReference section */
@@ -48,6 +49,7 @@
4849
24661D0B1F4EFFF5002CB883 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4950
4F34489CA12B845548D7F17E /* Pods_LayoutFrameworkBenchmark.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LayoutFrameworkBenchmark.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5051
73BD901DE3512A23A7603899 /* Pods-LayoutFrameworkBenchmark.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LayoutFrameworkBenchmark.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark.debug.xcconfig"; sourceTree = "<group>"; };
52+
BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedItemNotAutoLayoutView.swift; sourceTree = "<group>"; };
5153
/* End PBXFileReference section */
5254

5355
/* Begin PBXFrameworksBuildPhase section */
@@ -69,6 +71,7 @@
6971
2401BC921F4F020D00788998 /* FlexLayout */,
7072
2401BC8D1F4F01CC00788998 /* LayoutKit */,
7173
2401BC9C1F4F041400788998 /* ManualLayout */,
74+
BF3DC69620B5608000536177 /* NotAutoLayout */,
7275
2401BC911F4F020600788998 /* PinLayout */,
7376
2401BC9F1F4F043800788998 /* UIStackView */,
7477
2401BC751F4F018C00788998 /* BenchmarkViewController.swift */,
@@ -185,6 +188,14 @@
185188
name = Frameworks;
186189
sourceTree = "<group>";
187190
};
191+
BF3DC69620B5608000536177 /* NotAutoLayout */ = {
192+
isa = PBXGroup;
193+
children = (
194+
BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */,
195+
);
196+
name = NotAutoLayout;
197+
sourceTree = "<group>";
198+
};
188199
/* End PBXGroup section */
189200

190201
/* Begin PBXNativeTarget section */
@@ -197,7 +208,6 @@
197208
24661CF91F4EFFF5002CB883 /* Frameworks */,
198209
24661CFA1F4EFFF5002CB883 /* Resources */,
199210
84A6AA5174E802B10D43854E /* [CP] Embed Pods Frameworks */,
200-
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */,
201211
);
202212
buildRules = (
203213
);
@@ -265,13 +275,15 @@
265275
"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
266276
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
267277
"${BUILT_PRODUCTS_DIR}/LayoutKit/LayoutKit.framework",
278+
"${BUILT_PRODUCTS_DIR}/NotAutoLayout/NotAutoLayout.framework",
268279
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
269280
"${PODS_ROOT}/Reveal-SDK/RevealServer-14/iOS/RevealServer.framework",
270281
);
271282
name = "[CP] Embed Pods Frameworks";
272283
outputPaths = (
273284
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
274285
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LayoutKit.framework",
286+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NotAutoLayout.framework",
275287
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
276288
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
277289
);
@@ -280,21 +292,6 @@
280292
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
281293
showEnvVarsInLog = 0;
282294
};
283-
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */ = {
284-
isa = PBXShellScriptBuildPhase;
285-
buildActionMask = 2147483647;
286-
files = (
287-
);
288-
inputPaths = (
289-
);
290-
name = "[CP] Copy Pods Resources";
291-
outputPaths = (
292-
);
293-
runOnlyForDeploymentPostprocessing = 0;
294-
shellPath = /bin/sh;
295-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-resources.sh\"\n";
296-
showEnvVarsInLog = 0;
297-
};
298295
FB2DF4C2068AD4C560959816 /* [CP] Check Pods Manifest.lock */ = {
299296
isa = PBXShellScriptBuildPhase;
300297
buildActionMask = 2147483647;
@@ -329,6 +326,7 @@
329326
2401BC821F4F018C00788998 /* CollectionViewController.swift in Sources */,
330327
2401BC9E1F4F042700788998 /* FeedItemManualView.swift in Sources */,
331328
2401BC811F4F018C00788998 /* BenchmarkViewController.swift in Sources */,
329+
BF3DC69820B560A400536177 /* FeedItemNotAutoLayoutView.swift in Sources */,
332330
2401BC9B1F4F03B300788998 /* ProfileCardLayout.swift in Sources */,
333331
2401BC941F4F021F00788998 /* FeedItemFlexLayoutView.swift in Sources */,
334332
2401BCA41F4F045F00788998 /* FeedItemAutoLayoutView.swift in Sources */,

‎LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ class BenchmarkViewController: UITableViewController {
3939
return CollectionViewControllerFeedItemManualView(data: data)
4040
}),
4141

42+
ViewControllerData(title: "NotAutoLayout", factoryBlock: { viewCount in
43+
let data = FeedItemData.generate(count: viewCount)
44+
return CollectionViewControllerFeedItemNotAutoLayoutView(data: data)
45+
}),
46+
4247
ViewControllerData(title: "PinLayout 1.7", factoryBlock: { viewCount in
4348
let data = FeedItemData.generate(count: viewCount)
4449
return CollectionViewControllerFeedItemPinLayoutView(data: data)

‎LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class CollectionViewControllerFeedItemUIStackView: CollectionViewController<Feed
2525
class CollectionViewControllerFeedItemAutoLayoutView: CollectionViewController<FeedItemAutoLayoutView> {}
2626
class CollectionViewControllerFeedItemLayoutKitView: CollectionViewController<FeedItemLayoutKitView> {}
2727
class CollectionViewControllerFeedItemManualView: CollectionViewController<FeedItemManualView> {}
28+
class CollectionViewControllerFeedItemNotAutoLayoutView: CollectionViewController<FeedItemNotAutoLayoutView> {}
2829
class CollectionViewControllerFeedItemPinLayoutView: CollectionViewController<FeedItemPinLayoutView> {}
2930
class CollectionViewControllerFeedItemFlexLayoutView: CollectionViewController<FeedItemFlexLayoutView> {}
3031

0 commit comments

Comments
 (0)