From 2b582cd39c77fdf674ceb090cd7bc7761541c918 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 8 Oct 2024 09:35:10 -0500 Subject: [PATCH] refactored Signed-off-by: Matt Bruce --- .../Classes/TokenColorPickerFormSection.swift | 4 ++-- .../ViewControllers/BadgeViewController.swift | 4 ++-- .../ViewControllers/TileletViewController.swift | 14 +++++++------- .../TitleLockupViewController.swift | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/VDSSample/Classes/TokenColorPickerFormSection.swift b/VDSSample/Classes/TokenColorPickerFormSection.swift index aed8a4b..6260f17 100644 --- a/VDSSample/Classes/TokenColorPickerFormSection.swift +++ b/VDSSample/Classes/TokenColorPickerFormSection.swift @@ -72,7 +72,7 @@ public class TokenColorPickerSection: public var selectedItem: EnumType { pickerSelectorView.selectedItem } /// Callback for a non-token/non-color selection - public var onOtherSelected: ((EnumType) -> Void)? + public var onSelected: ((EnumType) -> Void)? /// Callback after "token" is selected from the VDSColor array public var onTokenSelected: ((UIColor.VDSColor) -> Void)? /// Callback once the user picks a color from the picker. @@ -110,7 +110,7 @@ public class TokenColorPickerSection: } else if let selectedItem = customColorView.selectedColor, isCustom { onColorSelected?(selectedItem) } else { - onOtherSelected?(item) + onSelected?(item) } tokenColorRow?.isHidden = !isToken customColorRow?.isHidden = !isCustom diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift index a58bab6..66b8bc7 100644 --- a/VDSSample/ViewControllers/BadgeViewController.swift +++ b/VDSSample/ViewControllers/BadgeViewController.swift @@ -63,7 +63,7 @@ class BadgeViewController: BaseViewController { lazy var fillColorSection = { TokenColorPickerSection(rowTitle: "Fill Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } var fillColor: Badge.FillColor = .red switch item { @@ -99,7 +99,7 @@ class BadgeViewController: BaseViewController { lazy var textColorSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } component.textColor = nil } diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift index bf6cd1c..02e6261 100644 --- a/VDSSample/ViewControllers/TileletViewController.swift +++ b/VDSSample/ViewControllers/TileletViewController.swift @@ -130,7 +130,7 @@ class TileletViewController: BaseViewController { var badgeFillColor: Badge.FillColor = .red { didSet { setBadgeModel() } } lazy var badgeFillColorSection = { TokenColorPickerSection(rowTitle: "Fill Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } var fillColor: Badge.FillColor = .red switch item { @@ -167,7 +167,7 @@ class TileletViewController: BaseViewController { var badgeTextColor: Badge.TextColor? { didSet { setBadgeModel() } } lazy var badgeTextColorSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } badgeTextColor = nil } @@ -204,7 +204,7 @@ class TileletViewController: BaseViewController { var eyeBrowTextColor: TitleLockup.TextColor = .primary { didSet { setEyebrowModel() } } lazy var eyebrowTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: @@ -228,7 +228,7 @@ class TileletViewController: BaseViewController { var subtitleTextColor: TitleLockup.TextColor = .primary { didSet { setSubTitleModel() } } lazy var subTitleTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: @@ -252,7 +252,7 @@ class TileletViewController: BaseViewController { var titleTextColor: TitleLockup.TitleTextColor = .primary { didSet { setTitleModel() } } lazy var titleTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: @@ -288,7 +288,7 @@ class TileletViewController: BaseViewController { var descriptionIconColor: Tilelet.IconColor? = .token(.paletteWhite) { didSet { setDescriptiveIconModel() } } lazy var descriptionIconColorFormSection = { TokenColorPickerSection(picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .default: @@ -325,7 +325,7 @@ class TileletViewController: BaseViewController { var directionIconColor: Tilelet.IconColor? = .token(.paletteWhite) { didSet { setDirectionalIconModel() } } lazy var directionIconColorFormSection = { TokenColorPickerSection(picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .default: diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift index 22fc6f3..430b9a6 100644 --- a/VDSSample/ViewControllers/TitleLockupViewController.swift +++ b/VDSSample/ViewControllers/TitleLockupViewController.swift @@ -49,7 +49,7 @@ class TitleLockupViewController: BaseViewController { lazy var eyebrowTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: @@ -74,7 +74,7 @@ class TitleLockupViewController: BaseViewController { lazy var subTitleTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: @@ -99,7 +99,7 @@ class TitleLockupViewController: BaseViewController { lazy var titleTextColorFormSection = { TokenColorPickerSection(rowTitle: "Text Color", picker: self.picker).with { - $0.onOtherSelected = { [weak self] item in + $0.onSelected = { [weak self] item in guard let self else { return } switch item { case .primary: