Merge branch 'develop' into feature/SPT-1478/add-interaction-to-message-view

Author: NullIsOne

.github/workflows/Build.yml

@@ -22,8 +22,9 @@ jobs:
     - name: Prepare Report
       run: make prepare_report
     - name: Upload Coverage
-      uses: codecov/[email protected].0
+      uses: codecov/[email protected].4
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         files: build/reports/cobertura.xml
         flags: unittests
         name: codecov-unit
@@ -45,8 +46,9 @@ jobs:
     - name: Prepare Report
       run: make prepare_example_report
     - name: Upload Coverage
-      uses: codecov/[email protected].0
+      uses: codecov/[email protected].4
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         files: build/reports/cobertura.xml
         flags: uitests
         name: codecov-ui

Example/ReactiveDataDisplayManager/Collection/CollectionCompositionalViewController/CollectionCompositionalViewController.swift

@@ -14,16 +14,16 @@ final class CollectionCompositionalViewController: UIViewController {
 
     // MARK: - Typealias
 
-    typealias ItemsInvalidationResult = (items: [NSCollectionLayoutVisibleItem], offset: CGPoint, environment: NSCollectionLayoutEnvironment)
+    typealias ItemsInvalidationResult = CollectionScrollViewDelegateProxyPlugin.ItemsInvalidationResult
 
     // MARK: - Constants
 
     private enum Constants {
         static let boundaryItemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .absolute(50.0))
         static let edgeInsets = NSDirectionalEdgeInsets(top: 10, leading: 10, bottom: 10, trailing: 10)
-        static let fraction: CGFloat = 1.0 / 3.0
-        static let minScale: CGFloat = 0.7
-        static let maxScale: CGFloat = 1.1
+        static let fraction: CGFloat = 1.0 / 2
+        static let minScale: CGFloat = 0.8
+        static let maxScale: CGFloat = 1
     }
 
     // MARK: - IBOutlets
