refactored more of the surface

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-09-30 09:49:31 -05:00
parent 5337f30843
commit 5e1dbd1598
11 changed files with 19 additions and 51 deletions

View File

@ -25,13 +25,13 @@ public struct PickerType : RawRepresentable, Equatable, Hashable {
public static var fontCategory = PickerType(rawValue: "fontCategory") public static var fontCategory = PickerType(rawValue: "fontCategory")
} }
protocol PickerViewable: UIPickerViewDataSource, UIPickerViewDelegate, Hashable { public protocol PickerViewable: UIPickerViewDataSource, UIPickerViewDelegate, Hashable {
associatedtype EnumType: RawRepresentable associatedtype EnumType: RawRepresentable
var items: [EnumType] { get set } var items: [EnumType] { get set }
var onPickerDidSelect: ((EnumType) -> Void)? { get set } var onPickerDidSelect: ((EnumType) -> Void)? { get set }
} }
class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewable { public class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewable {
private weak var picker: UIPickerView? private weak var picker: UIPickerView?
fileprivate var selectedIndex = 0 fileprivate var selectedIndex = 0
private var subscribers = Set<AnyCancellable>() private var subscribers = Set<AnyCancellable>()
@ -41,17 +41,17 @@ class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewabl
instance.setTitle("Select", for: .normal) instance.setTitle("Select", for: .normal)
} }
var text: String = "" { public var text: String = "" {
didSet { didSet {
label.text = text label.text = text
} }
} }
var items: [EnumType] { public var items: [EnumType] {
didSet { selectedIndex = 0 } didSet { selectedIndex = 0 }
} }
var onPickerDidSelect: ((EnumType) -> Void)? public var onPickerDidSelect: ((EnumType) -> Void)?
init(title: String, picker: UIPickerView? = nil, items: [EnumType]) { public init(title: String, picker: UIPickerView? = nil, items: [EnumType]) {
self.picker = picker self.picker = picker
self.items = items self.items = items
super.init(frame: .zero) super.init(frame: .zero)
@ -73,24 +73,24 @@ class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewabl
}.store(in: &subscribers) }.store(in: &subscribers)
} }
required init(coder: NSCoder) { public required init(coder: NSCoder) {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
func numberOfComponents(in pickerView: UIPickerView) -> Int { public func numberOfComponents(in pickerView: UIPickerView) -> Int {
1 1
} }
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int { public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
items.count + 1 items.count + 1
} }
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int ) -> String? { public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int ) -> String? {
guard row > 0, let item = items[row-1].rawValue as? String else { return "" } guard row > 0, let item = items[row-1].rawValue as? String else { return "" }
return item return item
} }
func pickerView( _ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { public func pickerView( _ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
guard row - 1 >= 0 else { return } guard row - 1 >= 0 else { return }
selectedIndex = row selectedIndex = row
onPickerDidSelect?(items[row-1]) onPickerDidSelect?(items[row-1])
@ -98,7 +98,7 @@ class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewabl
} }
} }
class SurfacePickerSelectorView: PickerSelectorView<Surface>{ public class SurfacePickerSelectorView: PickerSelectorView<Surface>{
init(picker: UIPickerView? = nil){ init(picker: UIPickerView? = nil){
super.init(title: "light", picker: picker, items: [.light, .dark]) super.init(title: "light", picker: picker, items: [.light, .dark])
} }
@ -108,7 +108,7 @@ class SurfacePickerSelectorView: PickerSelectorView<Surface>{
} }
} }
class TextPositionPickerSelectorView: PickerSelectorView<TextPosition>{ public class TextPositionPickerSelectorView: PickerSelectorView<TextPosition>{
init(picker: UIPickerView? = nil){ init(picker: UIPickerView? = nil){
super.init(title: "left", picker: picker, items: [.left, .right]) super.init(title: "left", picker: picker, items: [.left, .right])
} }
@ -118,7 +118,7 @@ class TextPositionPickerSelectorView: PickerSelectorView<TextPosition>{
} }
} }
class TextSizePickerSelectorView: PickerSelectorView<TypographicalStyle.FontSize>{ public class TextSizePickerSelectorView: PickerSelectorView<TypographicalStyle.FontSize>{
init(title: String, picker: UIPickerView? = nil){ init(title: String, picker: UIPickerView? = nil){
super.init(title: title, picker: picker, items: [.small, .large]) super.init(title: title, picker: picker, items: [.small, .large])
} }
@ -128,7 +128,7 @@ class TextSizePickerSelectorView: PickerSelectorView<TypographicalStyle.FontSize
} }
} }
class FontCategoryPickerSelectorView: PickerSelectorView<TypographicalStyle.FontCategory>{ public class FontCategoryPickerSelectorView: PickerSelectorView<TypographicalStyle.FontCategory>{
init(title: String, picker: UIPickerView? = nil){ init(title: String, picker: UIPickerView? = nil){
super.init(title: title, picker: picker, items: TypographicalStyle.FontCategory.allCases) super.init(title: title, picker: picker, items: TypographicalStyle.FontCategory.allCases)
} }

View File

@ -49,10 +49,6 @@ class BadgeViewController: ModelScrollViewController<DefaultBadgeModel> {
items: NumberOfLines.allCases) items: NumberOfLines.allCases)
}() }()
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var textField = TextField() var textField = TextField()
var maxWidthTextField = TextField() var maxWidthTextField = TextField()
var badge = Badge() var badge = Badge()

