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

refactored more of the surface

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
VDSSample/Protocols/PickerBase.swift
View File

@ -25,13 +25,13 @@ public struct PickerType : RawRepresentable, Equatable, Hashable {
public static var fontCategory = PickerType(rawValue: "fontCategory")
}
protocol PickerViewable: UIPickerViewDataSource, UIPickerViewDelegate, Hashable {
public protocol PickerViewable: UIPickerViewDataSource, UIPickerViewDelegate, Hashable {
associatedtype EnumType: RawRepresentable
var items: [EnumType] { 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?
fileprivate var selectedIndex = 0
private var subscribers = Set<AnyCancellable>()
@ -41,17 +41,17 @@ class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewabl
instance.setTitle("Select", for: .normal)
}
var text: String = "" {
public var text: String = "" {
didSet {
label.text = text
}
}
var items: [EnumType] {
public var items: [EnumType] {
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.items = items
super.init(frame: .zero)
@ -73,24 +73,24 @@ class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, PickerViewabl
}.store(in: &subscribers)
}
required init(coder: NSCoder) {
public required init(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func numberOfComponents(in pickerView: UIPickerView) -> Int {
public func numberOfComponents(in pickerView: UIPickerView) -> Int {
1
}
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
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 "" }
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 }
selectedIndex = row
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){
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){
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){
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){
super.init(title: title, picker: picker, items: TypographicalStyle.FontCategory.allCases)
}

4
VDSSample/ViewControllers/BadgeViewController.swift
View File

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

4
VDSSample/ViewControllers/ButtonViewController.swift
View File

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

4
VDSSample/ViewControllers/CheckBoxGroupViewController.swift
View File

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

4
VDSSample/ViewControllers/CheckboxViewController.swift
View File

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

4
VDSSample/ViewControllers/LabelViewController.swift
View File

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

4
VDSSample/ViewControllers/ModelScrollViewController.swift
View File

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

4
VDSSample/ViewControllers/RadioBoxGroupViewController.swift
View File

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

4
VDSSample/ViewControllers/RadioButtonViewController.swift
View File

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

4
VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
View File

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

4
VDSSample/ViewControllers/ToggleViewController.swift
View File

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