From 39afe7920b944546cf07725c9fd405daf8c52134 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 29 Aug 2023 08:50:21 -0500 Subject: [PATCH] moved classes around and renamed Signed-off-by: Matt Bruce --- VDS.xcodeproj/project.pbxproj | 66 +++++++++++-------- VDS/{Classes => BaseClasses}/Control.swift | 2 +- .../Selector}/SelectorBase.swift | 0 .../Selector}/SelectorGroupHandlerBase.swift | 0 .../Selector}/SelectorItemBase.swift | 0 VDS/{Classes => BaseClasses}/View.swift | 2 +- .../Buttons/{Button => }/ButtonBase.swift | 3 +- .../EntryField.swift => EntryFieldBase.swift} | 2 +- 8 files changed, 42 insertions(+), 33 deletions(-) rename VDS/{Classes => BaseClasses}/Control.swift (100%) rename VDS/{Classes => BaseClasses/Selector}/SelectorBase.swift (100%) rename VDS/{Classes => BaseClasses/Selector}/SelectorGroupHandlerBase.swift (100%) rename VDS/{Classes => BaseClasses/Selector}/SelectorItemBase.swift (100%) rename VDS/{Classes => BaseClasses}/View.swift (100%) rename VDS/Components/Buttons/{Button => }/ButtonBase.swift (98%) rename VDS/Components/TextFields/{EntryField/EntryField.swift => EntryFieldBase.swift} (99%) diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj index 6a97349c..06222f81 100644 --- a/VDS.xcodeproj/project.pbxproj +++ b/VDS.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ 44604AD729CE196600E62B51 /* Line.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD629CE196600E62B51 /* Line.swift */; }; 5F21D7BF28DCEB3D003E7CD6 /* Useable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F21D7BE28DCEB3D003E7CD6 /* Useable.swift */; }; 5FC35BE328D51405004EBEAC /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC35BE228D51405004EBEAC /* Button.swift */; }; + EA0B18022A9E236900F2D0CD /* SelectorGroupHandlerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0B18012A9E236900F2D0CD /* SelectorGroupHandlerBase.swift */; }; + EA0B18052A9E2D2D00F2D0CD /* SelectorBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0B18032A9E2D2D00F2D0CD /* SelectorBase.swift */; }; + EA0B18062A9E2D2D00F2D0CD /* SelectorItemBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0B18042A9E2D2D00F2D0CD /* SelectorItemBase.swift */; }; EA0D1C372A681CCE00E5C127 /* ToggleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C362A681CCE00E5C127 /* ToggleView.swift */; }; EA0D1C392A6AD4DF00E5C127 /* Typography+SpacingConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C382A6AD4DF00E5C127 /* Typography+SpacingConfig.swift */; }; EA0D1C3B2A6AD51B00E5C127 /* Typogprahy+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C3A2A6AD51B00E5C127 /* Typogprahy+Styles.swift */; }; @@ -21,7 +24,6 @@ EA0D1C432A6AD70900E5C127 /* VDSTypography.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C422A6AD70900E5C127 /* VDSTypography.swift */; }; EA0D1C452A6AD73000E5C127 /* RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C442A6AD73000E5C127 /* RawRepresentable.swift */; }; EA0FC2C62914222900DF80B4 /* ButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0FC2C52914222900DF80B4 /* ButtonGroup.swift */; }; - EA1DA1CB2A2E36DC001C51D2 /* SelectorBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1DA1CA2A2E36DC001C51D2 /* SelectorBase.swift */; }; EA297A5529FB07760031ED56 /* TooltipLabelAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A5429FB07760031ED56 /* TooltipLabelAttribute.swift */; }; EA297A5729FB0A360031ED56 /* AppleGuidlinesTouchable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A5629FB0A360031ED56 /* AppleGuidlinesTouchable.swift */; }; EA336171288B19200071C351 /* VDS.docc in Sources */ = {isa = PBXBuildFile; fileRef = EA336170288B19200071C351 /* VDS.docc */; }; @@ -47,7 +49,6 @@ EA3362402892EF6C0071C351 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33623F2892EF6B0071C351 /* Label.swift */; }; EA33624728931B050071C351 /* Initable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA33624628931B050071C351 /* Initable.swift */; }; EA471F3A2A95587500CE9E58 /* LayoutConstraintable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA471F392A95587500CE9E58 /* LayoutConstraintable.swift */; }; - EA4DB18528CA967F00103EE3 /* SelectorGroupHandlerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB18428CA967F00103EE3 /* SelectorGroupHandlerBase.swift */; }; EA4DB2FD28D3D0CA00103EE3 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB2FC28D3D0CA00103EE3 /* AnyEquatable.swift */; }; EA4DB30228DCBCA500103EE3 /* Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30128DCBCA500103EE3 /* Badge.swift */; }; EA513A952A4E1F82002A4DFF /* TitleLockupStyleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA513A942A4E1F82002A4DFF /* TitleLockupStyleConfiguration.swift */; }; @@ -108,13 +109,12 @@ EABFEB642A26473700C4C106 /* NSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABFEB632A26473700C4C106 /* NSAttributedString.swift */; }; EAC71A1D2A2E155A00E47A9F /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC71A1C2A2E155A00E47A9F /* Checkbox.swift */; }; EAC71A1F2A2E173D00E47A9F /* RadioButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC71A1E2A2E173D00E47A9F /* RadioButton.swift */; }; - EAC71A212A2E1DC000E47A9F /* SelectorItemBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC71A202A2E1DC000E47A9F /* SelectorItemBase.swift */; }; EAC846F3294B95CE00F685BA /* ButtonGroupCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC846F2294B95CE00F685BA /* ButtonGroupCollectionViewCell.swift */; }; EAC9257D29119B5400091998 /* TextLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9257C29119B5400091998 /* TextLink.swift */; }; EAC925832911B35400091998 /* TextLinkCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC925822911B35300091998 /* TextLinkCaret.swift */; }; EAC925842911C63100091998 /* Colorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEDF28F49DB3003B3210 /* Colorable.swift */; }; EAC9258C2911C9DE00091998 /* InputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC925872911C9DE00091998 /* InputField.swift */; }; - EAC9258F2911C9DE00091998 /* EntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9258B2911C9DE00091998 /* EntryField.swift */; }; + EAC9258F2911C9DE00091998 /* EntryFieldBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9258B2911C9DE00091998 /* EntryFieldBase.swift */; }; EAD062A72A3B67770015965D /* UIView+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD062A62A3B67770015965D /* UIView+CALayer.swift */; }; EAD062B02A3B873E0015965D /* BadgeIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD062AF2A3B873E0015965D /* BadgeIndicator.swift */; }; EAD0688E2A55F819002E3A2D /* Loader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD0688D2A55F819002E3A2D /* Loader.swift */; }; @@ -157,6 +157,9 @@ 44604AD629CE196600E62B51 /* Line.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Line.swift; sourceTree = ""; }; 5F21D7BE28DCEB3D003E7CD6 /* Useable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Useable.swift; sourceTree = ""; }; 5FC35BE228D51405004EBEAC /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = ""; }; + EA0B18012A9E236900F2D0CD /* SelectorGroupHandlerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectorGroupHandlerBase.swift; sourceTree = ""; }; + EA0B18032A9E2D2D00F2D0CD /* SelectorBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectorBase.swift; sourceTree = ""; }; + EA0B18042A9E2D2D00F2D0CD /* SelectorItemBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectorItemBase.swift; sourceTree = ""; }; EA0D1C362A681CCE00E5C127 /* ToggleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleView.swift; sourceTree = ""; }; EA0D1C382A6AD4DF00E5C127 /* Typography+SpacingConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Typography+SpacingConfig.swift"; sourceTree = ""; }; EA0D1C3A2A6AD51B00E5C127 /* Typogprahy+Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Typogprahy+Styles.swift"; sourceTree = ""; }; @@ -166,7 +169,6 @@ EA0D1C422A6AD70900E5C127 /* VDSTypography.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSTypography.swift; sourceTree = ""; }; EA0D1C442A6AD73000E5C127 /* RawRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RawRepresentable.swift; sourceTree = ""; }; EA0FC2C52914222900DF80B4 /* ButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroup.swift; sourceTree = ""; }; - EA1DA1CA2A2E36DC001C51D2 /* SelectorBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectorBase.swift; sourceTree = ""; }; EA297A5429FB07760031ED56 /* TooltipLabelAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TooltipLabelAttribute.swift; sourceTree = ""; }; EA297A5629FB0A360031ED56 /* AppleGuidlinesTouchable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleGuidlinesTouchable.swift; sourceTree = ""; }; EA33616C288B19200071C351 /* VDS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VDS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -193,7 +195,6 @@ EA33623F2892EF6B0071C351 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = ""; }; EA33624628931B050071C351 /* Initable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Initable.swift; sourceTree = ""; }; EA471F392A95587500CE9E58 /* LayoutConstraintable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutConstraintable.swift; sourceTree = ""; }; - EA4DB18428CA967F00103EE3 /* SelectorGroupHandlerBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectorGroupHandlerBase.swift; sourceTree = ""; }; EA4DB2FC28D3D0CA00103EE3 /* AnyEquatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEquatable.swift; sourceTree = ""; }; EA4DB30128DCBCA500103EE3 /* Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Badge.swift; sourceTree = ""; }; EA513A942A4E1F82002A4DFF /* TitleLockupStyleConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupStyleConfiguration.swift; sourceTree = ""; }; @@ -255,12 +256,11 @@ EABFEB632A26473700C4C106 /* NSAttributedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAttributedString.swift; sourceTree = ""; }; EAC71A1C2A2E155A00E47A9F /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = ""; }; EAC71A1E2A2E173D00E47A9F /* RadioButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButton.swift; sourceTree = ""; }; - EAC71A202A2E1DC000E47A9F /* SelectorItemBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectorItemBase.swift; sourceTree = ""; }; EAC846F2294B95CE00F685BA /* ButtonGroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroupCollectionViewCell.swift; sourceTree = ""; }; EAC9257C29119B5400091998 /* TextLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLink.swift; sourceTree = ""; }; EAC925822911B35300091998 /* TextLinkCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaret.swift; sourceTree = ""; }; EAC925872911C9DE00091998 /* InputField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputField.swift; sourceTree = ""; }; - EAC9258B2911C9DE00091998 /* EntryField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryField.swift; sourceTree = ""; }; + EAC9258B2911C9DE00091998 /* EntryFieldBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryFieldBase.swift; sourceTree = ""; }; EAD062A62A3B67770015965D /* UIView+CALayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CALayer.swift"; sourceTree = ""; }; EAD062AF2A3B873E0015965D /* BadgeIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeIndicator.swift; sourceTree = ""; }; EAD0688D2A55F819002E3A2D /* Loader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Loader.swift; sourceTree = ""; }; @@ -330,14 +330,34 @@ isa = PBXGroup; children = ( 5FC35BE228D51405004EBEAC /* Button.swift */, - EAB5FEF4292D371F00998C17 /* ButtonBase.swift */, ); path = Button; sourceTree = ""; }; + EA0B17FF2A9E21CA00F2D0CD /* Selector */ = { + isa = PBXGroup; + children = ( + EA0B18012A9E236900F2D0CD /* SelectorGroupHandlerBase.swift */, + EA0B18032A9E2D2D00F2D0CD /* SelectorBase.swift */, + EA0B18042A9E2D2D00F2D0CD /* SelectorItemBase.swift */, + ); + path = Selector; + sourceTree = ""; + }; + EA0B18002A9E220E00F2D0CD /* BaseClasses */ = { + isa = PBXGroup; + children = ( + EA0B17FF2A9E21CA00F2D0CD /* Selector */, + EA3361B5288B2A410071C351 /* Control.swift */, + EAF7F09F289AB7EC00B287F5 /* View.swift */, + ); + path = BaseClasses; + sourceTree = ""; + }; EA0FC2BE2912D18200DF80B4 /* Buttons */ = { isa = PBXGroup; children = ( + EAB5FEF4292D371F00998C17 /* ButtonBase.swift */, EA0FC2C42914221800DF80B4 /* ButtonGroup */, 5FC35BE128D513EB004EBEAC /* Button */, EAC9257E29119B5D00091998 /* TextLink */, @@ -379,6 +399,7 @@ EA33616E288B19200071C351 /* VDS */ = { isa = PBXGroup; children = ( + EA0B18002A9E220E00F2D0CD /* BaseClasses */, EA3361B4288B2A360071C351 /* Classes */, EA33619D288B1E330071C351 /* Components */, EA3361A6288B23240071C351 /* Extensions */, @@ -498,12 +519,7 @@ children = ( EA985C1C296CD13600F2FF2E /* BundleManager.swift */, EAF7F0B8289C139800B287F5 /* ColorConfiguration.swift */, - EA3361B5288B2A410071C351 /* Control.swift */, - EAF7F09F289AB7EC00B287F5 /* View.swift */, EAB5FEF02927F4AA00998C17 /* SelfSizingCollectionView.swift */, - EA4DB18428CA967F00103EE3 /* SelectorGroupHandlerBase.swift */, - EAC71A202A2E1DC000E47A9F /* SelectorItemBase.swift */, - EA1DA1CA2A2E36DC001C51D2 /* SelectorBase.swift */, ); path = Classes; sourceTree = ""; @@ -698,9 +714,9 @@ EAC925852911C9DE00091998 /* TextFields */ = { isa = PBXGroup; children = ( + EAC9258B2911C9DE00091998 /* EntryFieldBase.swift */, EAC925862911C9DE00091998 /* InputField */, EA985C21296E032000F2FF2E /* TextArea */, - EAC925892911C9DE00091998 /* EntryField */, ); path = TextFields; sourceTree = ""; @@ -713,14 +729,6 @@ path = InputField; sourceTree = ""; }; - EAC925892911C9DE00091998 /* EntryField */ = { - isa = PBXGroup; - children = ( - EAC9258B2911C9DE00091998 /* EntryField.swift */, - ); - path = EntryField; - sourceTree = ""; - }; EAD062AE2A3B87210015965D /* BadgeIndicator */ = { isa = PBXGroup; children = ( @@ -757,11 +765,11 @@ EA978EC4291D6AFE00ACC883 /* AnyLabelAttribute.swift */, EAF7F13228A2A16500B287F5 /* AttachmentLabelAttributeModel.swift */, EAF7F0B0289B177F00B287F5 /* ColorLabelAttribute.swift */, - EAF7F0AA289B13FD00B287F5 /* TextStyleLabelAttribute.swift */, EAA5EEB428ECBFB4003B3210 /* ImageLabelAttribute.swift */, EAF7F0AC289B142900B287F5 /* StrikeThroughLabelAttribute.swift */, - EAF7F0AE289B144C00B287F5 /* UnderlineLabelAttribute.swift */, + EAF7F0AA289B13FD00B287F5 /* TextStyleLabelAttribute.swift */, EA297A5429FB07760031ED56 /* TooltipLabelAttribute.swift */, + EAF7F0AE289B144C00B287F5 /* UnderlineLabelAttribute.swift */, ); path = Attributes; sourceTree = ""; @@ -940,9 +948,10 @@ EA4DB30228DCBCA500103EE3 /* Badge.swift in Sources */, EA33624728931B050071C351 /* Initable.swift in Sources */, EAF7F0A4289B017C00B287F5 /* LabelAttributeModel.swift in Sources */, + EA0B18022A9E236900F2D0CD /* SelectorGroupHandlerBase.swift in Sources */, EA5F86D02A1F936100BC83E4 /* TabsContainer.swift in Sources */, EAF7F0B1289B177F00B287F5 /* ColorLabelAttribute.swift in Sources */, - EAC9258F2911C9DE00091998 /* EntryField.swift in Sources */, + EAC9258F2911C9DE00091998 /* EntryFieldBase.swift in Sources */, EAB1D2EA28AE84AA00DAE764 /* UIControlPublisher.swift in Sources */, EAD068922A560B65002E3A2D /* LoaderViewController.swift in Sources */, EABFEB642A26473700C4C106 /* NSAttributedString.swift in Sources */, @@ -974,8 +983,8 @@ EA5E3058295105A40082B959 /* Tilelet.swift in Sources */, EA89201528B56CF4006B9984 /* RadioBoxGroup.swift in Sources */, EA985C1D296CD13600F2FF2E /* BundleManager.swift in Sources */, + EA0B18052A9E2D2D00F2D0CD /* SelectorBase.swift in Sources */, EAC71A1D2A2E155A00E47A9F /* Checkbox.swift in Sources */, - EA4DB18528CA967F00103EE3 /* SelectorGroupHandlerBase.swift in Sources */, EAF7F0AB289B13FD00B287F5 /* TextStyleLabelAttribute.swift in Sources */, EAB1D29C28A5618900DAE764 /* RadioButtonGroup.swift in Sources */, EA81410B2A0E8E3C004F60D2 /* ButtonIcon.swift in Sources */, @@ -985,6 +994,7 @@ EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */, EAD062B02A3B873E0015965D /* BadgeIndicator.swift in Sources */, EAA5EEB528ECBFB4003B3210 /* ImageLabelAttribute.swift in Sources */, + EA0B18062A9E2D2D00F2D0CD /* SelectorItemBase.swift in Sources */, EAB5FF0129424ACB00998C17 /* UIControl.swift in Sources */, EA985BF5296C60C000F2FF2E /* Icon.swift in Sources */, EA3361AA288B25E40071C351 /* Disabling.swift in Sources */, @@ -1003,10 +1013,8 @@ EAB5FEF12927F4AA00998C17 /* SelfSizingCollectionView.swift in Sources */, EA3361B8288B2AAA0071C351 /* ViewProtocol.swift in Sources */, EA3361A8288B23300071C351 /* UIColor.swift in Sources */, - EA1DA1CB2A2E36DC001C51D2 /* SelectorBase.swift in Sources */, EAC9257D29119B5400091998 /* TextLink.swift in Sources */, EA596ABF2A16B4F500300C4B /* Tabs.swift in Sources */, - EAC71A212A2E1DC000E47A9F /* SelectorItemBase.swift in Sources */, EAD062A72A3B67770015965D /* UIView+CALayer.swift in Sources */, EAD068942A560C13002E3A2D /* LoaderLaunchable.swift in Sources */, EA985BEC2968A91200F2FF2E /* TitleLockupTitleModel.swift in Sources */, diff --git a/VDS/Classes/Control.swift b/VDS/BaseClasses/Control.swift similarity index 100% rename from VDS/Classes/Control.swift rename to VDS/BaseClasses/Control.swift index b71c30a5..b2f3d4ae 100644 --- a/VDS/Classes/Control.swift +++ b/VDS/BaseClasses/Control.swift @@ -9,8 +9,8 @@ import Foundation import UIKit import Combine -@objc(VDSControl) /// Base Class use to build Controls. +@objc(VDSControl) open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { //-------------------------------------------------- // MARK: - Initializers diff --git a/VDS/Classes/SelectorBase.swift b/VDS/BaseClasses/Selector/SelectorBase.swift similarity index 100% rename from VDS/Classes/SelectorBase.swift rename to VDS/BaseClasses/Selector/SelectorBase.swift diff --git a/VDS/Classes/SelectorGroupHandlerBase.swift b/VDS/BaseClasses/Selector/SelectorGroupHandlerBase.swift similarity index 100% rename from VDS/Classes/SelectorGroupHandlerBase.swift rename to VDS/BaseClasses/Selector/SelectorGroupHandlerBase.swift diff --git a/VDS/Classes/SelectorItemBase.swift b/VDS/BaseClasses/Selector/SelectorItemBase.swift similarity index 100% rename from VDS/Classes/SelectorItemBase.swift rename to VDS/BaseClasses/Selector/SelectorItemBase.swift diff --git a/VDS/Classes/View.swift b/VDS/BaseClasses/View.swift similarity index 100% rename from VDS/Classes/View.swift rename to VDS/BaseClasses/View.swift index 6d72720a..89e5ce4b 100644 --- a/VDS/Classes/View.swift +++ b/VDS/BaseClasses/View.swift @@ -9,8 +9,8 @@ import Foundation import UIKit import Combine -@objc(VDSView) /// Base Class used to build Views. +@objc(VDSView) open class View: UIView, ViewProtocol, UserInfoable { //-------------------------------------------------- diff --git a/VDS/Components/Buttons/Button/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift similarity index 98% rename from VDS/Components/Buttons/Button/ButtonBase.swift rename to VDS/Components/Buttons/ButtonBase.swift index dd686efb..cdc40078 100644 --- a/VDS/Components/Buttons/Button/ButtonBase.swift +++ b/VDS/Components/Buttons/ButtonBase.swift @@ -23,8 +23,9 @@ public protocol Buttonable: UIControl, Surfaceable, Enabling { var intrinsicContentSize: CGSize { get } } +/// Base class used for UIButton type classes. @objc(VDSButtonBase) -open class ButtonBase: UIButton, Buttonable, ViewProtocol, UserInfoable, Clickable { +open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { //-------------------------------------------------- // MARK: - Initializers diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryFieldBase.swift similarity index 99% rename from VDS/Components/TextFields/EntryField/EntryField.swift rename to VDS/Components/TextFields/EntryFieldBase.swift index 5aac470a..fdd7f839 100644 --- a/VDS/Components/TextFields/EntryField/EntryField.swift +++ b/VDS/Components/TextFields/EntryFieldBase.swift @@ -12,7 +12,7 @@ import VDSFormControlsTokens import Combine @objc(VDSEntryField) -open class EntryField: Control, Changeable { +open class EntryFieldBase: Control, Changeable { //-------------------------------------------------- // MARK: - Initializers