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

Jump to bottom

SPM support, exposed the delegate method to the public #32

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SPM support, exposed the delegate method to the public #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f419ada
Added Swift Package Manager support
wiencheck Dec 22, 2020
5cb546c
Exposed delegate property fo the layout
wiencheck Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CollectionViewWaterfallLayout.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Pod::Spec.new do |s|
s.social_media_url = 'https://twitter.com/ecerney'
s.ios.deployment_target = '8.0'
s.swift_versions = '5.0'
s.source_files = 'CollectionViewWaterfallLayout.swift'
s.source_files = 'Sources/CollectionViewWaterfallLayout/CollectionViewWaterfallLayout.swift'
s.frameworks = 'UIKit'
end
28 changes: 28 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "CollectionViewWaterfallLayout",
platforms: [
.iOS(.v8)
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "CollectionViewWaterfallLayout",
targets: ["CollectionViewWaterfallLayout"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "CollectionViewWaterfallLayout",
dependencies: [])
]
)
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,19 @@ Prerequisites

Installation
-----------
## Cocoapods
CollectionViewWaterfallLayout is available through CocoaPods. To install it, simply add the following line to your Podfile:
```
pod "CollectionViewWaterfallLayout"
```

## Swift Package Manager

CollectionViewWaterfallLayout can be installed via Swift Package Manager. To use it in your project, open Xcode, go to menu File -> Swift Packages -> Add Package Dependency, and paste this repo's URL:
```
https://github.com/ecerney/CollectionViewWaterfallLayout.git
```

How to Use
-----------

Expand Down
13 changes: 8 additions & 5 deletions CollectionViewWaterfallLayout.swift → ...ayout/CollectionViewWaterfallLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,21 @@ public class CollectionViewWaterfallLayout: UICollectionViewLayout {
}

// MARK: - Private Properties
private weak var delegate: CollectionViewWaterfallLayoutDelegate? {
get {
return collectionView?.delegate as? CollectionViewWaterfallLayoutDelegate
}
}
weak var delegate: CollectionViewWaterfallLayoutDelegate?

private var columnHeights = [Float]()
private var sectionItemAttributes = [[UICollectionViewLayoutAttributes]]()
private var allItemAttributes = [UICollectionViewLayoutAttributes]()
private var headersAttribute = [Int: UICollectionViewLayoutAttributes]()
private var footersAttribute = [Int: UICollectionViewLayoutAttributes]()
private var unionRects = [CGRect]()

// MARK: - Initialization
public convenience init(delegate: CollectionViewWaterfallLayoutDelegate) {
self.init()
self.delegate = delegate
}

