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

refactored name

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-01-17 15:19:13 -06:00
parent a591cd793e
commit 184a117905
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VDSSample.xcodeproj/project.pbxproj
View File

@ -45,7 +45,7 @@
EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */; }; EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */; };
EA5E3050294D11540082B959 /* TileContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304F294D11540082B959 /* TileContainerViewController.swift */; }; EA5E3050294D11540082B959 /* TileContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304F294D11540082B959 /* TileContainerViewController.swift */; };
EA5E30552950EA6E0082B959 /* TitleLockupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */; }; EA5E30552950EA6E0082B959 /* TitleLockupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */; };
EA5E305C295111050082B959 /* TiletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305B295111050082B959 /* TiletViewController.swift */; }; EA5E305C295111050082B959 /* TileletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305B295111050082B959 /* TileletViewController.swift */; };
EA84F76228BE4AE500D67ABC /* RadioSwatchGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */; }; EA84F76228BE4AE500D67ABC /* RadioSwatchGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */; };
EA89201928B56DF5006B9984 /* RadioBoxGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */; }; EA89201928B56DF5006B9984 /* RadioBoxGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */; };
EA89204628B66CE2006B9984 /* ScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89203F28B66CE2006B9984 /* ScrollViewController.swift */; }; EA89204628B66CE2006B9984 /* ScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89203F28B66CE2006B9984 /* ScrollViewController.swift */; };
@ -128,7 +128,7 @@
EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeViewController.swift; sourceTree = "<group>"; }; EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeViewController.swift; sourceTree = "<group>"; };
EA5E304F294D11540082B959 /* TileContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainerViewController.swift; sourceTree = "<group>"; }; EA5E304F294D11540082B959 /* TileContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainerViewController.swift; sourceTree = "<group>"; };
EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupViewController.swift; sourceTree = "<group>"; }; EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupViewController.swift; sourceTree = "<group>"; };
EA5E305B295111050082B959 /* TiletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletViewController.swift; sourceTree = "<group>"; }; EA5E305B295111050082B959 /* TileletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletViewController.swift; sourceTree = "<group>"; };
EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatchGroupViewController.swift; sourceTree = "<group>"; }; EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatchGroupViewController.swift; sourceTree = "<group>"; };
EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroupViewController.swift; sourceTree = "<group>"; }; EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroupViewController.swift; sourceTree = "<group>"; };
EA89203F28B66CE2006B9984 /* ScrollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewController.swift; sourceTree = "<group>"; }; EA89203F28B66CE2006B9984 /* ScrollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewController.swift; sourceTree = "<group>"; };
@ -294,7 +294,7 @@
EA985C24296E06EA00F2FF2E /* TextAreaViewController.swift */, EA985C24296E06EA00F2FF2E /* TextAreaViewController.swift */,
EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */, EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
EA5E304F294D11540082B959 /* TileContainerViewController.swift */, EA5E304F294D11540082B959 /* TileContainerViewController.swift */,
EA5E305B295111050082B959 /* TiletViewController.swift */, EA5E305B295111050082B959 /* TileletViewController.swift */,
EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */, EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */,
EA3C3BB328996775000CA526 /* ToggleViewController.swift */, EA3C3BB328996775000CA526 /* ToggleViewController.swift */,
); );
@ -459,7 +459,7 @@
EA89204A28B66CE2006B9984 /* KeyboardFrameChange.swift in Sources */, EA89204A28B66CE2006B9984 /* KeyboardFrameChange.swift in Sources */,
EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */, EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */,
EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */, EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */,
EA5E305C295111050082B959 /* TiletViewController.swift in Sources */, EA5E305C295111050082B959 /* TileletViewController.swift in Sources */,
EAB5FEF32928153D00998C17 /* Helper.swift in Sources */, EAB5FEF32928153D00998C17 /* Helper.swift in Sources */,
EA89204728B66CE2006B9984 /* KeyboardFrameChangeListener.swift in Sources */, EA89204728B66CE2006B9984 /* KeyboardFrameChangeListener.swift in Sources */,
EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */, EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */,

4
VDSSample/ViewControllers/MenuViewController.swift
View File

