mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored into base class

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-30 18:16:00 -05:00
parent 980642e72c
commit a0bc95d849
1 changed files with 28 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
VDS/Components/RadioSwatch/RadioSwatchGroup.swift
View File

@ -8,8 +8,9 @@
import Foundation import Foundation
import UIKit import UIKit
public class RadioSwatchGroup: Control<DefaultRadioSwatchGroupModel>, Changable { public class RadioSwatchGroup: RadioSwatchGroupBase<DefaultRadioSwatchGroupModel, RadioSwatch> {}
public typealias ModelHandlerType = RadioSwatch
public class RadioSwatchGroupBase<GroupModelType: RadioSwatchGroupModel, ModelHandlerType: ModelHandlerable & UIView>: Control<GroupModelType>, Changable, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDelegate where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Public Properties // MARK: - Public Properties
@ -26,23 +27,12 @@ public class RadioSwatchGroup: Control<DefaultRadioSwatchGroupModel>, Changable
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Private Properties // MARK: - Private Properties
//-------------------------------------------------- //--------------------------------------------------
private var contentView: UIView = {
return UIView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
$0.backgroundColor = .clear
}
}()
private var label = Label() private var label = Label()
private let cellSize: CGFloat = 48.0 private let cellSize: CGFloat = 48.0
private let lineSpacing: CGFloat = 12.0 private let lineSpacing: CGFloat = 12.0
private let itemSpacing: CGFloat = 16.0 private let itemSpacing: CGFloat = 16.0
public var collectionViewHeight: NSLayoutConstraint?
public var collectionViewWidth: NSLayoutConstraint?
private lazy var collectionView: UICollectionView = { private lazy var collectionView: UICollectionView = {
let layout = UICollectionViewFlowLayout().with { let layout = UICollectionViewFlowLayout().with {
$0.minimumLineSpacing = lineSpacing $0.minimumLineSpacing = lineSpacing
@ -76,29 +66,20 @@ public class RadioSwatchGroup: Control<DefaultRadioSwatchGroupModel>, Changable
super.setup() super.setup()
isAccessibilityElement = true isAccessibilityElement = true
accessibilityTraits = .button accessibilityTraits = .button
addSubview(contentView) addSubview(label)
contentView.addSubview(label) addSubview(collectionView)
contentView.addSubview(collectionView)
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
contentView.topAnchor.constraint(equalTo: topAnchor), label.topAnchor.constraint(equalTo: topAnchor),
contentView.leadingAnchor.constraint(equalTo: leadingAnchor), label.leadingAnchor.constraint(equalTo: leadingAnchor),
contentView.trailingAnchor.constraint(equalTo: trailingAnchor), label.trailingAnchor.constraint(equalTo: trailingAnchor),
contentView.bottomAnchor.constraint(equalTo: bottomAnchor),
label.topAnchor.constraint(equalTo: contentView.topAnchor),
label.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
label.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
collectionView.topAnchor.constraint(equalTo: label.bottomAnchor, constant: 24), collectionView.topAnchor.constraint(equalTo: label.bottomAnchor, constant: 24),
collectionView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), collectionView.leadingAnchor.constraint(equalTo: leadingAnchor),
collectionView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), collectionView.trailingAnchor.constraint(equalTo: trailingAnchor),
collectionView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor) collectionView.bottomAnchor.constraint(equalTo: bottomAnchor),
collectionView.heightAnchor.constraint(greaterThanOrEqualToConstant: cellSize),
collectionView.widthAnchor.constraint(greaterThanOrEqualToConstant: cellSize * 10)
]) ])
collectionViewHeight = collectionView.heightAnchor.constraint(greaterThanOrEqualToConstant: cellSize)
collectionViewHeight?.isActive = true
collectionViewWidth = collectionView.widthAnchor.constraint(greaterThanOrEqualToConstant: cellSize * 10)
collectionViewWidth?.isActive = true
} }
open override func shouldUpdateView(viewModel: ModelType) -> Bool { open override func shouldUpdateView(viewModel: ModelType) -> Bool {
@ -117,38 +98,6 @@ public class RadioSwatchGroup: Control<DefaultRadioSwatchGroupModel>, Changable
setNeedsLayout() setNeedsLayout()
} }
//--------------------------------------------------
// MARK: - Lifecycle
//--------------------------------------------------
// open override func layoutSubviews() {
// super.layoutSubviews()
// // Accounts for any collection size changes
// //setHeight()
//// DispatchQueue.main.async { [weak self] in
//// self?.collectionView.collectionViewLayout.invalidateLayout()
//// }
// }
open func setHeight() {
let bounds = collectionView.bounds
if bounds.width <= 0 {
return
}
if model.selectors.count > 0 {
// Calculate the height
let swatchesInRow = floor(CGFloat(bounds.width/(cellSize + itemSpacing)))
let numberOfRows = ceil(CGFloat(model.selectors.count)/swatchesInRow)
let height = (numberOfRows * cellSize) + (itemSpacing * (numberOfRows-1))
if let oldHeight = collectionViewHeight?.constant,
height != oldHeight {
}
collectionViewHeight?.constant = CGFloat(height)
} else {
collectionViewHeight?.constant = 0
}
}
//Refactor into new CollectionView Selector protocol //Refactor into new CollectionView Selector protocol
public func updateSelectors(){ public func updateSelectors(){
let selectors = model.selectors.compactMap { existing in let selectors = model.selectors.compactMap { existing in
@ -167,15 +116,17 @@ public class RadioSwatchGroup: Control<DefaultRadioSwatchGroupModel>, Changable
model.selectors[index] = viewModel model.selectors[index] = viewModel
} }
} }
}
extension RadioSwatchGroup: UICollectionViewDelegateFlowLayout { //--------------------------------------------------
// MARK: - UICollectionViewDelegateFlowLayout
//--------------------------------------------------
open func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { open func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
return CGSize(width: cellSize, height: cellSize) return CGSize(width: cellSize, height: cellSize)
} }
}
extension RadioSwatchGroup: UICollectionViewDelegate { //--------------------------------------------------
// MARK: - UICollectionViewDelegate
//--------------------------------------------------
open func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool { open func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
return !model.selectors[indexPath.row].disabled return !model.selectors[indexPath.row].disabled
} }
@ -206,12 +157,14 @@ extension RadioSwatchGroup: UICollectionViewDelegate {
guard let cell = collectionView.cellForItem(at: indexPath) as? CollectionViewCell<ModelHandlerType> else { return } guard let cell = collectionView.cellForItem(at: indexPath) as? CollectionViewCell<ModelHandlerType> else { return }
cell.isSelected = false cell.isSelected = false
} }
}
extension RadioSwatchGroup: UICollectionViewDataSource { //--------------------------------------------------
// MARK: - UICollectionViewDataSource
//--------------------------------------------------
public func numberOfSections(in collectionView: UICollectionView) -> Int { public func numberOfSections(in collectionView: UICollectionView) -> Int {
return 1 return 1
} }
public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return model.selectors.count return model.selectors.count
} }