Updated spaces and diffable extensions.

Author: ivanvorobei

Sources/NativeUIKit/Collection/NativeLargeTitleCollectionViewCell.swift renamed to Sources/NativeUIKit/Collection/LargeHeader/NativeLargeHeaderCollectionView.swift

@@ -19,62 +19,34 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if canImport(UIKit) && (os(iOS))
 import UIKit
 import SparrowKit
 
-open class NativeLargeTitleCollectionViewCell: SPCollectionViewCell {
+open class NativeLargeHeaderCollectionView: SPCollectionReusableView {
 
-    // MARK: - Views
-    
-    public let titleLabel = SPLabel().do {
-        $0.font = UIFont.preferredFont(forTextStyle: .title1, weight: .bold, addPoints: .zero)
-        if #available(iOS 13.0, *) {
-            $0.textColor = .label
-        } else {
-            $0.textColor = .black
-        }
-    }
-    
-    // MARK: - Init
+    public let headerView = NativeLargeHeaderView()
 
     open override func commonInit() {
         super.commonInit()
-        contentView.layoutMargins = .init(top: 32, left: .zero, bottom: 8, right: .zero)
         insetsLayoutMarginsFromSafeArea = false
-        contentView.insetsLayoutMarginsFromSafeArea = false
-        preservesSuperviewLayoutMargins = false
-        contentView.preservesSuperviewLayoutMargins = false
-        addSubview(titleLabel)
-    }
-    
-    open override func prepareForReuse() {
-        super.prepareForReuse()
-        titleLabel.text = nil
-        parentLayout = nil
+        layoutMargins = .zero
+        addSubview(headerView)
     }
 
-    // MARK: - Layout
-    
-    open weak var parentLayout: UIView?
-    
     open override func layoutSubviews() {
         super.layoutSubviews()
-        if let parentLayout = parentLayout {
-            contentView.layoutMargins.left = parentLayout.layoutMargins.left
-            contentView.layoutMargins.right = parentLayout.layoutMargins.right
-        }
-        titleLabel.layoutDynamicHeight(
-            x: contentView.layoutMargins.left,
-            y: contentView.layoutMargins.top,
-            width: contentView.layoutWidth
-        )
+        headerView.layout(y: layoutMargins.top)
     }
 
     open override func sizeThatFits(_ size: CGSize) -> CGSize {
         let superSize = super.sizeThatFits(size)
-        layoutSubviews()
-        return .init(width: superSize.width, height: titleLabel.frame.maxY + contentView.layoutMargins.bottom)
+        return .init(width: superSize.width, height: headerView.frame.height + layoutMargins.bottom)
+    }
+    
+    static public func size(for item: NativeLargeHeaderItem, in collectionView: UICollectionView) -> CGSize {
+        let view = NativeLargeHeaderView()
+        view.configure(with: item)
+        view.setWidthAndFit(width: collectionView.layoutWidth)
+        return .init(width: collectionView.frame.width, height: view.frame.height)
     }
 }
-#endif

Sources/NativeUIKit/Collection/LargeHeader/SPDiffableCollectionHeaderFooterProvider+LargeHeader.swift

@@ -0,0 +1,36 @@
+// The MIT License (MIT)
+// Copyright © 2021 Ivan Vorobei ([email protected])
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import UIKit
+import SPDiffable
+
+@available(iOS 13.0, *)
+extension SPDiffableCollectionDataSource.HeaderFooterProvider {
+    
+    public static var largeHeader: SPDiffableCollectionDataSource.HeaderFooterProvider  {
+        return SPDiffableCollectionDataSource.HeaderFooterProvider.init { collectionView, kind, indexPath, item in
+            guard let header = item as? NativeLargeHeaderItem else { return nil }
+            let view = collectionView.dequeueReusableSupplementaryView(withCalss: NativeLargeHeaderCollectionView.self, kind: kind, for: indexPath)
+            view.headerView.configure(with: header)
+            return view
+        }
+    }
+}

Sources/NativeUIKit/NativeLayout.swift

@@ -32,21 +32,26 @@ public enum NativeLayout {
 
     public enum Spaces {
 
-        public static var `default`: CGFloat { 16 }
-        public static var default_half: CGFloat { 8 }
-        public static var default_double: CGFloat { 32 }
+        public static var step: CGFloat = 4
+        
+        public static var default_less: CGFloat { step * 3 }
+        public static var `default`: CGFloat { step * 4 }
+        public static var default_more: CGFloat { step * 5 }
+        
+        public static var default_half: CGFloat { self.default / 2 }
+        public static var default_double: CGFloat { self.default * 2 }
 
         public enum Margins {
 
-            public static var full_screen_horizontal: CGFloat { 16 }
-            public static var modal_screen_horizontal: CGFloat { 20 }
+            public static var full_screen_horizontal: CGFloat { Spaces.default }
+            public static var modal_screen_horizontal: CGFloat { step * 5 }
         }
 
         public enum Scroll {
 
-            public static var top_inset_transparent_navigation: CGFloat { 8 }
-            public static var bottom_inset_reach_end: CGFloat { 36 }
-            public static var bottom_inset_when_keyboard_can_appear: CGFloat { 32 }
+            public static var top_inset_transparent_navigation: CGFloat { step * 2 }
+            public static var bottom_inset_reach_end: CGFloat { step * 9 }
+            public static var bottom_inset_when_keyboard_can_appear: CGFloat { step * 8 }
         }
     }
 }

Sources/NativeUIKit/Table/LargeHeader/NativeLargeHeader.swift renamed to Sources/NativeUIKit/Table/LargeHeader/NativeLargeHeaderItem.swift

@@ -26,7 +26,7 @@ import SPDiffable
 /**
  SPDiffable: Native large header with button.
  */
-open class NativeLargeHeader: SPDiffableItem, SPDiffableItemActionable {
+open class NativeLargeHeaderItem: SPDiffableItem, SPDiffableItemActionable {
 
     open var title: String
     open var actionTitle: String?

Sources/NativeUIKit/Table/LargeHeader/NativeLargeHeaderView+SPDiffable.swift

@@ -0,0 +1,11 @@
+import UIKit
+
+extension NativeLargeHeaderView {
+    
+    open func configure(with item: NativeLargeHeaderItem) {
+        titleLabel.text = item.title
+        if let actionTitle = item.actionTitle {
+            button.setTitle(actionTitle)
+        }
+    }
+}

Sources/NativeUIKit/Table/LargeHeader/SPDiffableTableCellProvider+LargeHeader.swift

@@ -28,12 +28,9 @@ extension SPDiffableTableDataSource.HeaderFooterProvider {
 
     public static var largeHeader: SPDiffableTableDataSource.HeaderFooterProvider  {
         return SPDiffableTableDataSource.HeaderFooterProvider() { (tableView, indexPath, item) -> UIView? in
-            guard let header = item as? NativeLargeHeader else { return nil }
+            guard let header = item as? NativeLargeHeaderItem else { return nil }
             let view = NativeLargeHeaderView()
-            view.titleLabel.text = header.title
-            if let actionTitle = header.actionTitle {
-                view.button.setTitle(actionTitle)
-            }
+            view.configure(with: header)
             return view
         }
     }