Skip to content

M
Material
Commit 2b692ab6 by Daniel Dahan
Options

development: updated DataSourceItem to CollectionDataSourceItem, as it is… 

development: updated DataSourceItem to CollectionDataSourceItem, as it is associated with CollectionViews
parent 825c260f
Showing with 23 additions and 31 deletions
Examples/Programmatic/RemindersController/RemindersController/RemindersItemsViewController.swift
......@@ -32,7 +32,7 @@ import UIKit
import Material
class RemindersItemsViewController: UIViewController {
/// A reference to a DataSourceItem.
/// A reference to a RemindersDataSource.
internal var dataSource: RemindersDataSource!
/// A reference to the dateFormatter.
......
Material.xcodeproj/project.pbxproj
......@@ -72,7 +72,7 @@
96BCB7BD1CB40DC500C806FE /* CollectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7741CB40DC500C806FE /* CollectionViewDelegate.swift */; };
96BCB7BE1CB40DC500C806FE /* CollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7751CB40DC500C806FE /* CollectionViewLayout.swift */; };
96BCB7BF1CB40DC500C806FE /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7761CB40DC500C806FE /* Color.swift */; };
96BCB7C01CB40DC500C806FE /* DataSourceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7771CB40DC500C806FE /* DataSourceItem.swift */; };
96BCB7C01CB40DC500C806FE /* CollectionDataSourceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7771CB40DC500C806FE /* CollectionDataSourceItem.swift */; };
96BCB7C11CB40DC500C806FE /* Depth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7781CB40DC500C806FE /* Depth.swift */; };
96BCB7C21CB40DC500C806FE /* Device.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7791CB40DC500C806FE /* Device.swift */; };
96BCB7C31CB40DC500C806FE /* EdgeInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB77A1CB40DC500C806FE /* EdgeInsets.swift */; };
......@@ -135,7 +135,7 @@
96BCB81B1CB4115200C806FE /* CapturePreview.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75A1CB40DC500C806FE /* CapturePreview.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB81C1CB4115200C806FE /* CaptureSession.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75B1CB40DC500C806FE /* CaptureSession.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB81D1CB4115200C806FE /* Capture.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75C1CB40DC500C806FE /* Capture.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB81E1CB4115200C806FE /* DataSourceItem.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7771CB40DC500C806FE /* DataSourceItem.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB81E1CB4115200C806FE /* CollectionDataSourceItem.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7771CB40DC500C806FE /* CollectionDataSourceItem.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB81F1CB4115200C806FE /* CollectionView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7711CB40DC500C806FE /* CollectionView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8201CB4115200C806FE /* CollectionViewCell.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7721CB40DC500C806FE /* CollectionViewCell.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96BCB8211CB4115200C806FE /* CollectionViewDataSource.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7731CB40DC500C806FE /* CollectionViewDataSource.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -267,7 +267,7 @@
96BCB7741CB40DC500C806FE /* CollectionViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewDelegate.swift; sourceTree = "<group>"; };
96BCB7751CB40DC500C806FE /* CollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewLayout.swift; sourceTree = "<group>"; };
96BCB7761CB40DC500C806FE /* Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
96BCB7771CB40DC500C806FE /* DataSourceItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataSourceItem.swift; sourceTree = "<group>"; };
96BCB7771CB40DC500C806FE /* CollectionDataSourceItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionDataSourceItem.swift; sourceTree = "<group>"; };
96BCB7781CB40DC500C806FE /* Depth.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Depth.swift; sourceTree = "<group>"; };
96BCB7791CB40DC500C806FE /* Device.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Device.swift; sourceTree = "<group>"; };
96BCB77A1CB40DC500C806FE /* EdgeInsets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EdgeInsets.swift; sourceTree = "<group>"; };
......@@ -398,14 +398,6 @@
name = JSON;
sourceTree = "<group>";
};
962A92581D42839100DBAF8E /* Data */ = {
isa = PBXGroup;
children = (
96BCB7771CB40DC500C806FE /* DataSourceItem.swift */,
);
name = Data;
sourceTree = "<group>";
};
962DDD071D6FBBB7001C307C /* Page */ = {
isa = PBXGroup;
children = (
......@@ -557,7 +549,6 @@
96264C0C1D84050200576F37 /* Checkbox */,
96BCB8051CB40F9C00C806FE /* Collection */,
96BCB8001CB40F0300C806FE /* Color */,
962A92581D42839100DBAF8E /* Data */,
96BCB80B1CB410CC00C806FE /* Device */,
96230AB61D6A51FD00AF47DC /* Divider */,
96BCB80A1CB410A100C806FE /* Extension */,
......@@ -676,6 +667,7 @@
96BCB7741CB40DC500C806FE /* CollectionViewDelegate.swift */,
96BCB7751CB40DC500C806FE /* CollectionViewLayout.swift */,
966ECF291CF4C20100BB0BDF /* CollectionReusableView.swift */,
96BCB7771CB40DC500C806FE /* CollectionDataSourceItem.swift */,
);
name = Collection;
sourceTree = "<group>";
......@@ -822,7 +814,7 @@
96BCB81B1CB4115200C806FE /* CapturePreview.swift in Headers */,
96BCB81C1CB4115200C806FE /* CaptureSession.swift in Headers */,
96BCB81D1CB4115200C806FE /* Capture.swift in Headers */,
96BCB81E1CB4115200C806FE /* DataSourceItem.swift in Headers */,
96BCB81E1CB4115200C806FE /* CollectionDataSourceItem.swift in Headers */,
96BCB81F1CB4115200C806FE /* CollectionView.swift in Headers */,
96BCB8201CB4115200C806FE /* CollectionViewCell.swift in Headers */,
96BCB8211CB4115200C806FE /* CollectionViewDataSource.swift in Headers */,
......@@ -1086,7 +1078,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
96BCB7C01CB40DC500C806FE /* DataSourceItem.swift in Sources */,
96BCB7C01CB40DC500C806FE /* CollectionDataSourceItem.swift in Sources */,
96BCB7AC1CB40DC500C806FE /* Material+Obj-C.swift in Sources */,
9658F2171CD6FA4700B902C1 /* IconButton.swift in Sources */,
96BCB7BB1CB40DC500C806FE /* CollectionViewCell.swift in Sources */,
......
Sources/iOS/DataSourceItem.swift → Sources/iOS/CollectionDataSourceItem.swift
......@@ -30,23 +30,23 @@
import UIKit
public struct DataSourceItem {
open struct CollectionDataSourceItem {
/// Stores an the data for the item.
public var data: Any?
open var data: Any?
/// Width for horizontal scroll direction.
public var width: CGFloat?
open var width: CGFloat?
/// Height for vertical scroll direction.
public var height: CGFloat?
open var height: CGFloat?
/**
Initializer.
- Parameter data: A reference to an Any that is associated
with a width or height.
- Parameter width: The width for the horizontal scroll direction.
- Parameter height: The height for the vertical scroll direction.
*/
Initializer.
- Parameter data: A reference to an Any that is associated
with a width or height.
- Parameter width: The width for the horizontal scroll direction.
- Parameter height: The height for the vertical scroll direction.
*/
public init(data: Any? = nil, width: CGFloat? = nil, height: CGFloat? = nil) {
self.data = data
self.width = width
......
Sources/iOS/CollectionViewDataSource.swift
......@@ -33,7 +33,7 @@ import UIKit
public protocol CollectionViewDataSource: UICollectionViewDataSource {
/**
Retrieves the items for the collectionView.
- Returns: An Array of Arrays of DataSourceItem objects.
- Returns: An Array of CollectionDataSourceItem objects.
*/
func items() -> [DataSourceItem]
func items() -> [CollectionDataSourceItem]
}
Sources/iOS/CollectionViewLayout.swift
......@@ -54,7 +54,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
open internal(set) lazy var layoutItems = [(UICollectionViewLayoutAttributes, NSIndexPath)]()
/// Cell data source items.
open internal(set) var dataSourceItems: [DataSourceItem]?
open internal(set) var dataSourceItems: [CollectionDataSourceItem]?
/// Scroll direction.
open var scrollDirection = UICollectionViewScrollDirection.vertical
......@@ -90,7 +90,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
open override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
let attributes = UICollectionViewLayoutAttributes(forCellWith: indexPath)
let item: DataSourceItem = dataSourceItems![indexPath.item]
let item = dataSourceItems![indexPath.item]
if 0 < itemSize.width && 0 < itemSize.height {
attributes.frame = CGRect(x: offset.x, y: offset.y, width: itemSize.width - contentEdgeInsets.left - contentEdgeInsets.right, height: itemSize.height - contentEdgeInsets.top - contentEdgeInsets.bottom)
......@@ -127,7 +127,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
return proposedContentOffset
}
private func prepareLayoutForItems(dataSourceItems: [DataSourceItem]) {
private func prepareLayoutForItems(dataSourceItems: [CollectionDataSourceItem]) {
self.dataSourceItems = dataSourceItems
layoutItems.removeAll()
......@@ -135,7 +135,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
offset.y = contentEdgeInsets.top
for i in 0..<dataSourceItems.count {
let item: DataSourceItem = dataSourceItems[i]
let item = dataSourceItems[i]
let indexPath = IndexPath(item: i, section: 0)
layoutItems.append((layoutAttributesForItem(at: indexPath)!, indexPath as NSIndexPath))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment