From d476643a9bd971aa470f4144bc826dd48f28f385 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 16 Feb 2024 09:32:46 -0600 Subject: [PATCH] refactored naming Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/TileletViewController.swift | 8 ++++---- VDSSample/ViewControllers/TitleLockupViewController.swift | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift index cf70cf0..05d29c1 100644 --- a/VDSSample/ViewControllers/TileletViewController.swift +++ b/VDSSample/ViewControllers/TileletViewController.swift @@ -22,7 +22,7 @@ class TileletViewController: BaseViewController { lazy var otherStandardStylePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: Tilelet.SubTitleModel.StandardStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) + items: Tilelet.SubTitleModel.OtherStandardStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) }() lazy var subtitleColorPickerSelectorView = { @@ -163,7 +163,7 @@ class TileletViewController: BaseViewController { //setup UI surfacePickerSelectorView.text = component.surface.rawValue - otherStandardStylePickerSelectorView.text = subTitleModel.standardStyle.rawValue + otherStandardStylePickerSelectorView.text = subTitleModel.otherStandardStyle.rawValue titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue titleTextField.text = titleModel.text @@ -193,7 +193,7 @@ class TileletViewController: BaseViewController { func setSubTitleModel() { if let text = subTitleTextField.text, !text.isEmpty { - component.subTitleModel = Tilelet.SubTitleModel(text: text, standardStyle: otherStandardStylePickerSelectorView.selectedItem) + component.subTitleModel = Tilelet.SubTitleModel(text: text, otherStandardStyle: otherStandardStylePickerSelectorView.selectedItem) } else { component.subTitleModel = nil } @@ -201,7 +201,7 @@ class TileletViewController: BaseViewController { func updateOtherTextStyles() { let items = component.titleLockup.standardStyleConfiguration.configuration(for: titleStandardStylePickerSelectorView.selectedItem.value)!.allOtherStandardStyles - let otheritems = items.compactMap { Tilelet.SubTitleModel.StandardStyle(rawValue: $0.rawValue)! } + let otheritems = items.compactMap { Tilelet.SubTitleModel.OtherStandardStyle(rawValue: $0.rawValue)! } otherStandardStylePickerSelectorView.items = otheritems otherStandardStylePickerSelectorView.text = otheritems.first?.rawValue ?? "" setSubTitleModel() diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift index 9caa6f7..ea0d7f5 100644 --- a/VDSSample/ViewControllers/TitleLockupViewController.swift +++ b/VDSSample/ViewControllers/TitleLockupViewController.swift @@ -106,7 +106,7 @@ class TitleLockupViewController: BaseViewController { //setup UI surfacePickerSelectorView.text = component.surface.rawValue textAlignmentPickerSelectorView.text = TextAlignment.left.rawValue - otherStandardStylePickerSelectorView.text = subTitleModel.standardStyle.rawValue + otherStandardStylePickerSelectorView.text = subTitleModel.otherStandardStyle.rawValue titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue eyebrowTextField.text = eyebrowModel.text @@ -139,7 +139,7 @@ class TitleLockupViewController: BaseViewController { let style = otherStandardStylePickerSelectorView.selectedItem if let text = subTitleTextField.text, !text.isEmpty { - component.subTitleModel = TitleLockup.SubTitleModel(text: text, standardStyle: style, textColor: subtitleColorPickerSelectorView.selectedItem) + component.subTitleModel = TitleLockup.SubTitleModel(text: text, otherStandardStyle: style, textColor: subtitleColorPickerSelectorView.selectedItem) debug(type: "SubTitle", textStyle: style.value.regular) } else { component.subTitleModel = nil