Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Sections refactor #7

Draft
JosephDuffy wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Sections refactor #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60c21e2
Add SectionProviderMapper
JosephDuffy May 24, 2019
43dca61
Add basic support for UICollectionView
JosephDuffy May 24, 2019
de5dcf9
Added missing update methods (untested) and also some light renaming/…
shaps80 Jul 4, 2019
2d56848
Minor updates to the sample
shaps80 Jul 22, 2019
4e0f8e7
Updated gitignore
shaps80 Jul 22, 2019
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Project Specific
API.swift
.build/

## Build generated
build/
Expand Down
66 changes: 60 additions & 6 deletions Composed.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
5402214B2195C4F800F0E173 /* Composed.h in Headers */ = {isa = PBXBuildFile; fileRef = 5402213B2195C4F700F0E173 /* Composed.h */; settings = {ATTRIBUTES = (Public, ); }; };
5402214E2195C4F800F0E173 /* Composed.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 540221392195C4F700F0E173 /* Composed.framework */; };
5402214F2195C4F800F0E173 /* Composed.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 540221392195C4F700F0E173 /* Composed.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
545667902296EFFE001246DC /* AllNewAndImproved.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5456678F2296EFFE001246DC /* AllNewAndImproved.swift */; };
545667922297061A001246DC /* SectionProviderDelegate+Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545667912297061A001246DC /* SectionProviderDelegate+Spec.swift */; };
545667902296EFFE001246DC /* ComposedSectionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5456678F2296EFFE001246DC /* ComposedSectionProvider.swift */; };
54645B5D2281A3AE00E53245 /* ColumnSizingStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54645B5C2281A3AE00E53245 /* ColumnSizingStrategy.swift */; };
54645B5F2281A3C100E53245 /* CarouselSizingStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54645B5E2281A3C100E53245 /* CarouselSizingStrategy.swift */; };
54645B612281A3FD00E53245 /* NoSizingStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54645B602281A3FD00E53245 /* NoSizingStrategy.swift */; };
Expand Down Expand Up @@ -84,6 +83,16 @@
54E5CA3F228327AC00CCA628 /* Wrapper+Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E5CA3E228327AC00CCA628 /* Wrapper+Spec.swift */; };
D937381D22609C05001F29EB /* ArrayDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D937381C22609C05001F29EB /* ArrayDataSource.swift */; };
D93738212260C641001F29EB /* SingleElementDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93738202260C641001F29EB /* SingleElementDataSource.swift */; };
D94114092297F29900077F90 /* Section.swift in Sources */ = {isa = PBXBuildFile; fileRef = D94114082297F29900077F90 /* Section.swift */; };
D941140B2297F30D00077F90 /* SectionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D941140A2297F30D00077F90 /* SectionProvider.swift */; };
D941140D2297F40500077F90 /* ComposedSectionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D941140C2297F40500077F90 /* ComposedSectionProvider.swift */; };
D941140F2297F4FA00077F90 /* ArraySection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D941140E2297F4FA00077F90 /* ArraySection.swift */; };
D94114112297F86100077F90 /* SectionProviderMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = D94114102297F86100077F90 /* SectionProviderMapping.swift */; };
D9D7DCBD22981094001DA4D9 /* SectionProviderMapper+Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D7DCBC22981094001DA4D9 /* SectionProviderMapper+Spec.swift */; };
D9D7DCBF22985C44001DA4D9 /* CollectionViewSectionProviderCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D7DCBE22985C44001DA4D9 /* CollectionViewSectionProviderCoordinator.swift */; };
D9D7DCC122985F04001DA4D9 /* SectionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D7DCC022985F04001DA4D9 /* SectionsViewController.swift */; };
D9D7DCC422986949001DA4D9 /* SectionCollectionUIConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D7DCC322986949001DA4D9 /* SectionCollectionUIConfiguration.swift */; };
D9D7DCC62298695E001DA4D9 /* CollectionUIConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D7DCC52298695E001DA4D9 /* CollectionUIConfiguration.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -140,7 +149,7 @@
540221392195C4F700F0E173 /* Composed.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Composed.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5402213B2195C4F700F0E173 /* Composed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Composed.h; sourceTree = "<group>"; };
5402213C2195C4F700F0E173 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5456678F2296EFFE001246DC /* AllNewAndImproved.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllNewAndImproved.swift; sourceTree = "<group>"; };
5456678F2296EFFE001246DC /* ComposedSectionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposedSectionProvider.swift; sourceTree = "<group>"; };
545667912297061A001246DC /* SectionProviderDelegate+Spec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SectionProviderDelegate+Spec.swift"; sourceTree = "<group>"; };
54645B5C2281A3AE00E53245 /* ColumnSizingStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColumnSizingStrategy.swift; sourceTree = "<group>"; };
54645B5E2281A3C100E53245 /* CarouselSizingStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselSizingStrategy.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -208,6 +217,16 @@
54E5CA3E228327AC00CCA628 /* Wrapper+Spec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Wrapper+Spec.swift"; sourceTree = "<group>"; };
D937381C22609C05001F29EB /* ArrayDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayDataSource.swift; sourceTree = "<group>"; };
D93738202260C641001F29EB /* SingleElementDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleElementDataSource.swift; sourceTree = "<group>"; };
D94114082297F29900077F90 /* Section.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Section.swift; sourceTree = "<group>"; };
D941140A2297F30D00077F90 /* SectionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionProvider.swift; sourceTree = "<group>"; };
D941140C2297F40500077F90 /* ComposedSectionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposedSectionProvider.swift; sourceTree = "<group>"; };
D941140E2297F4FA00077F90 /* ArraySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArraySection.swift; sourceTree = "<group>"; };
D94114102297F86100077F90 /* SectionProviderMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionProviderMapping.swift; sourceTree = "<group>"; };
D9D7DCBC22981094001DA4D9 /* SectionProviderMapper+Spec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SectionProviderMapper+Spec.swift"; sourceTree = "<group>"; };
D9D7DCBE22985C44001DA4D9 /* CollectionViewSectionProviderCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewSectionProviderCoordinator.swift; sourceTree = "<group>"; };
D9D7DCC022985F04001DA4D9 /* SectionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionsViewController.swift; sourceTree = "<group>"; };
D9D7DCC322986949001DA4D9 /* SectionCollectionUIConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionCollectionUIConfiguration.swift; sourceTree = "<group>"; };
D9D7DCC52298695E001DA4D9 /* CollectionUIConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionUIConfiguration.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -264,6 +283,7 @@
isa = PBXGroup;
children = (
540221222195C44F00F0E173 /* AppDelegate.swift */,
D9D7DCC022985F04001DA4D9 /* SectionsViewController.swift */,
54BAB15D221497FA0064CE51 /* GlobalHeaderView.swift */,
54BAB15F221498000064CE51 /* GlobalHeaderView.xib */,
54BAB1632214D05C0064CE51 /* GlobalFooterView.swift */,
Expand Down Expand Up @@ -308,7 +328,8 @@
54E5CA3A2283276B00CCA628 /* Complex+Spec.swift */,
54E5CA3C2283277600CCA628 /* Lifecycle+Spec.swift */,
54E5CA3E228327AC00CCA628 /* Wrapper+Spec.swift */,
5456678F2296EFFE001246DC /* AllNewAndImproved.swift */,
5456678F2296EFFE001246DC /* ComposedSectionProvider.swift */,
D9D7DCBC22981094001DA4D9 /* SectionProviderMapper+Spec.swift */,
545667912297061A001246DC /* SectionProviderDelegate+Spec.swift */,
);
path = ComposedTests;
Expand Down Expand Up @@ -343,6 +364,7 @@
54A172F7225CC71A00A7D7FD /* Core */ = {
isa = PBXGroup;
children = (
D94114072297F28C00077F90 /* Sections */,
54E5CA282282FF7D00CCA628 /* Deprecations.swift */,
54A172F8225CC71A00A7D7FD /* DataSources */,
54A172FE225CC71A00A7D7FD /* DataStores */,
Expand Down Expand Up @@ -419,6 +441,29 @@
path = Views;
sourceTree = "<group>";
};
D94114072297F28C00077F90 /* Sections */ = {
isa = PBXGroup;
children = (
D94114082297F29900077F90 /* Section.swift */,
D941140A2297F30D00077F90 /* SectionProvider.swift */,
D941140C2297F40500077F90 /* ComposedSectionProvider.swift */,
D941140E2297F4FA00077F90 /* ArraySection.swift */,
D94114102297F86100077F90 /* SectionProviderMapping.swift */,
D9D7DCBE22985C44001DA4D9 /* CollectionViewSectionProviderCoordinator.swift */,
D9D7DCC222986942001DA4D9 /* UI */,
);
path = Sections;
sourceTree = "<group>";
};
D9D7DCC222986942001DA4D9 /* UI */ = {
isa = PBXGroup;
children = (
D9D7DCC52298695E001DA4D9 /* CollectionUIConfiguration.swift */,
D9D7DCC322986949001DA4D9 /* SectionCollectionUIConfiguration.swift */,
);
path = UI;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -573,6 +618,7 @@
54BAB15E221497FA0064CE51 /* GlobalHeaderView.swift in Sources */,
54BAB1642214D05C0064CE51 /* GlobalFooterView.swift in Sources */,
548A8B702214FA2800C0A276 /* BackgroundView.swift in Sources */,
D9D7DCC122985F04001DA4D9 /* SectionsViewController.swift in Sources */,
540221232195C45000F0E173 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -581,6 +627,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D941140D2297F40500077F90 /* ComposedSectionProvider.swift in Sources */,
D941140B2297F30D00077F90 /* SectionProvider.swift in Sources */,
54A17323225CC72900A7D7FD /* PhotosDataStore.swift in Sources */,
54A17328225CC72900A7D7FD /* GlobalViewsProvidingDataSource.swift in Sources */,
54645B692282E8BC00E53245 /* MutableDataStore.swift in Sources */,
Expand All @@ -590,6 +638,7 @@
54A1733D225CC72900A7D7FD /* DataSourceInvalidationContext.swift in Sources */,
54A1731B225CC72900A7D7FD /* SectionedDataSource.swift in Sources */,
54A1733A225CC72900A7D7FD /* EmbeddedDataSourceCell.swift in Sources */,
D94114112297F86100077F90 /* SectionProviderMapping.swift in Sources */,
54645B612281A3FD00E53245 /* NoSizingStrategy.swift in Sources */,
54E5CA272282FA3400CCA628 /* ComposedChangeDetails.swift in Sources */,
54A1733C225CC72900A7D7FD /* DataSourceCoordinator.swift in Sources */,
Expand All @@ -598,14 +647,17 @@
54A17324225CC72900A7D7FD /* AggregateDataSource.swift in Sources */,
54A17334225CC72900A7D7FD /* FlowLayout+Metrics.swift in Sources */,
54A17330225CC72900A7D7FD /* FlowLayoutInvalidationContext.swift in Sources */,
D9D7DCBF22985C44001DA4D9 /* CollectionViewSectionProviderCoordinator.swift in Sources */,
54A17325225CC72900A7D7FD /* CollectionDataSource.swift in Sources */,
54A17331225CC72900A7D7FD /* FlowLayout+Helpers.swift in Sources */,
54A17322225CC72900A7D7FD /* DataStore.swift in Sources */,
54A1731E225CC72900A7D7FD /* BasicDataSource.swift in Sources */,
54A1732A225CC72900A7D7FD /* CollectionUIProvidingDataSource.swift in Sources */,
54A1732F225CC72900A7D7FD /* NibLoadable.swift in Sources */,
54A17338225CC72900A7D7FD /* Snap.swift in Sources */,
D9D7DCC62298695E001DA4D9 /* CollectionUIConfiguration.swift in Sources */,
54A1731C225CC72900A7D7FD /* SegmentedDataSource.swift in Sources */,
D941140F2297F4FA00077F90 /* ArraySection.swift in Sources */,
54A17339225CC72900A7D7FD /* DataSourceViewController.swift in Sources */,
54A1732D225CC72900A7D7FD /* ComposedMappings.swift in Sources */,
54A17327225CC72900A7D7FD /* LifecycleObservingDataSource.swift in Sources */,
Expand All @@ -618,9 +670,11 @@
54A17337225CC72900A7D7FD /* DataSourceHeaderFooterView.swift in Sources */,
54A1731F225CC72900A7D7FD /* ComposedDataSource.swift in Sources */,
54A1733B225CC72900A7D7FD /* CollectionUIViewProvider.swift in Sources */,
D9D7DCC422986949001DA4D9 /* SectionCollectionUIConfiguration.swift in Sources */,
54A1732E225CC72900A7D7FD /* CollectionUISizingStrategy.swift in Sources */,
54A1732B225CC72900A7D7FD /* DataSourceChangeSet.swift in Sources */,
54A17320225CC72900A7D7FD /* ArrayDataStore.swift in Sources */,
D94114092297F29900077F90 /* Section.swift in Sources */,
54645B5D2281A3AE00E53245 /* ColumnSizingStrategy.swift in Sources */,
54A17326225CC72900A7D7FD /* DataSource+Handlers.swift in Sources */,
);
Expand All @@ -632,15 +686,15 @@
files = (
54E5CA31228326E200CCA628 /* Empty+Spec.swift in Sources */,
54E5CA3D2283277600CCA628 /* Lifecycle+Spec.swift in Sources */,
545667922297061A001246DC /* SectionProviderDelegate+Spec.swift in Sources */,
54E5CA352283270C00CCA628 /* Basic+Spec.swift in Sources */,
54E5CA2D228326BB00CCA628 /* Composed+Spec.swift in Sources */,
54E5CA3B2283276B00CCA628 /* Complex+Spec.swift in Sources */,
D9D7DCBD22981094001DA4D9 /* SectionProviderMapper+Spec.swift in Sources */,
54E5CA33228326F200CCA628 /* Sectioned+Spec.swift in Sources */,
54E5CA3F228327AC00CCA628 /* Wrapper+Spec.swift in Sources */,
54E5CA372283272800CCA628 /* Managed+Spec.swift in Sources */,
54645B952282F5D900E53245 /* Array+Spec.swift in Sources */,
545667902296EFFE001246DC /* AllNewAndImproved.swift in Sources */,
545667902296EFFE001246DC /* ComposedSectionProvider.swift in Sources */,
54E5CA2F228326CF00CCA628 /* Segmented+Spec.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading