merge the section controller with section layout provider and depreca…

…ted the old functions
traderepublic · May 22, 2024 · f5492f3 · f5492f3
1 parent dc80cf6
commit f5492f3
Show file tree

Hide file tree

Showing 21 changed files with 233 additions and 385 deletions.
diff --git a/SectionKit.xcodeproj/project.pbxproj b/SectionKit.xcodeproj/project.pbxproj
diff --git a/...llectionViewAdapter/ListCollectionViewAdapter/ListCollectionViewAdapter+Convenience.swift b/...llectionViewAdapter/ListCollectionViewAdapter/ListCollectionViewAdapter+Convenience.swift
@@ -58,12 +58,20 @@ extension ListCollectionViewAdapter {
 extension ListCollectionViewAdapter {
     @inlinable
     public func flowDelegate(at indexPath: IndexPath) -> SectionFlowDelegate? {
-        (controller(at: indexPath) as? FlowLayoutSectionController)?.flowDelegate
+        if #available(iOS 13.0, *) {
+            controller(at: indexPath)?.layoutProvider?.flowLayoutProvider
+        } else {
+            controller(at: indexPath)?.flowDelegate
+        }
     }
 
     @inlinable
     public func flowDelegate(at index: Int) -> SectionFlowDelegate? {
-        (controller(at: index) as? FlowLayoutSectionController)?.flowDelegate
+        if #available(iOS 13.0, *) {
+            controller(at: index)?.layoutProvider?.flowLayoutProvider
+        } else {
+            controller(at: index)?.flowDelegate
+        }
     }
 }
 

diff --git a/...r/SingleSectionCollectionViewAdapter/SingleSectionCollectionViewAdapter+Convenience.swift b/...r/SingleSectionCollectionViewAdapter/SingleSectionCollectionViewAdapter+Convenience.swift
@@ -58,12 +58,20 @@ extension SingleSectionCollectionViewAdapter {
 extension SingleSectionCollectionViewAdapter {
     @inlinable
     public func flowDelegate(at indexPath: IndexPath) -> SectionFlowDelegate? {
-        (controller(at: indexPath) as? FlowLayoutSectionController)?.flowDelegate
+        if #available(iOS 13.0, *) {
+            controller(at: indexPath)?.layoutProvider?.flowLayoutProvider
+        } else {
+            controller(at: indexPath)?.flowDelegate
+        }
     }
 
     @inlinable
     public func flowDelegate(at index: Int) -> SectionFlowDelegate? {
-        (controller(at: index) as? FlowLayoutSectionController)?.flowDelegate
+        if #available(iOS 13.0, *) {
+            controller(at: index)?.layoutProvider?.flowLayoutProvider
+        } else {
+            controller(at: index)?.flowDelegate
+        }
     }
 }
 

diff --git a/...rces/SectionController/CompositionalLayout/BaseCompositionalLayoutSectionController.swift b/...rces/SectionController/CompositionalLayout/BaseCompositionalLayoutSectionController.swift
diff --git a/SectionKit/Sources/SectionController/FlowLayout/BaseFlowLayoutSectionController.swift b/SectionKit/Sources/SectionController/FlowLayout/BaseFlowLayoutSectionController.swift
diff --git a/SectionKit/Sources/SectionController/FlowLayout/ListFlowLaoutSectionController.swift b/SectionKit/Sources/SectionController/FlowLayout/ListFlowLaoutSectionController.swift
diff --git a/SectionKit/Sources/SectionController/Generic/BaseSectionController.swift b/SectionKit/Sources/SectionController/Generic/BaseSectionController.swift
@@ -8,6 +8,7 @@ open class BaseSectionController: SectionController,
                                   SectionDataSource,
                                   SectionDataSourcePrefetchingDelegate,
                                   SectionDelegate,
+                                  SectionFlowDelegate,
                                   SectionDragDelegate,
                                   SectionDropDelegate {
     // MARK: - Init
@@ -31,6 +32,9 @@ open class BaseSectionController: SectionController,
     @available(iOS 11.0, *)
     open var dropDelegate: SectionDropDelegate? { self }
 
+    @available(iOS 13.0, *)
+    open var layoutProvider: SectionLayoutProvider? { .flowLayout(self) }
+
     open func didUpdate(model: Any) { }
 
     // MARK: - SectionDataSource
@@ -221,6 +225,81 @@ open class BaseSectionController: SectionController,
         nil
     }
 
+    // MARK: - SectionFlowDelegate
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func sizeForItem(
+        at indexPath: SectionIndexPath,
+        using layout: UICollectionViewLayout,
+        in context: CollectionViewContext
+    ) -> CGSize {
+        layout.flowLayout?.itemSize ?? FlowLayoutConstants.defaultItemSize
+    }
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func inset(using layout: UICollectionViewLayout, in context: CollectionViewContext) -> UIEdgeInsets {
+        layout.flowLayout?.sectionInset ?? FlowLayoutConstants.defaultInset
+    }
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func minimumLineSpacing(using layout: UICollectionViewLayout, in context: CollectionViewContext) -> CGFloat {
+        layout.flowLayout?.minimumLineSpacing ?? FlowLayoutConstants.defaultMinimumLineSpacing
+    }
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func minimumInteritemSpacing(
+        using layout: UICollectionViewLayout,
+        in context: CollectionViewContext
+    ) -> CGFloat {
+        layout.flowLayout?.minimumInteritemSpacing ?? FlowLayoutConstants.defaultMinimumInteritemSpacing
+    }
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func referenceSizeForHeader(
+        using layout: UICollectionViewLayout,
+        in context: CollectionViewContext
+    ) -> CGSize {
+        layout.flowLayout?.headerReferenceSize ?? FlowLayoutConstants.defaultHeaderSize
+    }
+
+    @available(
+        iOS,
+        introduced: 6.0,
+        deprecated: 13.0,
+        message: "Please use the layoutProvider with the flowLayout type"
+    )
+    open func referenceSizeForFooter(
+        using layout: UICollectionViewLayout,
+        in context: CollectionViewContext
+    ) -> CGSize {
+        layout.flowLayout?.footerReferenceSize ?? FlowLayoutConstants.defaultFooterSize
+    }
+
     // MARK: - SectionDropDelegate
 
     @available(iOS 11.0, *)

diff --git a/...fingListFlowLayoutSectionController.swift → ...ndationDiffingListSectionController.swift b/...fingListFlowLayoutSectionController.swift → ...ndationDiffingListSectionController.swift
@@ -8,10 +8,10 @@ import Foundation
  */
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 @MainActor
-open class FoundationDiffingListFlowLayoutSectionController<
+open class FoundationDiffingListSectionController<
     Model,
     Item: Hashable
->: ListFlowLaoutSectionController<Model, Item> {
+>: ListSectionController<Model, Item> {
     override open func calculateUpdate(
         from oldData: [Item],
         to newData: [Item]
@@ -32,12 +32,3 @@ open class FoundationDiffingListFlowLayoutSectionController<
         )
     }
 }
-
-@available(
-    *,
-     deprecated,
-     renamed: "FoundationDiffingListFlowLayoutSectionController",
-     message: "It has been renamed to FoundationDiffingListFlowLayoutSectionController"
-)
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-public typealias FoundationDiffingListSectionController = FoundationDiffingListFlowLayoutSectionController
diff --git a/...ompositionalLayoutSectionController.swift → ...oller/Generic/ListSectionController.swift b/...ompositionalLayoutSectionController.swift → ...oller/Generic/ListSectionController.swift
@@ -8,8 +8,7 @@ import UIKit
  of a model to be displayed and the list of items (almost) never changes or should not perform animated updates.
  */
 @MainActor
-@available(iOS 13.0, *)
-open class ListCompositionalLayoutSectionController<Model, Item>: BaseCompositionalLayoutSectionController {
+open class ListSectionController<Model, Item>: BaseSectionController {
     /**
      Initialise an instance of `ListSectionController`.
 
@@ -72,7 +71,7 @@ open class ListCompositionalLayoutSectionController<Model, Item>: BaseCompositio
 
     /**
      The list of items currently displayed in the `UICollectionView`.
-
+     
      Only set this property if `UICollectionView` insertions and deletions are handled, otherwise use `items` instead.
      */
     open var collectionViewItems: [Item] = []
@@ -93,11 +92,11 @@ open class ListCompositionalLayoutSectionController<Model, Item>: BaseCompositio
 
     /**
      Calculate the `UICollectionView` events using the difference from the old to the new data.
-
+     
      - Parameter oldData: The old data currently displayed in the section.
-
+     
      - Parameter newData: The new data that should be displayed in the section.
-
+     
      - Returns: The update that should be performed on the section.
      */
     open func calculateUpdate(