@@ -35,8 +35,11 @@ final class CollectionCompositionalViewController: UIViewController {
     private let prefetcher = NukeImagePrefetcher(placeholder: #imageLiteral(resourceName: "ReactiveLogo"))
     private lazy var prefetcherablePlugin: CollectionImagePrefetcherablePlugin = .prefetch(prefetcher: prefetcher)
 
+    private let scrrollPlugin = CollectionScrollViewDelegateProxyPlugin()
     private lazy var adapter = collectionView.rddm.baseBuilder
         .add(plugin: prefetcherablePlugin)
+        .add(plugin: scrrollPlugin)
+        .add(plugin: .scrollOnSelect(to: .centeredHorizontally))
         .build()
 
     // MARK: - UIViewController
@@ -60,6 +63,18 @@ private extension CollectionCompositionalViewController {
         addGridSection()
         addCompositeGroupSection()
         adapter => .reload
+
+        // Handle table offset
+        scrrollPlugin.didScroll += { collectionView in
+            print(collectionView.contentOffset.y)
+        }
+
+        // Handle section offset
+        scrrollPlugin.didScrollCompositionLayoutSection += { [weak self] result in
+            print(result.offset.x)
+            result.applyScale(minScale: Constants.minScale, maxScale: Constants.maxScale, aligment: .center)
+            result.applyCentredPosition(collectionView: self?.collectionView)
+        }
     }
 
     func addAnimationSection() {
@@ -155,30 +170,11 @@ private extension CollectionCompositionalViewController {
         // Section
         let section = NSCollectionLayoutSection(group: group)
         section.contentInsets = NSDirectionalEdgeInsets(top: 30, leading: 0, bottom: 0, trailing: 0)
-        section.orthogonalScrollingBehavior = .groupPaging
         section.boundarySupplementaryItems = [header, footer] // add custom element (footer, header, ....)
-        section.visibleItemsInvalidationHandler = { [weak self] in self?.handleVisibleItemsInvalidation(($0, $1, $2)) }
+        section.setHorizontalScroll(type: .groupPagingCentered, with: scrrollPlugin)
         return section
     }
 
-    func handleVisibleItemsInvalidation(_ result: ItemsInvalidationResult) {
-        // Remove header from cells
-        let cellWithoutHeaderOrFooter = result.items.filter { $0.representedElementKind == .none }
-
-        let contentWidth = result.environment.container.contentSize.width
-
-        // Transform cells
-        cellWithoutHeaderOrFooter.forEach { item in
-            let height = item.bounds.height / 2
-            let distanceFromCenter = abs(item.frame.midX - result.offset.x - contentWidth / 2.0)
-            let scale = max(Constants.maxScale - distanceFromCenter / contentWidth, Constants.minScale)
-
-            item.transform = CGAffineTransform(translationX: 0, y: height)
-                .scaledBy(x: scale, y: scale)
-                .translatedBy(x: 0, y: -height)
-        }
-    }
-
     // Grid section
     func gridLayout() -> NSCollectionLayoutSection {
         // Header

Source/Collection/Plugins/PluginAction/CollectionScrollViewDelegateProxyPlugin.swift

@@ -71,3 +71,169 @@ public extension BaseCollectionPlugin {
     }
 
 }
+
+/// Proxy of  `CollectionScrollViewDelegateProxyPlugin` events
+#if os(iOS)
+@available(iOS 13.0, *)
+public extension CollectionScrollViewDelegateProxyPlugin {
+
+    // MARK: - Private static properties
+
+    private static var didScrollCompositionLayoutSection = BaseEvent<ItemsInvalidationResult>()
+
+    // MARK: Nested types
+
+    struct ItemsInvalidationResult {
+        public var items: [NSCollectionLayoutVisibleItem]
+        public var offset: CGPoint
+        public var environment: NSCollectionLayoutEnvironment
+
+        public init(items: [NSCollectionLayoutVisibleItem],
+                    offset: CGPoint,
+                    environment: NSCollectionLayoutEnvironment) {
+            self.items = items
+            self.offset = offset
+            self.environment = environment
+        }
+    }
+
+    // MARK: - Ppublic properties
+
+    /// - Note: To enable events you should link your `NSCollectionLayoutSection` with `CollectionScrollViewDelegateProxyPlugin` using method `NSCollectionLayoutSection.setHorizontalScroll`
+    var didScrollCompositionLayoutSection: BaseEvent<ItemsInvalidationResult> {
+        get {
+            Self.didScrollCompositionLayoutSection
+        }
+        set {
+            Self.didScrollCompositionLayoutSection = newValue
+        }
+    }
+
+}
+
+@available(iOS 13.0, *)
+public extension NSCollectionLayoutSection {
+
+    /// Set horizontal scroll type
+    ///  - Parameters:
+    ///   - type: Type of horizontal scroll
+    ///   - plugin: Plugin `CollectionScrollViewDelegateProxyPlugin`
+    func setHorizontalScroll(type: UICollectionLayoutSectionOrthogonalScrollingBehavior,
+                             with plugin: CollectionScrollViewDelegateProxyPlugin? = nil) {
+        orthogonalScrollingBehavior = type
+        visibleItemsInvalidationHandler = {
+            let result = CollectionScrollViewDelegateProxyPlugin.ItemsInvalidationResult(items: $0, offset: $1, environment: $2)
+            plugin?.didScrollCompositionLayoutSection.invoke(with: result)
+        }
+    }
+
+}
+
+// MARK: - CompositionLayout orthogonalScrollingBehavior animations
+
+@available(iOS 13.0, *)
+public extension CollectionScrollViewDelegateProxyPlugin.ItemsInvalidationResult {
+
+    // MARK: - Private static properties
+
+    private static let debouncer = Debouncer(queue: .global(qos: .userInitiated), delay: .milliseconds(100))
+    private static var oldOffsetX: CGFloat?
+
+    // MARK: - Nested types
+
+    enum Aligment {
+        case top, bottom, center
+    }
+
+    // MARK: - Public methods
+
+    /// Apply scale to cells
+    /// - Parameters:
+    ///  - minScale: Minimum scale
+    ///  - maxScale: Maximum scale
+    ///  - aligment: Aligment of cells (top, bottom, center)
+    func applyScale(minScale: CGFloat, maxScale: CGFloat, aligment: Aligment = .center) {
+        // Remove header from cells
+        let cellWithoutHeaderOrFooter = items.filter { $0.representedElementKind == .none }
+
+        let contentWidth = environment.container.contentSize.width
+
+        // Transform cells
+        cellWithoutHeaderOrFooter.forEach { item in
+            let height: CGFloat
+            switch aligment {
+            case .top:
+                height = item.bounds.height / 2
+            case .bottom:
+                height = -(item.bounds.height / 2)
+            case .center:
+                height = .zero
+            }
+            let distanceFromCenter = abs(item.frame.midX - offset.x - contentWidth / 2.0)
+            let scale = max(maxScale - distanceFromCenter / contentWidth, minScale)
+
+            item.transform = CGAffineTransform(translationX: 0, y: -height)
+                .scaledBy(x: scale, y: scale)
+                .translatedBy(x: 0, y: height)
+        }
+    }
+
+    /// Apply centred position to cells
+    /// - Parameters:
+    /// - collectionView: CollectionView. Need for scroll to item
+    func applyCentredPosition(collectionView: UICollectionView?) {
+        let velocity = collectionView?.panGestureRecognizer.velocity(in: collectionView)
+        if velocity?.x != 0 {
+            Self.debouncer.cancel()
+        }
+        let (_, indexPath) = getVisibleCenterItem()
+        guard let indexPath = indexPath, Self.oldOffsetX != offset.x else {
+            return
+        }
+        Self.oldOffsetX = offset.x
+        Self.debouncer.run { [weak collectionView] in
+            // waiting for main thread available
+            DispatchQueue.main.async {
+                collectionView?.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true)
+            }
+        }
+    }
+
+}
+
+// MARK: - Private methods
+
+@available(iOS 13.0, *)
+extension CollectionScrollViewDelegateProxyPlugin.ItemsInvalidationResult {
+
+    private func getVisibleCenterItem() -> (NSCollectionLayoutVisibleItem?, IndexPath?) {
+        // Step 1: Get the visible cells
+        let visibleCells = items.filter { $0.representedElementKind == .none }
+
+        // Step 2: Calculate the center point
+        let contentWidth = environment.container.contentSize.width
+        let contentHeight = environment.container.contentSize.height
+        let centerX = contentWidth / 2
+        let centerY = contentHeight / 2
+        let centerPoint = CGPoint(x: centerX + offset.x,
+                                  y: centerY + offset.y)
+
+        // Step 3: Iterate through the visible cells to find the center most
+        var minDistance: CGFloat = .greatestFiniteMagnitude
+        var centerCell: NSCollectionLayoutVisibleItem?
+        for cell in visibleCells {
+            let cellCenter = cell.center
+            let distance = hypot(centerPoint.x - cellCenter.x, centerPoint.y - cellCenter.y)
+            if distance < minDistance {
+                minDistance = distance
+                centerCell = cell
+            }
+        }
+
+        // Return the center cell and its indexPath
+        return (centerCell, centerCell?.indexPath)
+    }
+
+}
+
+#endif

Source/Collection/Plugins/PluginAction/CollectionScrollablePlugin.swift

@@ -48,6 +48,7 @@ public extension BaseCollectionPlugin {
     /// - parameter scrollProvider: allows you to organize the scroll inside the collection
     ///
     /// For example that the beginning of a new element always appears on the left of the screen.
+    /// - Warning: Do not work with UICollectionViewCompositionalLayout (use CollectionScrollViewDelegateProxyPlugin with didScrollCompositionLayoutSection event
     static func scrollableBehaviour(scrollProvider: CollectionScrollProvider) -> CollectionScrollablePlugin {
         .init(scrollProvider: scrollProvider)
     }

Source/Table/Manager/ManualTableManager.swift

@@ -349,6 +349,7 @@ private extension ManualTableManager {
 
         let indexPaths = generators.enumerated().map { IndexPath(row: $0.offset, section: sectionIndex) }
 
+        sections.registerAllIfNeeded(with: view, using: registrator)
         modifier?.insertSectionsAndRows(at: [sectionIndex: indexPaths], with: animation.value)
     }