Merge pull request #64 from PB-Digital/develop

RELEASE: 1.5.3

Config.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.5.2",
-    "release_notes": "Imported `SpreadsheetView` library into codebase"
+    "version": "1.5.3",
+    "release_notes": "- Made minor improvements on the codebase"
 }

Sources/PashaKit/Extensions/Cell+Extensions.swift

@@ -0,0 +1,44 @@
+//
+//  File.swift
+//  
+//
+//  Created by Murad on 13.09.24.
+//
+
+import UIKit
+
+extension UITableView {
+    public func register(_ type: UITableViewCell.Type) {
+        self.register(type, forCellReuseIdentifier: type.identifier)
+    }
+
+    public func dequeueReusableCell<T: UITableViewCell>(withType type: T.Type) -> T? {
+        return self.dequeueReusableCell(withIdentifier: type.identifier) as? T
+    }
+
+    public func dequeueReusableCell<T: UITableViewCell>(withType type: T.Type, for indexPath: IndexPath) -> T? {
+        return self.dequeueReusableCell(withIdentifier: type.identifier, for: indexPath) as? T
+    }
+}
+
+extension UICollectionView {
+    public func register(_ type: UICollectionViewCell.Type) {
+        self.register(type, forCellWithReuseIdentifier: type.identifier)
+    }
+
+    public func dequeueReusableCell<T: UICollectionViewCell>(withType type: T.Type, for indexPath: IndexPath) -> T? {
+        return self.dequeueReusableCell(withReuseIdentifier: type.identifier, for: indexPath) as? T
+    }
+}
+
+extension UITableViewCell {
+    public static var identifier: String {
+        return String(describing: self)
+    }
+}
+
+extension UICollectionViewCell {
+    public static var identifier: String {
+        return String(describing: self)
+    }
+}

Sources/PashaKit/Extensions/UIView+Extensions.swift

@@ -222,3 +222,18 @@ public extension UIView {
         view.layer.mask = maskLayer
     }
 }
+
+public extension UIView {
+    func set(cornerRadius: CGFloat, cornerCurve: CALayerCornerCurve = .continuous) {
+        self.layer.cornerCurve = cornerCurve
+        self.layer.cornerRadius = cornerRadius
+    }
+
+    func set(borderColor: UIColor) {
+        self.layer.borderColor = borderColor.cgColor
+    }
+
+    func set(borderWidth: CGFloat) {
+        self.layer.borderWidth = borderWidth
+    }
+}

Sources/PashaKit/Flow Layouts/PBSnappingLayout.swift

@@ -54,15 +54,14 @@ public class PBSnappingLayout: UICollectionViewFlowLayout {
         }
 
         var offsetAdjusment = CGFloat.greatestFiniteMagnitude
-        let horizontalPosition: CGFloat
 
