From 7819cd8646a7540a5e2ab43d734d30959ad6a628 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 6 Jan 2023 14:55:04 -0600 Subject: [PATCH] updated to converted titleLockup Signed-off-by: Matt Bruce --- VDS/Components/Tilet/TiletSubTitleModel.swift | 5 ++--- VDS/Components/Tilet/TiletTitleModel.swift | 4 +--- .../Tilet/TiletTypographicalStyle.swift | 19 ------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 VDS/Components/Tilet/TiletTypographicalStyle.swift diff --git a/VDS/Components/Tilet/TiletSubTitleModel.swift b/VDS/Components/Tilet/TiletSubTitleModel.swift index 2ee22d52..530638ce 100644 --- a/VDS/Components/Tilet/TiletSubTitleModel.swift +++ b/VDS/Components/Tilet/TiletSubTitleModel.swift @@ -38,12 +38,11 @@ public struct TiletSubTitleModel { extension TitleLockup { internal func set(with model: TiletSubTitleModel?) { if let model, !model.text.isEmpty { - subTitleText = model.text - subTitleTextAttributes = model.textAttributes + subTitleModel = TitleLockupSubTitleModel(text: model.text, textColor: model.textColor, textAttributes: model.textAttributes) otherTypograpicalStyle = model.typographicalStyle.value - subTitleColor = model.textColor } else { reset() } } + } diff --git a/VDS/Components/Tilet/TiletTitleModel.swift b/VDS/Components/Tilet/TiletTitleModel.swift index 3676348f..9e7be868 100644 --- a/VDS/Components/Tilet/TiletTitleModel.swift +++ b/VDS/Components/Tilet/TiletTitleModel.swift @@ -37,9 +37,7 @@ public struct TiletTitleModel { extension TitleLockup { internal func set(with model: TiletTitleModel?) { if let model, !model.text.isEmpty { - titleText = model.text - titleTextAttributes = model.textAttributes - titleTypograpicalStyle = model.typographicalStyle.value + titleModel = TitleLockupTitleModel(text: model.text, textAttributes: model.textAttributes, typographicalStyle: model.typographicalStyle.value) } else { reset() } diff --git a/VDS/Components/Tilet/TiletTypographicalStyle.swift b/VDS/Components/Tilet/TiletTypographicalStyle.swift deleted file mode 100644 index ad2f028e..00000000 --- a/VDS/Components/Tilet/TiletTypographicalStyle.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// TiletTypographicalStyle.swift -// VDS -// -// Created by Matt Bruce on 1/6/23. -// - -import Foundation - -public enum TiletOtherTypographicalStyle: String, Codable, EnumSubset { - case BodyLarge - case BoldBodyLarge - case BodyMedium - case BoldBodyMedium - case BodySmall - case BoldBodySmall - - public var defaultValue: TitleLockupOtherTypographicalStyle { .BodySmall } -}