From 0c0fb2ef44f67de7a4e77bb6fefe0e0981d8e4cc Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 20 Oct 2022 15:42:04 -0500 Subject: [PATCH] removed stuff with model Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 8 ++++---- VDSSample/ViewControllers/BadgeViewController.swift | 2 +- ...crollViewController.swift => BaseViewController.swift} | 2 +- VDSSample/ViewControllers/ButtonViewController.swift | 2 +- .../ViewControllers/CheckBoxGroupViewController.swift | 4 ++-- VDSSample/ViewControllers/CheckboxViewController.swift | 2 +- VDSSample/ViewControllers/LabelViewController.swift | 2 +- .../ViewControllers/RadioBoxGroupViewController.swift | 4 ++-- VDSSample/ViewControllers/RadioButtonViewController.swift | 2 +- .../ViewControllers/RadioSwatchGroupViewController.swift | 2 +- VDSSample/ViewControllers/ToggleViewController.swift | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) rename VDSSample/ViewControllers/{ModelScrollViewController.swift => BaseViewController.swift} (99%) diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 69a4b47..145e934 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -53,7 +53,7 @@ EA89204C28B66CE2006B9984 /* ScrollWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89204528B66CE2006B9984 /* ScrollWrapperView.swift */; }; EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */; }; EA89205128B68307006B9984 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89205028B68307006B9984 /* TextField.swift */; }; - EAB1D2C928AAAA1D00DAE764 /* ModelScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */; }; + EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */; }; EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */; }; EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07B2899698800B287F5 /* Assets.xcassets */; }; EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */; }; @@ -116,7 +116,7 @@ EA89204528B66CE2006B9984 /* ScrollWrapperView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollWrapperView.swift; sourceTree = ""; }; EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxGroupViewController.swift; sourceTree = ""; }; EA89205028B68307006B9984 /* TextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = ""; }; - EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelScrollViewController.swift; sourceTree = ""; }; + EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = ""; }; EAF7F07B2899698800B287F5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxViewController.swift; sourceTree = ""; }; @@ -247,7 +247,7 @@ children = ( EA89203E28B66CE2006B9984 /* ScrollViewController */, EA3C3BB228996775000CA526 /* MenuViewController.swift */, - EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */, + EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */, EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */, 5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */, EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */, @@ -413,7 +413,7 @@ 5FC35BE928D5235A004EBEAC /* ButtonViewController.swift in Sources */, EA89204A28B66CE2006B9984 /* KeyboardFrameChange.swift in Sources */, EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */, - EAB1D2C928AAAA1D00DAE764 /* ModelScrollViewController.swift in Sources */, + EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */, EA89204728B66CE2006B9984 /* KeyboardFrameChangeListener.swift in Sources */, EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */, EA89204828B66CE2006B9984 /* ScrollViewKeyboardAvoiding.swift in Sources */, diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift index 73f8072..c2324e9 100644 --- a/VDSSample/ViewControllers/BadgeViewController.swift +++ b/VDSSample/ViewControllers/BadgeViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class BadgeViewController: ModelScrollViewController { +class BadgeViewController: BaseViewController { enum NumberOfLines: String, CaseIterable { case unlimited diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift similarity index 99% rename from VDSSample/ViewControllers/ModelScrollViewController.swift rename to VDSSample/ViewControllers/BaseViewController.swift index 5d68f48..a0cb5bc 100644 --- a/VDSSample/ViewControllers/ModelScrollViewController.swift +++ b/VDSSample/ViewControllers/BaseViewController.swift @@ -10,7 +10,7 @@ import UIKit import Combine import VDS -public class ModelScrollViewController: UIViewController, Initable { +public class BaseViewController: UIViewController, Initable { deinit { print("\(Self.self) deinit") } diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift index b3fcfaf..1c54991 100644 --- a/VDSSample/ViewControllers/ButtonViewController.swift +++ b/VDSSample/ViewControllers/ButtonViewController.swift @@ -10,7 +10,7 @@ import UIKit import VDS import VDSColorTokens -class ButtonViewController: ModelScrollViewController { +class ButtonViewController: BaseViewController { lazy var usePickerSelectorView = { PickerSelectorView(title: "", diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift index 307a858..1352ced 100644 --- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class CheckboxGroupViewController: ModelScrollViewController { +class CheckboxGroupViewController: BaseViewController { var disabledSwitch = UISwitch() var labelTextField = TextField() @@ -79,7 +79,7 @@ class CheckboxGroupViewController: ModelScrollViewController { checkboxGroup .publisher(for: .valueChanged) .sink { group in - let selected = group.selectedModelHandlers? + let selected = group.selectedHandlers? .compactMap{$0.labelText} .joined(separator: ", ") ?? "none" diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift index 08782b7..74ec8cc 100644 --- a/VDSSample/ViewControllers/CheckboxViewController.swift +++ b/VDSSample/ViewControllers/CheckboxViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class CheckboxViewController: ModelScrollViewController { +class CheckboxViewController: BaseViewController { var disabledSwitch = UISwitch() var labelTextField = TextField() diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift index 2996c1a..96589ed 100644 --- a/VDSSample/ViewControllers/LabelViewController.swift +++ b/VDSSample/ViewControllers/LabelViewController.swift @@ -10,7 +10,7 @@ import UIKit import VDS import VDSColorTokens -class LabelViewController: ModelScrollViewController { +class LabelViewController: BaseViewController { lazy var textSizePickerSelectorView = { TextSizePickerSelectorView(title: "", diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift index 16e7014..c82b720 100644 --- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class RadioBoxGroupViewController: ModelScrollViewController { +class RadioBoxGroupViewController: BaseViewController { var disabledSwitch = UISwitch() var strikeThroughSwitch = UISwitch() @@ -91,7 +91,7 @@ class RadioBoxGroupViewController: ModelScrollViewController { radioBoxGroup .publisher(for: .valueChanged) .sink { group in - print("Selected: \(group.selectedModelHandler?.text ?? "none")") + print("Selected: \(group.selectedHandler?.text ?? "none")") }.store(in: &subscribers) //set UI values diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift index 2cda1b2..05d8e40 100644 --- a/VDSSample/ViewControllers/RadioButtonViewController.swift +++ b/VDSSample/ViewControllers/RadioButtonViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class RadioButtonViewController: ModelScrollViewController { +class RadioButtonViewController: BaseViewController { var disabledSwitch = UISwitch() var labelTextField = TextField() diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift index 39461c5..a2137ba 100644 --- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class RadioSwatchGroupViewController: ModelScrollViewController { +class RadioSwatchGroupViewController: BaseViewController { var disabledSwitch = UISwitch() var strikeThroughSwitch = UISwitch() diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift index 0381c34..3102e7f 100644 --- a/VDSSample/ViewControllers/ToggleViewController.swift +++ b/VDSSample/ViewControllers/ToggleViewController.swift @@ -10,7 +10,7 @@ import UIKit import VDS import VDSColorTokens -class ToggleViewController: ModelScrollViewController { +class ToggleViewController: BaseViewController { lazy var textSizePickerSelectorView = { PickerSelectorView(title: "",