From 5de60eef0f61d92c2dfc14d95fe78a09b127def4 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Sat, 30 Jul 2022 08:56:55 -0500 Subject: [PATCH] removed class since this is inherit Signed-off-by: Matt Bruce --- VDS/Components/Label/VDSLabel.swift | 10 +++++----- VDS/Components/Toggle/VDSToggle.swift | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/VDS/Components/Label/VDSLabel.swift b/VDS/Components/Label/VDSLabel.swift index 4078477f..31480ee8 100644 --- a/VDS/Components/Label/VDSLabel.swift +++ b/VDS/Components/Label/VDSLabel.swift @@ -23,19 +23,19 @@ open class VDSLabel: UILabel, Modelable { @Published public var model: VDSLabelModel = DefaultLabelModel() private var cancellable: AnyCancellable? - @Proxy(\VDSLabel.model.fontSize) + @Proxy(\.model.fontSize) public var fontSize: VDSFontSize - @Proxy(\VDSLabel.model.textPosition) + @Proxy(\.model.textPosition) public var textPosition: VDSTextPosition - @Proxy(\VDSLabel.model.fontWeight) + @Proxy(\.model.fontWeight) public var fontWeight: VDSFontWeight - @Proxy(\VDSLabel.model.fontCategory) + @Proxy(\.model.fontCategory) public var fontCategory: VDSFontCategory - @Proxy(\VDSLabel.model.surface) + @Proxy(\.model.surface) public var surface: Surface //Initializers diff --git a/VDS/Components/Toggle/VDSToggle.swift b/VDS/Components/Toggle/VDSToggle.swift index df38314a..52fa5eee 100644 --- a/VDS/Components/Toggle/VDSToggle.swift +++ b/VDS/Components/Toggle/VDSToggle.swift @@ -106,25 +106,25 @@ public class DefaultToggleModel: DefaultLabelModel, VDSToggleModel { //-------------------------------------------------- // MARK: - Computed Properties //-------------------------------------------------- - @Proxy(\VDSToggle.model.showText) + @Proxy(\.model.showText) public var showText: Bool - @Proxy(\VDSToggle.model.onText) + @Proxy(\.model.onText) public var onText: String - @Proxy(\VDSToggle.model.offText) + @Proxy(\.model.offText) public var offText: String - @Proxy(\VDSToggle.model.textPosition) + @Proxy(\.model.textPosition) public var textPosition: VDSTextPosition - @Proxy(\VDSToggle.model.fontSize) + @Proxy(\.model.fontSize) public var fontSize: VDSFontSize - @Proxy(\VDSToggle.model.fontWeight) + @Proxy(\.model.fontWeight) public var fontWeight: VDSFontWeight - @Proxy(\VDSToggle.model.surface) + @Proxy(\.model.surface) public var surface: Surface open override var isEnabled: Bool {