From 30f5a4d48c9f2ff053c235edc10ca3be84c1d0ee Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Wed, 17 Jul 2024 22:04:44 +0530 Subject: [PATCH] Fix for CXTDT-586383, adding none style for line for Table component alone for testing --- .../ViewControllers/TableViewController.swift | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/VDSSample/ViewControllers/TableViewController.swift b/VDSSample/ViewControllers/TableViewController.swift index 49c610c..16c7f8b 100644 --- a/VDSSample/ViewControllers/TableViewController.swift +++ b/VDSSample/ViewControllers/TableViewController.swift @@ -10,6 +10,23 @@ import VDS import UIKit import VDSCoreTokens +enum TableLineStyle: String, CaseIterable { + case none + case primary + case secondary + + func lineStyle() -> Line.Style? { + switch self { + case .primary: + return Line.Style.primary + case .secondary: + return Line.Style.secondary + case .none: + return nil + } + } +} + class TableViewController: BaseViewController { var striped = Toggle() @@ -21,11 +38,11 @@ class TableViewController: BaseViewController
{ } lazy var headerLineStylePicker = { - PickerSelectorView(title: "primary", picker: self.picker, items: Line.Style.allCases) + PickerSelectorView(title: "primary", picker: self.picker, items: TableLineStyle.allCases) }() lazy var rowLineStylePicker = { - PickerSelectorView(title: "secondary", picker: self.picker, items: Line.Style.allCases) + PickerSelectorView(title: "secondary", picker: self.picker, items: TableLineStyle.allCases) }() lazy var paddingPicker = { @@ -56,15 +73,15 @@ class TableViewController: BaseViewController
{ striped.onChange = { [weak self] sender in self?.component.striped = sender.isOn - let headerStyle = sender.isOn ? nil : Line.Style(rawValue: self?.headerLineStylePicker.text ?? "") - let rowStyle = sender.isOn ? nil : Line.Style(rawValue: self?.rowLineStylePicker.text ?? "") + let headerStyle = sender.isOn ? nil : TableLineStyle(rawValue: self?.headerLineStylePicker.text ?? "") + let rowStyle = sender.isOn ? nil : TableLineStyle(rawValue: self?.rowLineStylePicker.text ?? "") var headers = self?.component.tableHeader ?? [TableRowModel]() - self?.updateBottomLineStyle(items:&headers, style: headerStyle) + self?.updateBottomLineStyle(items:&headers, style: headerStyle?.lineStyle()) self?.component.tableHeader = headers var rows = self?.component.tableRows ?? [TableRowModel]() - self?.updateBottomLineStyle(items:&rows, style: rowStyle) + self?.updateBottomLineStyle(items:&rows, style: rowStyle?.lineStyle()CXTDT-586383) self?.component.tableRows = rows } @@ -93,14 +110,14 @@ class TableViewController: BaseViewController
{ headerLineStylePicker.onPickerDidSelect = { [weak self] item in var headers = self?.component.tableHeader ?? [TableRowModel]() - self?.updateBottomLineStyle(items:&headers, style: item) + self?.updateBottomLineStyle(items:&headers, style: item.lineStyle()) self?.component.tableHeader = headers } rowLineStylePicker.onPickerDidSelect = { [weak self] item in var rows = self?.component.tableRows ?? [TableRowModel]() - self?.updateBottomLineStyle(items:&rows, style: item) + self?.updateBottomLineStyle(items:&rows, style: item.lineStyle()) self?.component.tableRows = rows }