-        switch snapPosition {
+        let horizontalPosition = switch snapPosition {
         case .left:
-            horizontalPosition = proposedContentOffset.x + collectionView.contentInset.left + sectionInset.left
+            proposedContentOffset.x + collectionView.contentInset.left + sectionInset.left
         case .center:
-            horizontalPosition = proposedContentOffset.x + (collectionView.bounds.width * 0.5)
+            proposedContentOffset.x + (collectionView.bounds.width * 0.5)
         case .right:
-            horizontalPosition = proposedContentOffset.x + collectionView.bounds.width - sectionInset.right
+            proposedContentOffset.x + collectionView.bounds.width - sectionInset.right
         }
 
         let targetRect = CGRect(
@@ -75,29 +74,22 @@ public class PBSnappingLayout: UICollectionViewFlowLayout {
         let layoutAttributesArray = super.layoutAttributesForElements(in: targetRect)
 
         layoutAttributesArray?.forEach { layoutAttributes in
-            let itemHorizontalPosition: CGFloat
-
-            switch snapPosition {
+            let itemHorizontalPosition = switch snapPosition {
             case .left:
-                itemHorizontalPosition = layoutAttributes.frame.minX - collectionView.contentInset.left
+                layoutAttributes.frame.minX
             case .center:
-                itemHorizontalPosition = layoutAttributes.center.x
+                layoutAttributes.center.x
             case .right:
-                itemHorizontalPosition = layoutAttributes.frame.maxX + collectionView.contentInset.right
+                layoutAttributes.frame.maxX
             }
 
             if abs(itemHorizontalPosition - horizontalPosition) < abs(offsetAdjusment) {
-
                 if abs(velocity.x) < self.minimumSnapVelocity {
                     offsetAdjusment = itemHorizontalPosition - horizontalPosition
-                }
-
-                else if velocity.x > 0 {
-                    offsetAdjusment = itemHorizontalPosition - horizontalPosition + (layoutAttributes.bounds.width + self.minimumLineSpacing)
-                }
-
-                else {
-                    offsetAdjusment = itemHorizontalPosition - horizontalPosition - (layoutAttributes.bounds.width + self.minimumLineSpacing)
+                } else if velocity.x > 0 {
+                    offsetAdjusment = itemHorizontalPosition - horizontalPosition + (layoutAttributes.bounds.width + minimumLineSpacing)
+                } else {
+                    offsetAdjusment = itemHorizontalPosition - horizontalPosition - (layoutAttributes.bounds.width + minimumLineSpacing)
                 }
             }
         }

Sources/PashaKit/PBCardInputView/PBCardInputView.swift

@@ -246,9 +246,9 @@ open class PBCardInputView: UIView {
     }
 
     private func setupViews() {
-        self.layer.cornerRadius = self.cornerRadius
+        self.set(cornerRadius: self.cornerRadius)
         self.layer.masksToBounds = true
-        
+
         self.setTheme()
         self.setupConstraints()
     }

Sources/PashaKit/PBCardRowView/PBCardRowView.swift

@@ -83,7 +83,7 @@ open class PBCardRowView: UIView, PBSkeletonable {
 
         view.translatesAutoresizingMaskIntoConstraints = false
 
-        view.layer.cornerRadius = 6.0
+        view.set(cornerRadius: 6.0)
         view.layer.masksToBounds = true
 
         view.heightAnchor.constraint(equalToConstant: 36.0).isActive = true

Sources/PashaKit/PBContactRowView/PBContactRowView.swift

@@ -156,7 +156,7 @@ open class PBContactRowView: UIView {
         label.backgroundColor = UIColor.Colors.PBGreen
         label.textColor = .white
         label.textAlignment = .center
-        label.layer.cornerRadius = 20.0
+        label.set(cornerRadius: 20.0)
         label.layer.masksToBounds = true
 
         label.widthAnchor.constraint(equalToConstant: 40.0).isActive = true
@@ -265,7 +265,7 @@ open class PBContactRowView: UIView {
         self.translatesAutoresizingMaskIntoConstraints = false
         self.backgroundColor = UIColor(red: 0.969, green: 0.969, blue: 0.969, alpha: 1)
         self.layer.masksToBounds = true
-        self.layer.cornerRadius = 10.0
+        self.set(cornerRadius: 10.0)
 
         self.primaryStackView.addArrangedSubview(self.letterLabel)
         self.primaryStackView.addArrangedSubview(self.contactInfoStackView)

Sources/PashaKit/PBInfoBar/PBInfoBar.swift

@@ -200,7 +200,7 @@ open class PBInfoBar: UIView {
 
     private func setupDefaults() {
         self.backgroundColor = UIColor.Colors.PBGrayTransparent
-        self.layer.cornerRadius = 12.0
+        self.set(cornerRadius: 12.0)
     }
 
     func setup(attentionLevel: AttentionLevel) {

Sources/PashaKit/PBPaddingLabel/PBPaddingLabel.swift

@@ -42,7 +42,7 @@ open class PBPaddingLabel: UILabel {
         self.edgeInsets = edgeInsets
         super.init(frame: CGRect.zero)
         self.clipsToBounds = true
-        self.layer.cornerRadius = cornerRadius
+        self.set(cornerRadius: cornerRadius)
         self.layer.masksToBounds = true
     }
 

Sources/PashaKit/PBRoundedView/PBRoundedView.swift

@@ -122,9 +122,9 @@ public class PBRoundedView: UIView {
     public override func layoutSubviews() {
         switch self.style {
         case .roundedRect(let cornerRadius):
-            self.layer.cornerRadius = cornerRadius
+            self.set(cornerRadius: cornerRadius)
         case .circle:
-            self.layer.cornerRadius = self.frame.width / 2.0
+            self.set(cornerRadius: self.frame.width / 2.0)
         }
     }
 

Sources/PashaKit/PBRowView/PBRowView.swift

@@ -728,9 +728,9 @@ open class PBRowView: UIView, PBSkeletonable {
     private func setupLeftIconCornerRadius(style: Style) {
         switch style {
         case .roundedRect(cornerRadius: let cornerRadius):
-            self.leftIconWrapperView.layer.cornerRadius = cornerRadius
+            self.leftIconWrapperView.set(cornerRadius: cornerRadius)
         case .circle:
-            self.leftIconWrapperView.layer.cornerRadius = self.leftViewSize.width / 2
+            self.leftIconWrapperView.set(cornerRadius: self.leftViewSize.width / 2)
         }
     }
 }

Sources/PashaKit/PBRowView/PBTransactionRowView.swift

@@ -102,9 +102,9 @@ public class PBTransactionRowView: UIView, PBSkeletonable {
         didSet {
             switch self.leftIconStyle {
             case .roundedRect(cornerRadius: let cornerRadius):
-                self.categoryImage.layer.cornerRadius = cornerRadius
+                self.categoryImage.set(cornerRadius: cornerRadius)
             case .circle:
-                self.categoryImage.layer.cornerRadius = 20.0
+                self.categoryImage.set(cornerRadius: 20.0)
             }
         }
     }
@@ -231,7 +231,7 @@ public class PBTransactionRowView: UIView, PBSkeletonable {
         self.transactionInfoContainerView.addSubview(view)
 
         view.translatesAutoresizingMaskIntoConstraints = false
-        view.layer.cornerRadius = 10
+        view.set(cornerRadius: 10.0)
         view.isHidden = true
 
         return view
@@ -329,9 +329,9 @@ public class PBTransactionRowView: UIView, PBSkeletonable {
 
         switch self.leftIconStyle {
         case .roundedRect(cornerRadius: let cornerRadius):
-            self.categoryImage.layer.cornerRadius = cornerRadius
+            self.categoryImage.set(cornerRadius: cornerRadius)
         case .circle:
-            self.categoryImage.layer.cornerRadius = 20.0
+            self.categoryImage.set(cornerRadius: 20.0)
         }
 
         NSLayoutConstraint.activate([

Sources/PashaKit/PBSelectField/PBAccountSelectField.swift

@@ -121,9 +121,9 @@ open class PBAccountSelectField: UIView {
         self.addSubview(view)
 
         view.frame = CGRect()
-        view.layer.cornerRadius = 8
-        view.layer.borderColor = UIColor.Colors.PBGraySecondary.cgColor
-        view.layer.borderWidth = 1.0
+        view.set(cornerRadius: 12.0)
+        view.set(borderColor: UIColor.Colors.PBGraySecondary)
+        view.set(borderWidth: 1.0)
         view.backgroundColor = .clear
         view.translatesAutoresizingMaskIntoConstraints = false
 
@@ -270,12 +270,12 @@ open class PBAccountSelectField: UIView {
     private func updateUI() {
         switch self.isValid {
         case .valid:
-            self.customBorder.layer.borderColor = UIColor.Colors.PBGraySecondary.cgColor
+            self.customBorder.set(borderColor: UIColor.Colors.PBGraySecondary)
             self.footerLabel.textColor = UIColor.black.withAlphaComponent(0.6)
             self.placeholderLabel.textColor = UIColor.black.withAlphaComponent(0.6)
             self.footerLabel.text = self.footerLabelText
         case .invalid(let error):
-            self.customBorder.layer.borderColor = UIColor.systemRed.cgColor
+            self.customBorder.set(borderColor: UIColor.systemRed)
             self.footerLabel.textColor = .systemRed
             self.placeholderLabel.textColor = .systemRed
             self.footerLabel.text = error

Sources/PashaKit/PBSelectables/PBBaseSelectableView.swift

@@ -155,7 +155,7 @@ open class PBBaseSelectableView: UIView {
 
     func setupViews() {
         self.setupDefaults()
-        self.layer.borderColor = UIColor.Colors.PBGraySecondary.cgColor
+        self.set(borderColor: UIColor.Colors.PBGraySecondary)
         self.backgroundColor = UIColor.white
     }
 
@@ -178,17 +178,17 @@ open class PBBaseSelectableView: UIView {
         switch self.selectionStyle {
         case .highlighted:
             if self.isSelected {
-                self.layer.borderWidth = 2.0
-                self.layer.borderColor = self.selectedBorderColor.cgColor
+                self.set(borderWidth: 1.0)
+                self.set(borderColor: self.selectedBorderColor)
                 self.backgroundColor = self.selectedStateColor
             } else {
-                self.layer.borderWidth = 1.0
-                self.layer.borderColor = UIColor.Colors.PBGraySecondary.cgColor
+                self.set(borderWidth: 1.0)
+                self.set(borderColor: UIColor.Colors.PBGraySecondary)
                 self.backgroundColor = UIColor.white
             }
         case .clear:
-            self.layer.borderWidth = 0.0
-            self.layer.borderColor = UIColor.clear.cgColor
+            self.set(borderWidth: 0.0)
+            self.set(borderColor: UIColor.clear)
             self.backgroundColor = UIColor.clear
         }
     }
@@ -213,7 +213,7 @@ open class PBBaseSelectableView: UIView {
     /// method to enable alert state.
     ///
     public func setAlertState() {
-        self.layer.borderColor = UIColor.Colors.PBInvalidRed.cgColor
+        self.set(borderColor: UIColor.Colors.PBInvalidRed)
         self.layer.backgroundColor = UIColor.clear.cgColor
     }
 
@@ -222,8 +222,8 @@ open class PBBaseSelectableView: UIView {
     }
 
     private func setupDefaults() {
-        self.layer.cornerRadius = 8.0
-        self.layer.borderWidth = 1.0
+        self.set(cornerRadius: 12.0)
+        self.set(borderWidth: 1.0)
     }
 }
 

Sources/PashaKit/PBTemplateView/PBTemplateView.swift

@@ -84,9 +84,9 @@ public class PBTemplateView: UIView {
         didSet {
             switch self.viewType {
             case .payment:
-                self.iconView.layer.cornerRadius = 24.0
+                self.iconView.set(cornerRadius: 24.0)
             case .template:
-                self.iconView.layer.cornerRadius = 8.0
+                self.iconView.set(cornerRadius: 8.0)
             }
         }
     }
@@ -160,7 +160,7 @@ public class PBTemplateView: UIView {
         view.translatesAutoresizingMaskIntoConstraints = false
 
         view.backgroundColor = UIColor(red: 0.604, green: 0.608, blue: 0.612, alpha: 0.08)
-        view.layer.cornerRadius = 24.0
+        view.set(cornerRadius: 24.0)
 
         view.widthAnchor.constraint(equalToConstant: 48.0).isActive = true
         view.heightAnchor.constraint(equalToConstant: 48.0).isActive = true
@@ -237,17 +237,17 @@ public class PBTemplateView: UIView {
 
     private func setupViews(for type: ViewType) {
         self.backgroundColor = .clear
-        self.layer.cornerRadius = 16.0
+        self.set(cornerRadius: 16.0)
         self.layer.masksToBounds = true
         self.contentStackView.addArrangedSubview(self.titleLabel)
         self.contentStackView.addArrangedSubview(self.subtitleLabel)
         self.setupConstraints(for: type)
 
         switch type {
         case .payment:
-            self.iconWrapperView.layer.cornerRadius = 24.0
+            self.iconWrapperView.set(cornerRadius: 24.0)
         case .template:
-            self.iconWrapperView.layer.cornerRadius = 8.0
+            self.iconWrapperView.set(cornerRadius: 8.0)
         }
     }