From 8f319e3b11c97491408779a006b7e5c54a6c3ef7 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 25 Aug 2022 11:00:21 -0500 Subject: [PATCH] refactored name Signed-off-by: Matt Bruce --- VDS.xcodeproj/project.pbxproj | 8 ++++---- VDS/Components/Checkbox/CheckboxGroup.swift | 2 +- VDS/Components/RadioBox/RadioBoxGroup.swift | 2 +- VDS/Components/RadioButton/RadioButtonGroup.swift | 2 +- ...dlerable.swift => SelectorGroupModelHandlerable.swift} | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) rename VDS/Protocols/{SelectorGroupHandlerable.swift => SelectorGroupModelHandlerable.swift} (92%) diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj index ec7a13cd..cebd999c 100644 --- a/VDS.xcodeproj/project.pbxproj +++ b/VDS.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ EA89200828B526E0006B9984 /* CheckboxGroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200728B526E0006B9984 /* CheckboxGroupModel.swift */; }; EA89200D28B530FD006B9984 /* RadioBoxModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200C28B530FD006B9984 /* RadioBoxModel.swift */; }; EA89200F28B53921006B9984 /* Selectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200E28B53921006B9984 /* Selectable.swift */; }; - EA89201128B567B5006B9984 /* SelectorGroupHandlerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201028B567B5006B9984 /* SelectorGroupHandlerable.swift */; }; + EA89201128B567B5006B9984 /* SelectorGroupModelHandlerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201028B567B5006B9984 /* SelectorGroupModelHandlerable.swift */; }; EA89201328B568D8006B9984 /* RadioBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201228B568D8006B9984 /* RadioBox.swift */; }; EA89201528B56CF4006B9984 /* RadioBoxGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201428B56CF4006B9984 /* RadioBoxGroup.swift */; }; EA89201728B56CFF006B9984 /* RadioBoxGroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201628B56CFF006B9984 /* RadioBoxGroupModel.swift */; }; @@ -133,7 +133,7 @@ EA89200728B526E0006B9984 /* CheckboxGroupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxGroupModel.swift; sourceTree = ""; }; EA89200C28B530FD006B9984 /* RadioBoxModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxModel.swift; sourceTree = ""; }; EA89200E28B53921006B9984 /* Selectable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Selectable.swift; sourceTree = ""; }; - EA89201028B567B5006B9984 /* SelectorGroupHandlerable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectorGroupHandlerable.swift; sourceTree = ""; }; + EA89201028B567B5006B9984 /* SelectorGroupModelHandlerable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectorGroupModelHandlerable.swift; sourceTree = ""; }; EA89201228B568D8006B9984 /* RadioBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBox.swift; sourceTree = ""; }; EA89201428B56CF4006B9984 /* RadioBoxGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroup.swift; sourceTree = ""; }; EA89201628B56CFF006B9984 /* RadioBoxGroupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroupModel.swift; sourceTree = ""; }; @@ -305,7 +305,7 @@ EAF7F0A5289B0CE000B287F5 /* Resetable.swift */, EA89200E28B53921006B9984 /* Selectable.swift */, EAB1D29928A5611D00DAE764 /* SelectorGroupModelable.swift */, - EA89201028B567B5006B9984 /* SelectorGroupHandlerable.swift */, + EA89201028B567B5006B9984 /* SelectorGroupModelHandlerable.swift */, EA3361C8289054C50071C351 /* Surfaceable.swift */, EA3361B7288B2AAA0071C351 /* ViewProtocol.swift */, EAB1D2CC28ABE76000DAE764 /* Withable.swift */, @@ -561,7 +561,7 @@ buildActionMask = 2147483647; files = ( EAF7F0B5289C126F00B287F5 /* UILabel.swift in Sources */, - EA89201128B567B5006B9984 /* SelectorGroupHandlerable.swift in Sources */, + EA89201128B567B5006B9984 /* SelectorGroupModelHandlerable.swift in Sources */, EAF7F0A6289B0CE000B287F5 /* Resetable.swift in Sources */, EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */, EA3361C328902D960071C351 /* Toggle.swift in Sources */, diff --git a/VDS/Components/Checkbox/CheckboxGroup.swift b/VDS/Components/Checkbox/CheckboxGroup.swift index f89637f3..37a498b9 100644 --- a/VDS/Components/Checkbox/CheckboxGroup.swift +++ b/VDS/Components/Checkbox/CheckboxGroup.swift @@ -8,7 +8,7 @@ import Foundation import UIKit -public class CheckboxGroup: Control, SelectorGroupHandlerable, Changable { +public class CheckboxGroup: Control, SelectorGroupModelHandlerable, Changable { public typealias ModelHandlerType = Checkbox //-------------------------------------------------- diff --git a/VDS/Components/RadioBox/RadioBoxGroup.swift b/VDS/Components/RadioBox/RadioBoxGroup.swift index 94a58650..14f36179 100644 --- a/VDS/Components/RadioBox/RadioBoxGroup.swift +++ b/VDS/Components/RadioBox/RadioBoxGroup.swift @@ -8,7 +8,7 @@ import Foundation import UIKit -public class RadioBoxGroup: Control, SelectorGroupSelectedHandlerable, Changable { +public class RadioBoxGroup: Control, SelectorGroupSelectedModelHandlerable, Changable { public typealias ModelHandlerType = RadioBox //-------------------------------------------------- diff --git a/VDS/Components/RadioButton/RadioButtonGroup.swift b/VDS/Components/RadioButton/RadioButtonGroup.swift index e056ceed..4aef4d8a 100644 --- a/VDS/Components/RadioButton/RadioButtonGroup.swift +++ b/VDS/Components/RadioButton/RadioButtonGroup.swift @@ -8,7 +8,7 @@ import Foundation import UIKit -public class RadioButtonGroup: Control, SelectorGroupSelectedHandlerable, Changable { +public class RadioButtonGroup: Control, SelectorGroupSelectedModelHandlerable, Changable { public typealias ModelHandlerType = RadioButton //-------------------------------------------------- diff --git a/VDS/Protocols/SelectorGroupHandlerable.swift b/VDS/Protocols/SelectorGroupModelHandlerable.swift similarity index 92% rename from VDS/Protocols/SelectorGroupHandlerable.swift rename to VDS/Protocols/SelectorGroupModelHandlerable.swift index 000f43c3..02fd2fae 100644 --- a/VDS/Protocols/SelectorGroupHandlerable.swift +++ b/VDS/Protocols/SelectorGroupModelHandlerable.swift @@ -9,13 +9,13 @@ import Foundation import UIKit ///MARK: Groups that allow anything selected -public protocol SelectorGroupHandlerable: ModelHandlerable, Disabling, Surfaceable where ModelType: SelectorGroupModelable { +public protocol SelectorGroupModelHandlerable: ModelHandlerable, Disabling, Surfaceable where ModelType: SelectorGroupModelable { associatedtype ModelHandlerType: ModelHandlerable where ModelType.SelectorModelType == ModelHandlerType.ModelType, ModelHandlerType: UIControl var selectorViews: [ModelHandlerType] { get set } func createModelHandler(selector: ModelHandlerType.ModelType) -> ModelHandlerType } -extension SelectorGroupHandlerable { +extension SelectorGroupModelHandlerable { public func findSelectorView(id: UUID) -> ModelHandlerType? { return selectorViews.first(where: { existingSelectorView in @@ -69,12 +69,12 @@ extension SelectorGroupHandlerable { } ///MARK: Groups that allow single selections -public protocol SelectorGroupSelectedHandlerable: SelectorGroupHandlerable { +public protocol SelectorGroupSelectedModelHandlerable: SelectorGroupModelHandlerable { var selectedModel: ModelHandlerType.ModelType? { get set } func didSelect(selector: ModelHandlerType.ModelType) } -extension SelectorGroupSelectedHandlerable { +extension SelectorGroupSelectedModelHandlerable { public func createModelHandler(selector: ModelHandlerType.ModelType) -> ModelHandlerType { //create view