From e44d8469a46973c2921acf81d6778c546f86b2fa Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Wed, 12 Oct 2022 08:59:46 -0500
Subject: [PATCH] refactored toggle

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

diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 0025d5c..09b79f5 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -13,12 +13,16 @@ import VDSColorTokens
 class ToggleViewController: ModelScrollViewController<DefaultToggleModel> {
     
     lazy var textSizePickerSelectorView = {
-        TextSizePickerSelectorView(title: "Small",
-                                   picker: self.picker)
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: ToggleTextSize.allCases)
+        
     }()
     
     lazy var textPositionPickerSelectorView = {
-        TextPositionPickerSelectorView(picker: self.picker)
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: ToggleTextPosition.allCases)
     }()
 
     var disabledSwitch = UISwitch()
@@ -83,7 +87,7 @@ class ToggleViewController: ModelScrollViewController<DefaultToggleModel> {
         boldSwitch
             .publisher(for: .valueChanged)
             .sink { [weak self] sender in
-                self?.toggle.isBold = sender.isOn
+                self?.toggle.textWeight = sender.isOn ? .bold : .regular
             }.store(in: &subscribers)
 
         onTextField
@@ -99,6 +103,13 @@ class ToggleViewController: ModelScrollViewController<DefaultToggleModel> {
             }.store(in: &subscribers)
 
         textFormStackView.isHidden = true
+        
+        //setup UI
+        surfacePickerSelectorView.text = model.surface.rawValue
+        textSizePickerSelectorView.text = model.textSize.rawValue
+        textPositionPickerSelectorView.text = model.textPosition.rawValue
+        onTextField.text = model.onText
+        offTextField.text = model.offText
     }
     
     override func updateView(viewModel: DefaultToggleModel) {
@@ -116,7 +127,7 @@ class ToggleViewController: ModelScrollViewController<DefaultToggleModel> {
         }
                 
         textSizePickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.toggle.fontSize = item
+            self?.toggle.textSize = item
         }
 
         textPositionPickerSelectorView.onPickerDidSelect = {  [weak self] item in