Skip to content

Adding a view that layouts with NotAutoLayout framework #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucdion merged 6 commits into from
May 24, 2018
Merged

Adding a view that layouts with NotAutoLayout framework #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82d4a0a
Add NotAutoLayout through CocoaPods
el-hoshino May 23, 2018
e6be1bf
Add a view that layouts with NotAutoLayout
el-hoshino May 23, 2018
822f0fe
Create a ViewController using the view declared before which layouts …
el-hoshino May 23, 2018
a6a54a4
Rewrite FeedItemNotAutoLayoutView to fit the specific layout, with ad…
May 23, 2018
58db96b
Spaces fix
May 23, 2018
9235e15
Add reference to NotAutoLayout in README.md
May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions LayoutFrameworkBenchmark.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
24661D001F4EFFF5002CB883 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24661CFF1F4EFFF5002CB883 /* AppDelegate.swift */; };
24661D071F4EFFF5002CB883 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24661D061F4EFFF5002CB883 /* Assets.xcassets */; };
24661D0A1F4EFFF5002CB883 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24661D081F4EFFF5002CB883 /* LaunchScreen.storyboard */; };
BF3DC69820B560A400536177 /* FeedItemNotAutoLayoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -48,6 +49,7 @@
24661D0B1F4EFFF5002CB883 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4F34489CA12B845548D7F17E /* Pods_LayoutFrameworkBenchmark.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LayoutFrameworkBenchmark.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedItemNotAutoLayoutView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -69,6 +71,7 @@
2401BC921F4F020D00788998 /* FlexLayout */,
2401BC8D1F4F01CC00788998 /* LayoutKit */,
2401BC9C1F4F041400788998 /* ManualLayout */,
BF3DC69620B5608000536177 /* NotAutoLayout */,
2401BC911F4F020600788998 /* PinLayout */,
2401BC9F1F4F043800788998 /* UIStackView */,
2401BC751F4F018C00788998 /* BenchmarkViewController.swift */,
Expand Down Expand Up @@ -185,6 +188,14 @@
name = Frameworks;
sourceTree = "<group>";
};
BF3DC69620B5608000536177 /* NotAutoLayout */ = {
isa = PBXGroup;
children = (
BF3DC69720B560A400536177 /* FeedItemNotAutoLayoutView.swift */,
);
name = NotAutoLayout;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -197,7 +208,6 @@
24661CF91F4EFFF5002CB883 /* Frameworks */,
24661CFA1F4EFFF5002CB883 /* Resources */,
84A6AA5174E802B10D43854E /* [CP] Embed Pods Frameworks */,
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -265,13 +275,15 @@
"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
"${BUILT_PRODUCTS_DIR}/LayoutKit/LayoutKit.framework",
"${BUILT_PRODUCTS_DIR}/NotAutoLayout/NotAutoLayout.framework",
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
"${PODS_ROOT}/Reveal-SDK/RevealServer-14/iOS/RevealServer.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LayoutKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NotAutoLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
);
Expand All @@ -280,21 +292,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-resources.sh\"\n";
showEnvVarsInLog = 0;
};
FB2DF4C2068AD4C560959816 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -329,6 +326,7 @@
2401BC821F4F018C00788998 /* CollectionViewController.swift in Sources */,
2401BC9E1F4F042700788998 /* FeedItemManualView.swift in Sources */,
2401BC811F4F018C00788998 /* BenchmarkViewController.swift in Sources */,
BF3DC69820B560A400536177 /* FeedItemNotAutoLayoutView.swift in Sources */,
2401BC9B1F4F03B300788998 /* ProfileCardLayout.swift in Sources */,
2401BC941F4F021F00788998 /* FeedItemFlexLayoutView.swift in Sources */,
2401BCA41F4F045F00788998 /* FeedItemAutoLayoutView.swift in Sources */,
Expand Down
5 changes: 5 additions & 0 deletions LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ class BenchmarkViewController: UITableViewController {
return CollectionViewControllerFeedItemManualView(data: data)
}),

ViewControllerData(title: "NotAutoLayout", factoryBlock: { viewCount in
let data = FeedItemData.generate(count: viewCount)
return CollectionViewControllerFeedItemNotAutoLayoutView(data: data)
}),

ViewControllerData(title: "PinLayout 1.7", factoryBlock: { viewCount in
let data = FeedItemData.generate(count: viewCount)
return CollectionViewControllerFeedItemPinLayoutView(data: data)
Expand Down
1 change: 1 addition & 0 deletions LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class CollectionViewControllerFeedItemUIStackView: CollectionViewController<Feed
class CollectionViewControllerFeedItemAutoLayoutView: CollectionViewController<FeedItemAutoLayoutView> {}
class CollectionViewControllerFeedItemLayoutKitView: CollectionViewController<FeedItemLayoutKitView> {}
class CollectionViewControllerFeedItemManualView: CollectionViewController<FeedItemManualView> {}
class CollectionViewControllerFeedItemNotAutoLayoutView: CollectionViewController<FeedItemNotAutoLayoutView> {}
class CollectionViewControllerFeedItemPinLayoutView: CollectionViewController<FeedItemPinLayoutView> {}
class CollectionViewControllerFeedItemFlexLayoutView: CollectionViewController<FeedItemFlexLayoutView> {}

Expand Down
Loading