Skip to content
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

Compositional layout support #115

Merged
merged 24 commits into from
May 22, 2024
Merged

Compositional layout support #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6c8df36
update flow layout section controller
CalvinChangCC Apr 2, 2024
7bfeea1
add compositional support for the section controller
CalvinChangCC Apr 2, 2024
8fabf99
add bridge between layout provider and adapter
CalvinChangCC Apr 2, 2024
7df5437
update tests
CalvinChangCC Apr 2, 2024
ba14a56
add references
CalvinChangCC Apr 2, 2024
8cfb786
Fix warnings
CalvinChangCC Apr 2, 2024
f43f715
Add the constants for the better reading
CalvinChangCC Apr 3, 2024
c796b81
add typealias
CalvinChangCC Apr 10, 2024
dc80cf6
fix tests
CalvinChangCC Apr 10, 2024
f5492f3
merge the section controller with section layout provider and depreca…
CalvinChangCC Apr 10, 2024
3728b83
revert changes
CalvinChangCC Apr 10, 2024
525d04b
put return inside available to compatible with older versions
CalvinChangCC Apr 10, 2024
3d3ba9a
fix project file
CalvinChangCC Apr 10, 2024
cf89c6f
clean up
CalvinChangCC Apr 10, 2024
13105f4
add new name example
CalvinChangCC Apr 2, 2024
725c144
Update Example/Examples/Sources/Examples/ExampleList/ExampleListCoord…
CalvinChangCC Apr 3, 2024
5a2e38b
update example
CalvinChangCC Apr 10, 2024
cd6ee38
fix proj file
CalvinChangCC Apr 10, 2024
1ae6656
fix assert message
CalvinChangCC Apr 16, 2024
1545811
improve assert message
CalvinChangCC Apr 16, 2024
9e1437f
make the layout provider nonoptional
CalvinChangCC Apr 19, 2024
cbfbfe1
update better naming
CalvinChangCC Apr 19, 2024
a6c9f71
make better assertion
CalvinChangCC Apr 19, 2024
1583225
fix tests
CalvinChangCC May 22, 2024
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
10 changes: 9 additions & 1 deletion Example/Examples/Sources/Examples/ExampleList/ExampleListCoordinator+Presentable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,15 @@ extension ExampleListCoordinator: Presentable {
navigationController: navigationController,
presentable: VanillaSwiftExamples.EmojisCoordinator(navigationController: navigationController)
)
)
),
ExampleViewModel(
name: "Names",
description: "An MVVM-C architecture with compositional layout example by using a ListCompositionalLayoutCollectionViewAdapter that shows multiple ListCompositionalLayoutSectionController.",
navigation: ExampleCoordinator(
navigationController: navigationController,
presentable: NamesCoordinator(navigationController: navigationController)
)
),
]
),
ExampleSectionViewModel(
Expand Down
14 changes: 13 additions & 1 deletion Example/SectionKitExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -12,6 +12,7 @@
5AFBBE14264BEF2B008C095D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AFBBE13264BEF2B008C095D /* SceneDelegate.swift */; };
5AFBBE18264BEF2C008C095D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5AFBBE17264BEF2C008C095D /* Assets.xcassets */; };
5AFBBE1E264BEF2C008C095D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5AFBBE1C264BEF2C008C095D /* LaunchScreen.storyboard */; };
D91425612BB478D90005E8CD /* first-names.json in Resources */ = {isa = PBXBuildFile; fileRef = D91425602BB478D90005E8CD /* first-names.json */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -27,6 +28,7 @@
5AFBBE1F264BEF2C008C095D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5AFBBE25264BEF34008C095D /* tr-sectionkit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tr-sectionkit"; path = ..; sourceTree = "<group>"; };
5AFBBE26264BEF41008C095D /* SectionKitExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SectionKitExample.entitlements; sourceTree = "<group>"; };
D91425602BB478D90005E8CD /* first-names.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "first-names.json"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -66,6 +68,7 @@
5AFBBE10264BEF2B008C095D /* SectionKitExample */ = {
isa = PBXGroup;
children = (
D914255F2BB478B60005E8CD /* Resources */,
5AFBBE11264BEF2B008C095D /* AppDelegate.swift */,
5AFBBE13264BEF2B008C095D /* SceneDelegate.swift */,
5AFBBE17264BEF2C008C095D /* Assets.xcassets */,
Expand All @@ -83,6 +86,14 @@
name = Frameworks;
sourceTree = "<group>";
};
D914255F2BB478B60005E8CD /* Resources */ = {
isa = PBXGroup;
children = (
D91425602BB478D90005E8CD /* first-names.json */,
);
path = Resources;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -146,6 +157,7 @@
buildActionMask = 2147483647;
files = (
5AFBBE1E264BEF2C008C095D /* LaunchScreen.storyboard in Resources */,
D91425612BB478D90005E8CD /* first-names.json in Resources */,
5AFBBE18264BEF2C008C095D /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading
Loading