Skip to content

Commit 3cb1e44

Browse files
author
Lorenzo
committed
Merge branch 'release/0.3.0'
2 parents 4f0af28 + e0adaf7 commit 3cb1e44

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

ALTableView.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = "ALTableView"
11-
s.version = "0.2.0"
11+
s.version = "0.3.0"
1212
s.summary = "An easy way to manage UITableView and UITableViewController"
1313

1414
# This description is used to generate tags and improve search results.

ALTableViewSwift/ALTableView/ALTableView/ALTableViewClasses/Elements/ALElement.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public class ALElement {
1313
internal var estimateHeightMode: Bool
1414
internal var height: CGFloat
1515
internal let identifier: String
16-
internal let dataObject: Any
16+
internal let dataObject: Any?
1717

1818

19-
init(identifier: String, dataObject: Any,estimateHeightMode: Bool, height: CGFloat) {
19+
init(identifier: String, dataObject: Any?, estimateHeightMode: Bool, height: CGFloat) {
2020

2121
self.identifier = identifier
2222
self.dataObject = dataObject
@@ -26,7 +26,7 @@ public class ALElement {
2626

2727
//MARK: - Getters
2828

29-
internal func getDataObject() -> Any {
29+
internal func getDataObject() -> Any? {
3030

3131
return self.dataObject
3232
}

ALTableViewSwift/ALTableView/ALTableView/ALTableViewClasses/Elements/HeaderFooter/ALHeaderFooterElement.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import UIKit
1010

1111
public typealias ALHeaderFooterPressedHandler = (UITableViewHeaderFooterView) -> Void
12-
public typealias ALHeaderFooterCreatedHandler = (Any, UITableViewHeaderFooterView) -> Void
12+
public typealias ALHeaderFooterCreatedHandler = (Any?, UITableViewHeaderFooterView) -> Void
1313
public typealias ALHeaderFooterDeselectedHandler = (UITableViewHeaderFooterView) -> Void
1414

1515
//Implemented by ALHeaderFooterElement
@@ -20,15 +20,15 @@ public protocol ALHeaderFooterElementProtocol {
2020
//Implemented by UITableViewCell
2121
public protocol ALHeaderFooterProtocol {
2222
func viewPressed () -> Void
23-
func viewCreated(dataObject: Any) -> Void
23+
func viewCreated(dataObject: Any?) -> Void
2424
}
2525

2626
extension ALHeaderFooterProtocol {
2727
public func viewPressed () -> Void {
2828

2929
}
3030

31-
public func viewCreated(dataObject: Any) -> Void {
31+
public func viewCreated(dataObject: Any?) -> Void {
3232
print("ALHeaderFooterProtocol")
3333
}
3434
}

ALTableViewSwift/ALTableView/ALTableView/ALTableViewClasses/Elements/Row/ALRowElement.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import UIKit
1010

1111
public typealias ALCellPressedHandler = (UIViewController?, UITableViewCell) -> Void
12-
public typealias ALCellCreatedHandler = (Any, UITableViewCell) -> Void
12+
public typealias ALCellCreatedHandler = (Any?, UITableViewCell) -> Void
1313
public typealias ALCellDeselectedHandler = (UITableViewCell) -> Void
1414

1515
//Implemented by ALRowElement
@@ -22,7 +22,7 @@ public protocol ALRowElementProtocol {
2222
public protocol ALCellProtocol {
2323
func cellPressed (viewController: UIViewController?) -> Void
2424
func cellDeselected () -> Void
25-
func cellCreated(dataObject: Any) -> Void
25+
func cellCreated(dataObject: Any?) -> Void
2626
}
2727

2828
extension ALCellProtocol {
@@ -34,7 +34,7 @@ extension ALCellProtocol {
3434

3535
}
3636

37-
public func cellCreated(dataObject: Any) -> Void {
37+
public func cellCreated(dataObject: Any?) -> Void {
3838
print("ALCellProtocol")
3939
}
4040
}
@@ -54,7 +54,7 @@ public class ALRowElement: ALElement, ALRowElementProtocol {
5454

5555
//MARK: - Initializers
5656

57-
public init(className: AnyClass, identifier: String, dataObject: Any, cellStyle: UITableViewCell.CellStyle = .default, estimateHeightMode: Bool = false, height: CGFloat = 44.0, pressedHandler: ALCellPressedHandler? = nil, createdHandler: ALCellCreatedHandler? = nil, deselectedHandler: ALCellDeselectedHandler? = nil) {
57+
public init(className: AnyClass, identifier: String, dataObject: Any?, cellStyle: UITableViewCell.CellStyle = .default, estimateHeightMode: Bool = false, height: CGFloat = 44.0, pressedHandler: ALCellPressedHandler? = nil, createdHandler: ALCellCreatedHandler? = nil, deselectedHandler: ALCellDeselectedHandler? = nil) {
5858

5959
self.className = className
6060
self.cellStyle = cellStyle

ALTableViewSwift/ALTableView/ALTableView/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.2.0</string>
18+
<string>0.3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

ALTableViewSwift/TestALTableView/TestALTableView/Master/Master2TableViewCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Master2TableViewCell: UITableViewCell, ALCellProtocol {
2626
// Configure the view for the selected state
2727
}
2828

29-
public func cellCreated(dataObject: Any) {
29+
public func cellCreated(dataObject: Any?) {
3030
if let title = dataObject as? Int {
3131
self.label.text = String(title)
3232
}

ALTableViewSwift/TestALTableView/TestALTableView/Master/MasterHeaderFooter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class MasterHeaderFooter: UITableViewHeaderFooterView, ALHeaderFooterProtocol {
2323
}
2424
*/
2525

26-
func viewCreated(dataObject: Any) {
26+
func viewCreated(dataObject: Any?) {
2727
if let title: String = dataObject as? String {
2828
self.labelText.text = title
2929
}

ALTableViewSwift/TestALTableView/TestALTableView/Master/MasterTableViewCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MasterTableViewCell: UITableViewCell, ALCellProtocol {
1616

1717
@IBOutlet weak var labelText: UILabel!
1818

19-
public func cellCreated(dataObject: Any) {
19+
public func cellCreated(dataObject: Any?) {
2020
if let title = dataObject as? String {
2121
self.labelText.text = title
2222
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The development of the Objective-C part of this project has been discontinued. T
88

99
This framework is still on development. We cannot guarantee yet that all the features work.
1010

11-
The latest stable version for swift is [0.2.0](https://github.com/ALiOSDev/ALTableView/tree/0.2.0), which includes support for swift 4.2
11+
The latest stable version for swift is [0.3.0](https://github.com/ALiOSDev/ALTableView/tree/0.3.0), which includes support for swift 4.2
1212

1313

1414
**CocoaPods**

0 commit comments

Comments
 (0)