Improved clear row functionality.

Example/ugrid/ViewController.swift

@@ -19,7 +19,7 @@ class ViewController: UIViewController {
     // MARK: - private vars
     private var _dataSource: [Int] = Array(0...1000)
     private var _layout = UGridFlowLayout()
-    private var _layoutType: LayoutType = .less
+    private var _layoutType: LayoutType = .more
     private var _dirrection: UICollectionView.ScrollDirection = .vertical
 
     private var _dirrectionTitle: String {
@@ -83,6 +83,17 @@ extension ViewController: UICollectionViewDataSource {
 
         cell.backgroundColor = .init(red: (135 / 255), green: (206 / 255), blue: (250 / 255), alpha: 1)
 
+        if let label = cell.contentView.viewWithTag(32) as? UILabel {
+            label.text = "\(_dataSource[indexPath.row])"
+        } else {
+            let label = UILabel()
+            label.tag = 32
+            label.text = "\(_dataSource[indexPath.row])"
+            label.sizeToFit()
+
+            cell.contentView.addSubview(label)
+        }
+
         return cell
     }
 }
@@ -111,9 +122,9 @@ class CustomSizeCountInrow: IGridItemsInRow {
         case .more:
             switch size {
             case .small:
-                return 6
+                return 8
             case .middle:
-                return 3
+                return 4
             case .big:
                 return 1
             }

ugrid/Classes/Calculation/ClearCalculationCache/ClearCalculatinoCache.swift

@@ -20,14 +20,16 @@ class ClearCompleteRow {
 final class ClearVerticalCompleteRow: ClearCompleteRow { }
 
 extension ClearVerticalCompleteRow: IGridCompleteRowFinder {
-    func findCompleteRows(inAttributes attributes: [UICollectionViewLayoutAttributes], beforeFrame frame: CGRect, completion: @escaping (CGFloat) -> Void) {
-        if (frame.maxX + gridSize.smallGrid.width) >= (layout.layoutWidth - layout.inset.left) {
-            let height = attributes.sorted { $0.frame.maxY > $1.frame.maxY }.first?.frame.maxY ?? 0
-
-            // Check that heigh for all items in the line is same
-            // if it's not, that means that there can be an empy space to place new item
-            if height == frame.maxY {
-                completion(height)
+    func findCompleteRows(inAttributes attributes: [UICollectionViewLayoutAttributes], completion: @escaping (CGFloat) -> Void) {
+        let itemsCount = gridSize.countInRow(forItems: .small)
+        let suffix = attributes.suffix(itemsCount)
+
+        if suffix.count == itemsCount {
+            let maxY = suffix.sorted { $0.frame.maxY > $1.frame.maxY }.first?.frame.maxY ?? 0
+            let minY = suffix.sorted { $0.frame.maxY < $1.frame.maxY }.first?.frame.maxY ?? 0
+
+            if minY == maxY {
+                completion(maxY)
             }
         }
     }
@@ -36,14 +38,16 @@ extension ClearVerticalCompleteRow: IGridCompleteRowFinder {
 final class ClearHorizontalCompleteRow: ClearCompleteRow { }
 
 extension ClearHorizontalCompleteRow: IGridCompleteRowFinder {
-    func findCompleteRows(inAttributes attributes: [UICollectionViewLayoutAttributes], beforeFrame frame: CGRect, completion: @escaping (CGFloat) -> Void) {
-        if (frame.maxY + gridSize.smallGrid.height) >= (layout.layoutHeight - layout.inset.left) {
-            let width = attributes.sorted { $0.frame.maxX > $1.frame.maxX }.first?.frame.maxX ?? 0
-
-            // Check that heigh for all items in the line is same
-            // if it's not, that means that there can be an empy space to place new item
-            if width == frame.maxX {
-                completion(width)
+    func findCompleteRows(inAttributes attributes: [UICollectionViewLayoutAttributes], completion: @escaping (CGFloat) -> Void) {
+        let itemsCount = gridSize.countInRow(forItems: .small)
+        let suffix = attributes.suffix(itemsCount)
+
+        if suffix.count == itemsCount {
+            let maxX = suffix.sorted { $0.frame.maxX > $1.frame.maxX }.first?.frame.maxX ?? 0
+            let minX = suffix.sorted { $0.frame.maxX < $1.frame.maxX }.first?.frame.maxX ?? 0
+
+            if minX == maxX {
+                completion(maxX)
             }
         }
     }

ugrid/Classes/Calculation/ClearCalculationCache/IGridCompleteRowFinder.swift

@@ -10,7 +10,6 @@ import UIKit
 protocol IGridCompleteRowFinder {
 
     func findCompleteRows(inAttributes attributes: [UICollectionViewLayoutAttributes],
-                          beforeFrame frame: CGRect,
                           completion: @escaping (CGFloat) -> Void
     )
 }

ugrid/Classes/Calculation/GridCalculationLogic.swift

@@ -85,18 +85,18 @@ final class GridCalculationLogic: IGridCalculation {
 
             a.frame = spaceRect
 
+            attributesInRow.append(a)
+
             // This will decrease complexity
             // If there is fully complete line, like:
             // if grid type is 'less', and there is [small, small, small, small] in one line
             // this will remove all four attributes, because there is no point for having them
             // while looking for empty space
-            _findCompleteRows[_layout.scrollingDirection.rawValue]?.findCompleteRows(inAttributes: attributesInRow, beforeFrame: a.frame, completion: { (v) in
+            _findCompleteRows[_layout.scrollingDirection.rawValue]?.findCompleteRows(inAttributes: attributesInRow, completion: { (v) in
                 attributesInRow.removeAll()
 
                 startCoord = v
             })
-
-            attributesInRow.append(a)
         }
 
         if _layout.scrollingDirection == .vertical {

ugrid/Classes/GridSize/GridSize.swift

@@ -39,6 +39,10 @@ final class GridSize {
 }
 
 extension GridSize: IGridSize {
+    func countInRow(forItems itemType: SizeType) -> Int {
+        return Int(_gridInRow.itemsInRow(forSizeType: itemType, andLayoutType: _layoutType))
+    }
+
     func setType(_ layoutType: LayoutType) {
         _layoutType = layoutType
     }
@@ -67,13 +71,18 @@ extension GridSize: IGridSize {
     }
 
     var bigGrid: CGSize {
-        let itemWidth = getItemWidth(forGridSize: .big)
+        var itemWidth = getItemWidth(forGridSize: .big)
 
         switch _layoutType {
         case .less:
             return .init(width: itemWidth, height: middleGrid.height)
         case .more:
-            return .init(width: itemWidth * 6 / 9.1, height: middleGrid.height)
+
+            if _gridInRow.itemsInRow(forSizeType: .big, andLayoutType: _layoutType) == 1 {
+                itemWidth = itemWidth - getItemWidth(forGridSize: .middle) - 10
+            }
+
+            return .init(width: itemWidth, height: middleGrid.height)
         }
     }
 }

ugrid/Classes/GridSize/IGridSize.swift

@@ -38,4 +38,8 @@ protocol IGridSize: IGridSizeConfigurable {
 
     func setType(_ layoutType: LayoutType)
     func getSize(forGridSizeType sizeType: SizeType) -> CGSize
+
+    //TODO: maybe that is not such a good idea to provide this function
+    // through IGridSize interface
+    func countInRow(forItems itemType: SizeType) -> Int
 }