// MARK: - UICollectionViewLayout Methods
public override func prepare() {
super.prepare()
Expand Down
157 changes: 24 additions & 133 deletions WaterfallDemo/CollectionViewWaterfallLayoutDemo.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 = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -13,20 +13,9 @@
029C0A2D197E226600DA6FE9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A2C197E226600DA6FE9 /* ViewController.swift */; };
029C0A30197E226600DA6FE9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 029C0A2E197E226600DA6FE9 /* Main.storyboard */; };
029C0A32197E226600DA6FE9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 029C0A31197E226600DA6FE9 /* Images.xcassets */; };
029C0A3E197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A3D197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift */; };
029C0A4C19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */; };
30F6564B2591EF8C005EFF4B /* CollectionViewWaterfallLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 30F6564A2591EF8C005EFF4B /* CollectionViewWaterfallLayout */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
029C0A38197E226600DA6FE9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 029C0A1D197E226600DA6FE9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 029C0A24197E226600DA6FE9;
remoteInfo = WaterfallFlowLayout;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
026447C0233ADD4300271918 /* LabelCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelCollectionViewCell.swift; sourceTree = "<group>"; };
026447C2233AE30900271918 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -36,24 +25,15 @@
029C0A2C197E226600DA6FE9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
029C0A2F197E226600DA6FE9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
029C0A31197E226600DA6FE9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
029C0A37197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CollectionViewWaterfallLayoutDemo.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
029C0A3C197E226600DA6FE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
029C0A3D197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaterfallFlowLayoutTests.swift; sourceTree = "<group>"; };
029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CollectionViewWaterfallLayout.swift; path = ../../CollectionViewWaterfallLayout.swift; sourceTree = "<group>"; };
30F656472591EF83005EFF4B /* CollectionViewWaterfallLayout */ = {isa = PBXFileReference; lastKnownFileType = folder; name = CollectionViewWaterfallLayout; path = ..; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
029C0A22197E226600DA6FE9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
029C0A34197E226600DA6FE9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
30F6564B2591EF8C005EFF4B /* CollectionViewWaterfallLayout in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,17 +43,17 @@
029C0A1C197E226600DA6FE9 = {
isa = PBXGroup;
children = (
30F656472591EF83005EFF4B /* CollectionViewWaterfallLayout */,
029C0A27197E226600DA6FE9 /* WaterfallFlowLayout */,
029C0A3A197E226600DA6FE9 /* WaterfallFlowLayoutTests */,
029C0A26197E226600DA6FE9 /* Products */,
30F656492591EF8C005EFF4B /* Frameworks */,
);
sourceTree = "<group>";
};
029C0A26197E226600DA6FE9 /* Products */ = {
isa = PBXGroup;
children = (
029C0A25197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.app */,
029C0A37197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -86,7 +66,6 @@
026447C0233ADD4300271918 /* LabelCollectionViewCell.swift */,
029C0A2E197E226600DA6FE9 /* Main.storyboard */,
026447C2233AE30900271918 /* LaunchScreen.storyboard */,
029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */,
029C0A31197E226600DA6FE9 /* Images.xcassets */,
029C0A28197E226600DA6FE9 /* Supporting Files */,
);
Expand All @@ -101,21 +80,11 @@
name = "Supporting Files";
sourceTree = "<group>";
};
029C0A3A197E226600DA6FE9 /* WaterfallFlowLayoutTests */ = {
isa = PBXGroup;
children = (
029C0A3D197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift */,
029C0A3B197E226600DA6FE9 /* Supporting Files */,
);
path = WaterfallFlowLayoutTests;
sourceTree = "<group>";
};
029C0A3B197E226600DA6FE9 /* Supporting Files */ = {
30F656492591EF8C005EFF4B /* Frameworks */ = {
isa = PBXGroup;
children = (
029C0A3C197E226600DA6FE9 /* Info.plist */,
);
name = "Supporting Files";
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -134,28 +103,13 @@
dependencies = (
);
name = CollectionViewWaterfallLayoutDemo;
packageProductDependencies = (
30F6564A2591EF8C005EFF4B /* CollectionViewWaterfallLayout */,
);
productName = WaterfallFlowLayout;
productReference = 029C0A25197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.app */;
productType = "com.apple.product-type.application";
};
029C0A36197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemoTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 029C0A44197E226600DA6FE9 /* Build configuration list for PBXNativeTarget "CollectionViewWaterfallLayoutDemoTests" */;
buildPhases = (
029C0A33197E226600DA6FE9 /* Sources */,
029C0A34197E226600DA6FE9 /* Frameworks */,
029C0A35197E226600DA6FE9 /* Resources */,
);
buildRules = (
);
dependencies = (
029C0A39197E226600DA6FE9 /* PBXTargetDependency */,
);
name = CollectionViewWaterfallLayoutDemoTests;
productName = WaterfallFlowLayoutTests;
productReference = 029C0A37197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -169,10 +123,6 @@
029C0A24197E226600DA6FE9 = {
CreatedOnToolsVersion = 6.0;
};
029C0A36197E226600DA6FE9 = {
CreatedOnToolsVersion = 6.0;
TestTargetID = 029C0A24197E226600DA6FE9;
};
};
};
buildConfigurationList = 029C0A20197E226600DA6FE9 /* Build configuration list for PBXProject "CollectionViewWaterfallLayoutDemo" */;
Expand All @@ -189,7 +139,6 @@
projectRoot = "";
targets = (
029C0A24197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo */,
029C0A36197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemoTests */,
);
};
/* End PBXProject section */
Expand All @@ -205,13 +154,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
029C0A35197E226600DA6FE9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -221,29 +163,12 @@
files = (
029C0A2D197E226600DA6FE9 /* ViewController.swift in Sources */,
029C0A2B197E226600DA6FE9 /* AppDelegate.swift in Sources */,
029C0A4C19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift in Sources */,
026447C1233ADD4300271918 /* LabelCollectionViewCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
029C0A33197E226600DA6FE9 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
029C0A3E197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
029C0A39197E226600DA6FE9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 029C0A24197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo */;
targetProxy = 029C0A38197E226600DA6FE9 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
029C0A2E197E226600DA6FE9 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -368,7 +293,10 @@
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = WaterfallFlowLayout/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.ecerney.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = CollectionViewWaterfallLayoutDemo;
SWIFT_VERSION = 5.0;
Expand All @@ -382,48 +310,13 @@
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = WaterfallFlowLayout/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.ecerney.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = CollectionViewWaterfallLayoutDemo;
SWIFT_VERSION = 5.0;
};
name = Release;
};
029C0A45197E226600DA6FE9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = WaterfallFlowLayoutTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.ecerney.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = CollectionViewWaterfallLayoutDemo;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CollectionViewWaterfallLayoutDemo.app/CollectionViewWaterfallLayoutDemo";
};
name = Debug;
};
029C0A46197E226600DA6FE9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = WaterfallFlowLayoutTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.ecerney.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = CollectionViewWaterfallLayoutDemo;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CollectionViewWaterfallLayoutDemo.app/CollectionViewWaterfallLayoutDemo";
};
name = Release;
};
Expand All @@ -448,16 +341,14 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
029C0A44197E226600DA6FE9 /* Build configuration list for PBXNativeTarget "CollectionViewWaterfallLayoutDemoTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
029C0A45197E226600DA6FE9 /* Debug */,
029C0A46197E226600DA6FE9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
30F6564A2591EF8C005EFF4B /* CollectionViewWaterfallLayout */ = {
isa = XCSwiftPackageProductDependency;
productName = CollectionViewWaterfallLayout;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 029C0A1D197E226600DA6FE9 /* Project object */;
}