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

slight refactor

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-10-09 13:11:06 -05:00
parent 2e55d2d231
commit 48c9c087f8
2 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
VDSSample/Classes/ColorPickerView.swift
View File

@ -16,12 +16,9 @@ public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
}
}
private var colorPicker: UIColorPickerViewController = {
let picker = UIColorPickerViewController()
return picker
}()
var selectedColorView: UIView = {
public var onColorSelected: ((UIColor) -> Void)?
private var selectedColorView: UIView = {
let view = UIView()
view.translatesAutoresizingMaskIntoConstraints = false
view.widthAnchor.constraint(equalToConstant: 20).isActive = true
@ -29,27 +26,18 @@ public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
return view
}()
var button = Button().with {
private var button = Button().with {
$0.size = .small
$0.use = .secondary
$0.text = "Select"
}
/// Callback once the user picks a color from the picker.
public var onColorSelected: ((UIColor) -> Void)?
public init(color: UIColor? = nil) {
super.init(frame: .zero)
if let color {
selectedColor = color
}
colorPicker.delegate = self
self.selectedColor = color
setup()
button.onClick = { _ in
UIApplication.topViewController()?.present(self.colorPicker, animated: true)
}
}
required init(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@ -58,7 +46,7 @@ public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
distribution = .fillEqually
alignment = .fill
spacing = 10
let indicatorWrapper = View()
indicatorWrapper.addSubview(selectedColorView)
indicatorWrapper.height(32)
@ -66,9 +54,8 @@ public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
indicatorWrapper.pinLeading()
indicatorWrapper.pinBottom()
indicatorWrapper.pinTrailingGreaterThanOrEqualTo(anchor: indicatorWrapper.trailingAnchor)
addArrangedSubview(indicatorWrapper)
let buttonWrapper = View()
buttonWrapper.addSubview(button)
buttonWrapper.height(32)
@ -77,16 +64,23 @@ public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
button.pinBottom()
button.pinLeadingGreaterThanOrEqualTo(anchor: buttonWrapper.leadingAnchor)
addArrangedSubview(buttonWrapper)
button.onClick = { [weak self] _ in
guard let self = self else { return }
let colorPicker = UIColorPickerViewController()
colorPicker.title = "Select a Color"
colorPicker.delegate = self
if let selectedColor = self.selectedColor {
colorPicker.selectedColor = selectedColor
}
UIApplication.topViewController()?.present(colorPicker, animated: true)
}
}
// MARK: - UIColorPickerViewControllerDelegate
public func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
selectedColor = viewController.selectedColor
onColorSelected?(viewController.selectedColor)
}
public func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
UIApplication.topViewController()?.dismiss(animated: true)
}
}

12
VDSSample/Classes/TokenColorPickerFormSection.swift
View File

@ -85,19 +85,19 @@ public class TokenColorPickerSection<EnumType: RawRepresentable & CaseIterable>:
let isToken = item.rawValue == "token"
let isCustom = item.rawValue == "custom"
if isToken {
self.onTokenSelected?(self.tokenColorView.selectedItem)
onTokenSelected?(self.tokenColorView.selectedItem)
} else if let selectedItem = self.customColorView.selectedColor, isCustom {
self.onColorSelected?(selectedItem)
onColorSelected?(selectedItem)
} else {
self.onSelected?(item)
onSelected?(item)
}
self.tokenColorRow?.isHidden = !isToken
self.customColorRow?.isHidden = !isCustom
tokenColorRow?.isHidden = !isToken
customColorRow?.isHidden = !isCustom
}
tokenColorView.onPickerDidSelect = { [weak self] item in
guard let self else { return }
self.onTokenSelected?(item)
onTokenSelected?(item)
}
}