From cff23c26e4cd8c2d09a4e74b8b5437f09af12d1c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 3 Aug 2022 17:03:28 -0500 Subject: [PATCH] refactored names Signed-off-by: Matt Bruce --- VDS/Components/Toggle/Toggle.swift | 6 +++--- VDS/Components/Toggle/ToggleModel.swift | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index b4cae57b..0eea40e4 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -83,13 +83,13 @@ open class ToggleBase: Control, Changable { public var offText: String @Proxy(\.model.fontSize) - public var fontSize: VDSFontSize + public var fontSize: FontSize @Proxy(\.model.fontWeight) - public var fontWeight: VDSFontWeight + public var fontWeight: FontWeight @Proxy(\.model.textPosition) - public var textPosition: VDSTextPosition { + public var textPosition: TextPosition { didSet { if oldValue != textPosition { updateLabel(model) diff --git a/VDS/Components/Toggle/ToggleModel.swift b/VDS/Components/Toggle/ToggleModel.swift index 1ae6d3ab..aea09a58 100644 --- a/VDS/Components/Toggle/ToggleModel.swift +++ b/VDS/Components/Toggle/ToggleModel.swift @@ -17,7 +17,7 @@ public protocol ToggleModel: FormFieldable, DataTrackable, Accessable, Initable, } extension ToggleModel { - public var fontCategory: VDSFontCategory { + public var fontCategory: FontCategory { get { return .body } set { return } } @@ -42,10 +42,10 @@ public struct DefaultToggleModel: ToggleModel { public var offText: String = "Off" public var onText: String = "On" - public var fontCategory: VDSFontCategory = .body - public var fontSize: VDSFontSize = .small - public var fontWeight: VDSFontWeight = .regular - public var textPosition: VDSTextPosition = .left + public var fontCategory: FontCategory = .body + public var fontSize: FontSize = .small + public var fontWeight: FontWeight = .regular + public var textPosition: TextPosition = .left public var inputId: String? public var value: AnyHashable? = true