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

Convert the Convenience Inits to designated Inits to use them for subclassing. #47

Merged
merged 3 commits into from
Jan 18, 2018
Merged

Convert the Convenience Inits to designated Inits to use them for subclassing. #47

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c604a
Updated Readme to correct the order of input of the viewUpdater Example.
Dec 30, 2017
04b2b09
Convert the Convenience Inits to Designated Inits.
Dec 31, 2017
5694904
Fixed extra Whitespace.
Jan 10, 2018
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ To build a basic provider, here is what you need:
```swift
let provider1 = CollectionProvider(
data: [1，2，3, 4], // provide an array of data, data can be any type
viewUpdater: { (label: UILabel, index: Int, data: Int) in
viewUpdater: { (label: UILabel, data: Int, index: Int) in
// update your view according to your data, view can be any subclass of UIView
label.backgroundColor = .red
label.layer.cornerRadius = 8
Expand Down Expand Up @@ -105,7 +105,7 @@ provider1.layout = FlowLayout(spacing: 10)

let provider2 = CollectionProvider(
data: ["A", "B"],
viewUpdater: { (label: UILabel, index: Int, data: String) in
viewUpdater: { (label: UILabel, data: String, index: Int) in
label.backgroundColor = .blue
label.layer.cornerRadius = 8
label.textAlignment = .center
Expand Down
78 changes: 40 additions & 38 deletions Sources/Provider/CollectionProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,46 +50,48 @@ open class CollectionProvider<Data, View: UIView>: BaseCollectionProvider {
super.init(identifier: identifier)
}

public convenience init(identifier: String? = nil,
dataProvider: DataProvider,
viewGenerator: ((Data, Int) -> View)? = nil,
viewUpdater: @escaping (View, Data, Int) -> Void,
layout: Layout = FlowLayout<Data>(),
sizeProvider: @escaping SizeProvider = defaultSizeProvider,
presenter: Presenter? = nil,
willReloadHandler: (() -> Void)? = nil,
didReloadHandler: (() -> Void)? = nil,
tapHandler: TapHandler? = nil) {
self.init(identifier: identifier,
dataProvider: dataProvider,
viewProvider: ClosureViewProvider(viewGenerator: viewGenerator, viewUpdater: viewUpdater),
layout: layout,
sizeProvider: sizeProvider,
presenter: presenter,
willReloadHandler: willReloadHandler,
didReloadHandler: didReloadHandler,
tapHandler: tapHandler)
public init(identifier: String? = nil,
dataProvider: DataProvider,
viewGenerator: ((Data, Int) -> View)? = nil,
viewUpdater: @escaping (View, Data, Int) -> Void,
layout: Layout = FlowLayout<Data>(),
sizeProvider: @escaping SizeProvider = defaultSizeProvider,
presenter: Presenter? = nil,
willReloadHandler: (() -> Void)? = nil,
didReloadHandler: (() -> Void)? = nil,
tapHandler: TapHandler? = nil) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra blank line

self.dataProvider = dataProvider
self.viewProvider = ClosureViewProvider(viewGenerator: viewGenerator, viewUpdater: viewUpdater)
self.layout = layout
self.sizeProvider = sizeProvider
self.presenter = presenter
self.willReloadHandler = willReloadHandler
self.didReloadHandler = didReloadHandler
self.tapHandler = tapHandler
super.init(identifier: identifier)
}

public convenience init(identifier: String? = nil,
data: [Data],
viewGenerator: ((Data, Int) -> View)? = nil,
viewUpdater: @escaping (View, Data, Int) -> Void,
layout: Layout = FlowLayout<Data>(),
sizeProvider: @escaping SizeProvider = defaultSizeProvider,
presenter: Presenter? = nil,
willReloadHandler: (() -> Void)? = nil,
didReloadHandler: (() -> Void)? = nil,
tapHandler: TapHandler? = nil) {
self.init(identifier: identifier,
dataProvider: ArrayDataProvider(data: data),
viewProvider: ClosureViewProvider(viewGenerator: viewGenerator, viewUpdater: viewUpdater),
layout: layout,
sizeProvider: sizeProvider,
presenter: presenter,
willReloadHandler: willReloadHandler,
didReloadHandler: didReloadHandler,
tapHandler: tapHandler)
public init(identifier: String? = nil,
data: [Data],
viewGenerator: ((Data, Int) -> View)? = nil,
viewUpdater: @escaping (View, Data, Int) -> Void,
layout: Layout = FlowLayout<Data>(),
sizeProvider: @escaping SizeProvider = defaultSizeProvider,
presenter: Presenter? = nil,
willReloadHandler: (() -> Void)? = nil,
didReloadHandler: (() -> Void)? = nil,
tapHandler: TapHandler? = nil) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

self.dataProvider = ArrayDataProvider(data: data)
self.viewProvider = ClosureViewProvider(viewGenerator: viewGenerator, viewUpdater: viewUpdater)
self.layout = layout
self.sizeProvider = sizeProvider
self.presenter = presenter
self.willReloadHandler = willReloadHandler
self.didReloadHandler = didReloadHandler
self.tapHandler = tapHandler
super.init(identifier: identifier)
}

// MARK: - Override Methods
Expand Down