From 702687ee2cb9dd8c85b2ba58ec6cd495021346ab Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 8 Oct 2024 12:52:16 -0500
Subject: [PATCH] refactored badge indicator tester

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../BadgeIndicatorViewController.swift        | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 7d8e523..c03d0f2 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -37,18 +37,37 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
                            items: BadgeIndicator.MaximumDigits.allCases)
     }()
     
-    lazy var borderColorLightPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    enum BackgroundColor: String, CaseIterable {
+        case token, custom
+    }
+    
+    lazy var borderColorLightPickerSelectorView: TokenColorPickerSection  = {
+        TokenColorPickerSection<BackgroundColor>(rowTitle: "Border Light",
+                                                 picker: self.picker).with {
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorLight = color.uiColor
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorLight = color
+            }
+        }
     }()
 
-    lazy var borderColorDarkPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    lazy var borderColorDarkPickerSelectorView : TokenColorPickerSection  = {
+        TokenColorPickerSection<BackgroundColor>(rowTitle: "Border Dark",
+                                                 picker: self.picker).with {
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorDark = color.uiColor
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorDark = color
+            }
+        }
     }()
-
     
     var textField = NumericField()
     var leadingCharacterTextField = TextField()
@@ -83,8 +102,8 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         addFormRow(label: "Fill Color", view: fillColorPickerSelectorView)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Hide Border", view: hideBorderSwitch, pinTrailing: false)
-        addFormRow(label: "Border Light", view: borderColorLightPickerSelectorView)
-        addFormRow(label: "Border Dark", view: borderColorDarkPickerSelectorView)
+        append(section: borderColorLightPickerSelectorView)
+        append(section: borderColorDarkPickerSelectorView)
         addFormRow(label: "Size", view: textSizePickerSelectorView)
         addFormRow(label: "Accessiblity Text", view: accessibilityTextField)
         
@@ -173,8 +192,6 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         fillColorPickerSelectorView.text = component.fillColor.rawValue
         textSizePickerSelectorView.text = component.size.rawValue
         maxDigitsPickerSelectorView.text = component.maximumDigits.rawValue
-        borderColorDarkPickerSelectorView.text = component.borderColorDark?.toVDSColor()?.rawValue ?? ""
-        borderColorLightPickerSelectorView.text = component.borderColorLight?.toVDSColor()?.rawValue ?? ""
         textField.text = "\(component.number!)"
         visibleForms()
     }
@@ -207,14 +224,6 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         maxDigitsPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.maximumDigits = item
         }
-        
-        borderColorDarkPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.borderColorDark = item.uiColor
-        }
-        
-        borderColorLightPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.borderColorLight = item.uiColor
-        }
     }
 }