From e3edf940c7762dbbc538a370b6ae8978ea5ae3d1 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 4 Aug 2022 16:34:31 -0500 Subject: [PATCH] converted to struct Signed-off-by: Matt Bruce --- VDS/Components/Checkbox/CheckboxModel.swift | 6 +++--- VDS/Components/Label/LabelModel.swift | 4 ++-- VDS/Components/Toggle/ToggleModel.swift | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VDS/Components/Checkbox/CheckboxModel.swift b/VDS/Components/Checkbox/CheckboxModel.swift index dea769fc..71e36a3d 100644 --- a/VDS/Components/Checkbox/CheckboxModel.swift +++ b/VDS/Components/Checkbox/CheckboxModel.swift @@ -37,7 +37,7 @@ extension CheckboxModel { public var labelModel: DefaultLabelModel? { guard let labelText = labelText else { return nil } - let model = DefaultLabelModel() + var model = DefaultLabelModel() model.fontSize = .large model.textPosition = .left model.fontWeight = .bold @@ -51,7 +51,7 @@ extension CheckboxModel { public var childModel: DefaultLabelModel? { guard let childText = childText else { return nil } - let model = DefaultLabelModel() + var model = DefaultLabelModel() model.fontSize = .large model.textPosition = .left model.fontWeight = .regular @@ -65,7 +65,7 @@ extension CheckboxModel { public var errorModel: DefaultLabelModel? { guard let errorText = errorText, showError else { return nil } - let model = DefaultLabelModel() + var model = DefaultLabelModel() model.fontSize = .medium model.textPosition = .left model.fontWeight = .regular diff --git a/VDS/Components/Label/LabelModel.swift b/VDS/Components/Label/LabelModel.swift index c992f865..2d73f619 100644 --- a/VDS/Components/Label/LabelModel.swift +++ b/VDS/Components/Label/LabelModel.swift @@ -13,7 +13,7 @@ public protocol LabelModel: Labelable, Surfaceable, Disabling, Initable { var attributes: [LabelAttributeModel]? { get set } } -open class DefaultLabelModel: LabelModel, Initable { +public struct DefaultLabelModel: LabelModel { public var text: String? public var attributes: [LabelAttributeModel]? public var fontCategory: FontCategory = .body @@ -22,5 +22,5 @@ open class DefaultLabelModel: LabelModel, Initable { public var textPosition: TextPosition = .left public var surface: Surface = .light public var disabled: Bool = false - required public init(){} + public init(){} } diff --git a/VDS/Components/Toggle/ToggleModel.swift b/VDS/Components/Toggle/ToggleModel.swift index 402ce3c9..7023451f 100644 --- a/VDS/Components/Toggle/ToggleModel.swift +++ b/VDS/Components/Toggle/ToggleModel.swift @@ -25,7 +25,7 @@ extension ToggleModel { public var userTrueColor: Bool { return on } public var label: DefaultLabelModel { - let model = DefaultLabelModel() + var model = DefaultLabelModel() model.fontSize = fontSize model.textPosition = textPosition model.fontWeight = fontWeight