@ -85,8 +85,8 @@ class MenuViewController: UITableViewController {
MenuComponent(title: "TextArea", completed: false, viewController: TextAreaViewController.self), MenuComponent(title: "TextArea", completed: false, viewController: TextAreaViewController.self),
MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self), MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self), MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
MenuComponent(title: "TileContainer", completed: false, viewController: TileContainerViewController.self), MenuComponent(title: "TileContainer", completed: true, viewController: TileContainerViewController.self),
MenuComponent(title: "Tilet", completed: false, viewController: TiletViewController.self), MenuComponent(title: "Tilelet", completed: false, viewController: TileletViewController.self),
MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self), MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
MenuComponent(title: "Toggle", completed: true, viewController: ToggleViewController.self) MenuComponent(title: "Toggle", completed: true, viewController: ToggleViewController.self)
] ]

62
VDSSample/ViewControllers/TiletViewController.swift → VDSSample/ViewControllers/TileletViewController.swift
View File

@ -11,18 +11,18 @@ import VDS
import VDSColorTokens import VDSColorTokens
import Combine import Combine
class TiletViewController: BaseViewController { class TileletViewController: BaseViewController {
lazy var titleTextStylePickerSelectorView = { lazy var titleTextStylePickerSelectorView = {
PickerSelectorView(title: "", PickerSelectorView(title: "",
picker: self.picker, picker: self.picker,
items: Tilet.TitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) items: Tilelet.TitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue })
}() }()
lazy var otherTextStylePickerSelectorView = { lazy var otherTextStylePickerSelectorView = {
PickerSelectorView(title: "", PickerSelectorView(title: "",
picker: self.picker, picker: self.picker,
items: Tilet.SubTitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) items: Tilelet.SubTitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue })
}() }()
lazy var subtitleColorPickerSelectorView = { lazy var subtitleColorPickerSelectorView = {
@ -44,11 +44,11 @@ class TiletViewController: BaseViewController {
var showDescriptionIconSwitch = Toggle() var showDescriptionIconSwitch = Toggle()
var showDirectionalIconSwitch = Toggle() var showDirectionalIconSwitch = Toggle()
var badgeTextField = TextField() var badgeTextField = TextField()
var tilet = Tilet() var tilelet = Tilelet()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
addContentTopView(view: .makeWrapper(for: tilet)) addContentTopView(view: .makeWrapper(for: tilelet))
setupForm() setupForm()
setupPicker() setupPicker()
@ -79,7 +79,7 @@ class TiletViewController: BaseViewController {
.publisher(for: .valueChanged) .publisher(for: .valueChanged)
.sink { [weak self] sender in .sink { [weak self] sender in
if sender.isOn { if sender.isOn {
self?.clickableCancel = self?.tilet self?.clickableCancel = self?.tilelet
.publisher(for: .touchUpInside) .publisher(for: .touchUpInside)
.sink(receiveValue: { _ in .sink(receiveValue: { _ in
print("you click on me!") print("you click on me!")
@ -94,7 +94,7 @@ class TiletViewController: BaseViewController {
.textPublisher .textPublisher
.sink { [weak self] text in .sink { [weak self] text in
if let n = NumberFormatter().number(from: text) { if let n = NumberFormatter().number(from: text) {
self?.tilet.width = CGFloat(truncating: n) self?.tilelet.width = CGFloat(truncating: n)
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -102,9 +102,9 @@ class TiletViewController: BaseViewController {
.textPublisher .textPublisher
.sink { [weak self] text in .sink { [weak self] text in
if let n = NumberFormatter().number(from: text) { if let n = NumberFormatter().number(from: text) {
self?.tilet.height = CGFloat(truncating: n) self?.tilelet.height = CGFloat(truncating: n)
} else { } else {
self?.tilet.height = nil self?.tilelet.height = nil
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -113,10 +113,10 @@ class TiletViewController: BaseViewController {
.sink { [weak self] text in .sink { [weak self] text in
guard let self else { return } guard let self else { return }
if let n = NumberFormatter().number(from: text), n.floatValue > 50.0 { if let n = NumberFormatter().number(from: text), n.floatValue > 50.0 {
self.tilet.textWidth = CGFloat(truncating: n) self.tilelet.textWidth = CGFloat(truncating: n)
self.textPercentageTextField.text = "" self.textPercentageTextField.text = ""
} else { } else {
self.tilet.textWidth = nil self.tilelet.textWidth = nil
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -124,10 +124,10 @@ class TiletViewController: BaseViewController {
.textPublisher .textPublisher
.sink { [weak self] text in .sink { [weak self] text in
if let n = NumberFormatter().number(from: text), n.intValue > 15 && n.intValue <= 100 { if let n = NumberFormatter().number(from: text), n.intValue > 15 && n.intValue <= 100 {
self?.tilet.textPercentage = CGFloat(truncating: n) self?.tilelet.textPercentage = CGFloat(truncating: n)
self?.textWidthTextField.text = "" self?.textWidthTextField.text = ""
} else { } else {
self?.tilet.textPercentage = nil self?.tilelet.textPercentage = nil
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -154,9 +154,9 @@ class TiletViewController: BaseViewController {
.sink { [weak self] sender in .sink { [weak self] sender in
if sender.isOn { if sender.isOn {
self?.showDirectionalIconSwitch.isOn = false self?.showDirectionalIconSwitch.isOn = false
self?.tilet.descriptiveIconModel = .init(size: .medium, surface: .dark) self?.tilelet.descriptiveIconModel = .init(size: .medium, surface: .dark)
} else { } else {
self?.tilet.descriptiveIconModel = nil self?.tilelet.descriptiveIconModel = nil
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -165,61 +165,61 @@ class TiletViewController: BaseViewController {
.sink { [weak self] sender in .sink { [weak self] sender in
if sender.isOn { if sender.isOn {
self?.showDescriptionIconSwitch.isOn = false self?.showDescriptionIconSwitch.isOn = false
self?.tilet.directionalIconModel = .init(size: .medium, surface: .dark) self?.tilelet.directionalIconModel = .init(size: .medium, surface: .dark)
} else { } else {
self?.tilet.directionalIconModel = nil self?.tilelet.directionalIconModel = nil
} }
}.store(in: &subscribers) }.store(in: &subscribers)
} }
func setupModel() { func setupModel() {
let titleModel = Tilet.TitleModel(text: "Save $XX on your monthly bill.") let titleModel = Tilelet.TitleModel(text: "Save $XX on your monthly bill.")
let subTitleModel = Tilet.SubTitleModel(text: "Enroll in Auto Pay & paper-free billing to save on your monthly bill.") let subTitleModel = Tilelet.SubTitleModel(text: "Enroll in Auto Pay & paper-free billing to save on your monthly bill.")
tilet.surface = .light tilelet.surface = .light
tilet.titleModel = titleModel tilelet.titleModel = titleModel
tilet.subTitleModel = subTitleModel tilelet.subTitleModel = subTitleModel
//setup UI //setup UI
surfacePickerSelectorView.text = tilet.surface.rawValue surfacePickerSelectorView.text = tilelet.surface.rawValue
otherTextStylePickerSelectorView.text = subTitleModel.textStyle.rawValue otherTextStylePickerSelectorView.text = subTitleModel.textStyle.rawValue
titleTextStylePickerSelectorView.text = titleModel.textStyle.rawValue titleTextStylePickerSelectorView.text = titleModel.textStyle.rawValue
subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue
titleTextField.text = titleModel.text titleTextField.text = titleModel.text
subTitleTextField.text = subTitleModel.text subTitleTextField.text = subTitleModel.text
widthTextField.text = tilet.width != nil ? "\(tilet.width!)" : "" widthTextField.text = tilelet.width != nil ? "\(tilelet.width!)" : ""
} }
//sub models //sub models
func setBadgeModel() { func setBadgeModel() {
if let text = badgeTextField.text, !text.isEmpty { if let text = badgeTextField.text, !text.isEmpty {
tilet.badgeModel = Tilet.BadgeModel(text: text) tilelet.badgeModel = Tilelet.BadgeModel(text: text)
} else { } else {
tilet.badgeModel = nil tilelet.badgeModel = nil
} }
} }
func setTitleModel() { func setTitleModel() {
if let text = titleTextField.text, !text.isEmpty { if let text = titleTextField.text, !text.isEmpty {
tilet.titleModel = Tilet.TitleModel(text: text, textStyle: titleTextStylePickerSelectorView.selectedItem) tilelet.titleModel = Tilelet.TitleModel(text: text, textStyle: titleTextStylePickerSelectorView.selectedItem)
} else { } else {
tilet.titleModel = nil tilelet.titleModel = nil
} }
} }
func setSubTitleModel() { func setSubTitleModel() {
if let text = subTitleTextField.text, !text.isEmpty { if let text = subTitleTextField.text, !text.isEmpty {
tilet.subTitleModel = Tilet.SubTitleModel(text: text, textStyle: otherTextStylePickerSelectorView.selectedItem) tilelet.subTitleModel = Tilelet.SubTitleModel(text: text, textStyle: otherTextStylePickerSelectorView.selectedItem)
} else { } else {
tilet.subTitleModel = nil tilelet.subTitleModel = nil
} }
} }
//Picker //Picker
func setupPicker(){ func setupPicker(){
surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in
self?.tilet.surface = item self?.tilelet.surface = item
self?.contentTopView.backgroundColor = item.color self?.contentTopView.backgroundColor = item.color
} }