From 184a117905ff0b1a66f4e239b847441fa6439d10 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 17 Jan 2023 15:19:13 -0600 Subject: [PATCH] refactored name Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 8 +-- .../ViewControllers/MenuViewController.swift | 4 +- ...ller.swift => TileletViewController.swift} | 62 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) rename VDSSample/ViewControllers/{TiletViewController.swift => TileletViewController.swift} (76%) diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 6cb3cb0..a63c81b 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -45,7 +45,7 @@ EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */; }; EA5E3050294D11540082B959 /* TileContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304F294D11540082B959 /* TileContainerViewController.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 */; }; EA89201928B56DF5006B9984 /* RadioBoxGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.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 = ""; }; EA5E304F294D11540082B959 /* TileContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainerViewController.swift; sourceTree = ""; }; EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupViewController.swift; sourceTree = ""; }; - EA5E305B295111050082B959 /* TiletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletViewController.swift; sourceTree = ""; }; + EA5E305B295111050082B959 /* TileletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletViewController.swift; sourceTree = ""; }; EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatchGroupViewController.swift; sourceTree = ""; }; EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroupViewController.swift; sourceTree = ""; }; EA89203F28B66CE2006B9984 /* ScrollViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewController.swift; sourceTree = ""; }; @@ -294,7 +294,7 @@ EA985C24296E06EA00F2FF2E /* TextAreaViewController.swift */, EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */, EA5E304F294D11540082B959 /* TileContainerViewController.swift */, - EA5E305B295111050082B959 /* TiletViewController.swift */, + EA5E305B295111050082B959 /* TileletViewController.swift */, EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */, EA3C3BB328996775000CA526 /* ToggleViewController.swift */, ); @@ -459,7 +459,7 @@ EA89204A28B66CE2006B9984 /* KeyboardFrameChange.swift in Sources */, EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */, EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */, - EA5E305C295111050082B959 /* TiletViewController.swift in Sources */, + EA5E305C295111050082B959 /* TileletViewController.swift in Sources */, EAB5FEF32928153D00998C17 /* Helper.swift in Sources */, EA89204728B66CE2006B9984 /* KeyboardFrameChangeListener.swift in Sources */, EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */, diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index f1cdd3f..8fdf1e0 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -85,8 +85,8 @@ class MenuViewController: UITableViewController { MenuComponent(title: "TextArea", completed: false, viewController: TextAreaViewController.self), MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self), MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self), - MenuComponent(title: "TileContainer", completed: false, viewController: TileContainerViewController.self), - MenuComponent(title: "Tilet", completed: false, viewController: TiletViewController.self), + MenuComponent(title: "TileContainer", completed: true, viewController: TileContainerViewController.self), + MenuComponent(title: "Tilelet", completed: false, viewController: TileletViewController.self), MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self), MenuComponent(title: "Toggle", completed: true, viewController: ToggleViewController.self) ] diff --git a/VDSSample/ViewControllers/TiletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift similarity index 76% rename from VDSSample/ViewControllers/TiletViewController.swift rename to VDSSample/ViewControllers/TileletViewController.swift index ae409cd..8fe62cd 100644 --- a/VDSSample/ViewControllers/TiletViewController.swift +++ b/VDSSample/ViewControllers/TileletViewController.swift @@ -11,18 +11,18 @@ import VDS import VDSColorTokens import Combine -class TiletViewController: BaseViewController { +class TileletViewController: BaseViewController { lazy var titleTextStylePickerSelectorView = { PickerSelectorView(title: "", 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 = { PickerSelectorView(title: "", 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 = { @@ -44,11 +44,11 @@ class TiletViewController: BaseViewController { var showDescriptionIconSwitch = Toggle() var showDirectionalIconSwitch = Toggle() var badgeTextField = TextField() - var tilet = Tilet() + var tilelet = Tilelet() override func viewDidLoad() { super.viewDidLoad() - addContentTopView(view: .makeWrapper(for: tilet)) + addContentTopView(view: .makeWrapper(for: tilelet)) setupForm() setupPicker() @@ -79,7 +79,7 @@ class TiletViewController: BaseViewController { .publisher(for: .valueChanged) .sink { [weak self] sender in if sender.isOn { - self?.clickableCancel = self?.tilet + self?.clickableCancel = self?.tilelet .publisher(for: .touchUpInside) .sink(receiveValue: { _ in print("you click on me!") @@ -94,7 +94,7 @@ class TiletViewController: BaseViewController { .textPublisher .sink { [weak self] text in if let n = NumberFormatter().number(from: text) { - self?.tilet.width = CGFloat(truncating: n) + self?.tilelet.width = CGFloat(truncating: n) } }.store(in: &subscribers) @@ -102,9 +102,9 @@ class TiletViewController: BaseViewController { .textPublisher .sink { [weak self] text in if let n = NumberFormatter().number(from: text) { - self?.tilet.height = CGFloat(truncating: n) + self?.tilelet.height = CGFloat(truncating: n) } else { - self?.tilet.height = nil + self?.tilelet.height = nil } }.store(in: &subscribers) @@ -113,10 +113,10 @@ class TiletViewController: BaseViewController { .sink { [weak self] text in guard let self else { return } 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 = "" } else { - self.tilet.textWidth = nil + self.tilelet.textWidth = nil } }.store(in: &subscribers) @@ -124,10 +124,10 @@ class TiletViewController: BaseViewController { .textPublisher .sink { [weak self] text in 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 = "" } else { - self?.tilet.textPercentage = nil + self?.tilelet.textPercentage = nil } }.store(in: &subscribers) @@ -154,9 +154,9 @@ class TiletViewController: BaseViewController { .sink { [weak self] sender in if sender.isOn { self?.showDirectionalIconSwitch.isOn = false - self?.tilet.descriptiveIconModel = .init(size: .medium, surface: .dark) + self?.tilelet.descriptiveIconModel = .init(size: .medium, surface: .dark) } else { - self?.tilet.descriptiveIconModel = nil + self?.tilelet.descriptiveIconModel = nil } }.store(in: &subscribers) @@ -165,61 +165,61 @@ class TiletViewController: BaseViewController { .sink { [weak self] sender in if sender.isOn { self?.showDescriptionIconSwitch.isOn = false - self?.tilet.directionalIconModel = .init(size: .medium, surface: .dark) + self?.tilelet.directionalIconModel = .init(size: .medium, surface: .dark) } else { - self?.tilet.directionalIconModel = nil + self?.tilelet.directionalIconModel = nil } }.store(in: &subscribers) } func setupModel() { - let titleModel = Tilet.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 titleModel = Tilelet.TitleModel(text: "Save $XX 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 - tilet.titleModel = titleModel - tilet.subTitleModel = subTitleModel + tilelet.surface = .light + tilelet.titleModel = titleModel + tilelet.subTitleModel = subTitleModel //setup UI - surfacePickerSelectorView.text = tilet.surface.rawValue + surfacePickerSelectorView.text = tilelet.surface.rawValue otherTextStylePickerSelectorView.text = subTitleModel.textStyle.rawValue titleTextStylePickerSelectorView.text = titleModel.textStyle.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue titleTextField.text = titleModel.text subTitleTextField.text = subTitleModel.text - widthTextField.text = tilet.width != nil ? "\(tilet.width!)" : "" + widthTextField.text = tilelet.width != nil ? "\(tilelet.width!)" : "" } //sub models func setBadgeModel() { if let text = badgeTextField.text, !text.isEmpty { - tilet.badgeModel = Tilet.BadgeModel(text: text) + tilelet.badgeModel = Tilelet.BadgeModel(text: text) } else { - tilet.badgeModel = nil + tilelet.badgeModel = nil } } func setTitleModel() { 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 { - tilet.titleModel = nil + tilelet.titleModel = nil } } func setSubTitleModel() { 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 { - tilet.subTitleModel = nil + tilelet.subTitleModel = nil } } //Picker func setupPicker(){ surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in - self?.tilet.surface = item + self?.tilelet.surface = item self?.contentTopView.backgroundColor = item.color }