View File

@ -12,10 +12,6 @@ import VDSColorTokens
class ButtonViewController: ModelScrollViewController<DefaultButtonModel> { class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
lazy var usePickerSelectorView = { lazy var usePickerSelectorView = {
PickerSelectorView<Use>(title: "", PickerSelectorView<Use>(title: "",
picker: self.picker, picker: self.picker,

View File

@ -13,10 +13,6 @@ import Combine
class CheckboxGroupViewController: ModelScrollViewController<DefaultCheckboxGroupModel> { class CheckboxGroupViewController: ModelScrollViewController<DefaultCheckboxGroupModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var disabledSwitch = UISwitch() var disabledSwitch = UISwitch()
var labelTextField = TextField() var labelTextField = TextField()
var childTextField = TextField() var childTextField = TextField()

View File

@ -13,10 +13,6 @@ import Combine
class CheckboxViewController: ModelScrollViewController<DefaultCheckboxModel> { class CheckboxViewController: ModelScrollViewController<DefaultCheckboxModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var disabledSwitch = UISwitch() var disabledSwitch = UISwitch()
var labelTextField = TextField() var labelTextField = TextField()
var childTextField = TextField() var childTextField = TextField()

View File

@ -12,10 +12,6 @@ import VDSColorTokens
class LabelViewController: ModelScrollViewController<DefaultLabelModel> { class LabelViewController: ModelScrollViewController<DefaultLabelModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
lazy var textSizePickerSelectorView = { lazy var textSizePickerSelectorView = {
TextSizePickerSelectorView(title: "", TextSizePickerSelectorView(title: "",
picker: self.picker) picker: self.picker)

View File

@ -74,6 +74,10 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
} }
} }
public lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
public var picker: UIPickerView = { public var picker: UIPickerView = {
return UIPickerView().with { return UIPickerView().with {
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false

View File

@ -13,10 +13,6 @@ import Combine
class RadioBoxGroupViewController: ModelScrollViewController<DefaultRadioBoxGroupModel> { class RadioBoxGroupViewController: ModelScrollViewController<DefaultRadioBoxGroupModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var disabledSwitch = UISwitch() var disabledSwitch = UISwitch()
var strikeThroughSwitch = UISwitch() var strikeThroughSwitch = UISwitch()
var textField = TextField() var textField = TextField()

View File

@ -13,10 +13,6 @@ import Combine
class RadioButtonViewController: ModelScrollViewController<DefaultRadioButtonGroupModel> { class RadioButtonViewController: ModelScrollViewController<DefaultRadioButtonGroupModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var disabledSwitch = UISwitch() var disabledSwitch = UISwitch()
var labelTextField = TextField() var labelTextField = TextField()
var childTextField = TextField() var childTextField = TextField()

View File

@ -13,10 +13,6 @@ import Combine
class RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwatchGroupModel> { class RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwatchGroupModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
var disabledSwitch = UISwitch() var disabledSwitch = UISwitch()
var strikeThroughSwitch = UISwitch() var strikeThroughSwitch = UISwitch()
var radioSwatchGroup = RadioSwatchGroup() var radioSwatchGroup = RadioSwatchGroup()

View File

@ -12,10 +12,6 @@ import VDSColorTokens
class ToggleViewController: ModelScrollViewController<DefaultToggleModel> { class ToggleViewController: ModelScrollViewController<DefaultToggleModel> {
lazy var surfacePickerSelectorView = {
SurfacePickerSelectorView(picker: self.picker)
}()
lazy var textSizePickerSelectorView = { lazy var textSizePickerSelectorView = {
TextSizePickerSelectorView(title: "Small", TextSizePickerSelectorView(title: "Small",
picker: self.picker) picker: self.picker)