Presentable section behaves as a presentables array

manGoweb · Apr 27, 2018 · 58c67b1 · 58c67b1
1 parent 7e738a7
commit 58c67b1
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 14 deletions.
diff --git a/Example/Presentables/CollectionDataManager.swift b/Example/Presentables/CollectionDataManager.swift
@@ -25,7 +25,7 @@ class CollectionDataManager: PresentableCollectionViewDataManager {
             }).cellSelected {
                 print("Selected: \(i)")
             }
-            section.presentables.append(presentable)
+            section.append(presentable)
         }
 
         data.append(section)

diff --git a/Example/Presentables/ManagerTableViewController.swift b/Example/Presentables/ManagerTableViewController.swift
@@ -27,7 +27,7 @@ class ManagerTableViewController: PresentableTableViewController {
         }).cellSelected {
             print("First cell has been selected")
         }
-        section.presentables.append(presentable)
+        section.append(presentable)
 
         data.append(section)
 

diff --git a/Example/Presentables/TableDataManager.swift b/Example/Presentables/TableDataManager.swift
@@ -29,13 +29,13 @@ class TableDataManager: PresentableTableViewDataManager {
         }).cellSelected {
             print("First cell has been selected")
         }
-        section.presentables.append(presentable)
+        section.append(presentable)
 
         for i in 2...51 {
             let presentable = Presentable<TableViewCell2>.create({ (cell) in
                 cell.textLabel?.text = "Id: \((i))"
             })
-            section.presentables.append(presentable)
+            section.append(presentable)
         }
 
         data.append(section)

diff --git a/Presentables.podspec b/Presentables.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'Presentables'
-    s.version          = '0.6.3'
+    s.version          = '0.6.4'
     s.summary          = 'Simple reactive library for managing table views & collection views, written in Swift'
 
     # This description is used to generate tags and improve search results.

diff --git a/Presentables/Classes/Collection views/PresentableCollectionViewDataManager.swift b/Presentables/Classes/Collection views/PresentableCollectionViewDataManager.swift
@@ -53,7 +53,7 @@ open class PresentableCollectionViewDataManager: NSObject, PresentableManager, U
     }
 
     open func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return data[section].presentables.count
+        return data[section].count
     }
 
     open func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {

diff --git a/Presentables/Classes/Helpers/Array+Presentables.swift b/Presentables/Classes/Helpers/Array+Presentables.swift
@@ -15,7 +15,7 @@ public extension Array where Element == PresentableType {
     public var section: PresentableSection {
         get {
             let section = PresentableSection()
-            section.presentables = self
+            section._presentables = self
             return section
         }
     }
@@ -29,7 +29,7 @@ public extension Array where Element: PresentableSectionMarker {
 
     func presentable(forIndexPath indexPath: IndexPath) -> PresentableType {
         let sections: PresentableSections = sectionsOrError()
-        return sections[indexPath.section].presentables[indexPath.row]
+        return sections[indexPath.section][indexPath.row]
     }
 
     func section(forIndexPath indexPath: IndexPath) -> PresentableSection {

diff --git a/Presentables/Classes/Libs/PresentableSection.swift b/Presentables/Classes/Libs/PresentableSection.swift
@@ -21,7 +21,7 @@ public protocol PresentableSectionMarker {
 
 public typealias PresentableSectionMarkers = [PresentableSectionMarker]
 
-public class PresentableSection: PresentableSectionMarker {
+public class PresentableSection: PresentableSectionMarker, Collection {
 
     public enum Animation {
         case none
@@ -52,7 +52,18 @@ public class PresentableSection: PresentableSectionMarker {
     }
 
     public var presenterAnimation: Animation = .none
+
+    @available(*, deprecated, message: "Use section.append(Presentable) directly")
     public var presentables: [PresentableType] {
+        get {
+            return _presentables
+        }
+        set {
+            _presentables = newValue
+        }
+    }
+
+    var _presentables: [PresentableType] {
         get {
             return bindablePresenters.value ?? []
         }
@@ -61,6 +72,64 @@ public class PresentableSection: PresentableSectionMarker {
         }
     }
 
+    // MARK: Access
+
+    public var startIndex: Int {
+        get {
+            return 0
+        }
+    }
+
+    public var endIndex: Int {
+        get {
+            return _presentables.isEmpty ? 0 : (_presentables.count - 1)
+        }
+    }
+
+    public func index(after i: Int) -> Int {
+        if i >= count {
+            fatalError("Presentable array index is out of bounds")
+        }
+        return i + 1
+    }
+
+    public subscript(index: Int) -> PresentableType {
+        get {
+            return _presentables[index]
+        }
+        set(newValue) {
+            _presentables[index] = newValue
+        }
+    }
+
+    public func index(where predicate: (PresentableType) throws -> Bool) rethrows -> Int? {
+        return try _presentables.index(where: predicate)
+    }
+
+    public func append(_ presentable: PresentableType) {
+        _presentables.append(presentable)
+    }
+
+    public func removeAll() {
+        _presentables.removeAll()
+    }
+
+    public func insert(_ presentable: PresentableType, at index: Int) {
+        _presentables.insert(presentable, at: index)
+    }
+
+    @discardableResult public func remove(at index: Int) -> PresentableType {
+        return _presentables.remove(at: index)
+    }
+
+    public var count: Int {
+        return _presentables.count
+    }
+
+    public var isEmpty: Bool {
+        return _presentables.isEmpty
+    }
+
     // MARK: Initialization
 
     public init() { }

diff --git a/Presentables/Classes/Table views/PresentableTableViewDataManager.swift b/Presentables/Classes/Table views/PresentableTableViewDataManager.swift
@@ -51,7 +51,7 @@ open class PresentableTableViewDataManager: NSObject, PresentableManager, UITabl
     }
 
     open func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return data[section].presentables.count
+        return data[section].count
     }
 
     open func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ class TableDataManager: PresentableTableViewDataManager {
         let presentable = Presentable<MyTableViewCell>.create({ (cell) in
             cell.textLabel?.text = "First cell"
         })
-        section.presentables.append(presentable)
+        section.append(presentable)
 
         // Now add your section to the data source
         data.append(section)
@@ -137,14 +137,14 @@ class TableDataManager: PresentableTableViewDataManager {
         }).cellSelected {
             print("First cell has been selected")
         }
-        section.presentables.append(presentable)
+        section.append(presentable)
 
         // And add loads more different cells
         for i in 2...51 {
             let presentable = Presentable<TableViewCell2>.create({ (cell) in
                 cell.textLabel?.text = "Id: \((i))"
             })
-            section.presentables.append(presentable)
+            section.append(presentable)
         }
 
         // Now add your section to the data source
@@ -189,7 +189,7 @@ class ManagerTableViewController: PresentableTableViewController {
         let presentable = Presentable<TableViewCell2>.create({ (cell) in
             cell.textLabel?.text = "Custom cell"
         })
-        section.presentables.append(presentable)
+        section.append(presentable)
 
         data.append(section)
     }