From adbb858fa45b9580df32c0a5234a8b5fe4f1ec1b Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 21 Jul 2023 16:06:44 -0500
Subject: [PATCH] fixed bugs in label

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/Classes/TextField.swift              |  7 -------
 .../ViewControllers/LabelViewController.swift  | 18 +++++++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/VDSSample/Classes/TextField.swift b/VDSSample/Classes/TextField.swift
index 2105381..11f4713 100644
--- a/VDSSample/Classes/TextField.swift
+++ b/VDSSample/Classes/TextField.swift
@@ -82,11 +82,4 @@ public class NumericField: TextField {
         guard let text, let foundNumber = NumberFormatter().number(from: text) else { return nil }
         return foundNumber
     }
-    
-    public var numberPublisher: AnyPublisher<NSNumber?, Never> {
-        publisher(for: .editingChanged)
-            .map { _ in self.number ?? nil }
-            .eraseToAnyPublisher()
-    }
-
 }
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index c90b493..2bb4329 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -31,8 +31,7 @@ class LabelViewController: BaseViewController<Label> {
     //testing only remove later
     //------------------------------------
     var pointSizeRange = Slider().with {
-        $0.maximumValue = 500
-        $0.minimumValue = 0
+        $0.minimumValue = 5
         $0.value = 0
     }
     var lineheightRange = Slider()
@@ -55,11 +54,12 @@ class LabelViewController: BaseViewController<Label> {
             #warning("testing only remove later")
             //--------------------------------------------------------------
             let lineheight = component.useScaledFont ? currentStyle.scaledLineHeight : currentStyle.lineHeight
-            let lineheightText = component.useScaledFont ? "\(baseStyle.lineHeight.rounded())\nscaled: \(currentStyle.scaledLineHeight)" : "\(baseStyle.lineHeight.rounded())"
+            let lineheightText = component.useScaledFont ? "\(baseStyle.lineHeight.rounded()) sc\(currentStyle.scaledLineHeight)" : "\(baseStyle.lineHeight.rounded())"
 
             pointSizeRange.value = Float(currentStyle.pointSize)
+            pointSizeRange.maximumValue = Float(baseStyle.pointSize * 1.50)
             lineheightRange.value = Float(lineheight)
-            lineheightRange.maximumValue = Float(lineheightRange.value * 1.50)
+            lineheightRange.maximumValue = Float((component.useScaledFont ? baseStyle.scaledLineHeight : lineheight) * 1.50)
             lineheightRange.minimumValue = 1
             
             topInsetRange.value = Float(currentStyle.edgeInsets.top)
@@ -213,7 +213,6 @@ class LabelViewController: BaseViewController<Label> {
         
     func setupModel() {
         component.text = "Helg¹ worldg Hell¹ worldg"
-        component.textStyle = .featureXLarge
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
@@ -222,10 +221,11 @@ class LabelViewController: BaseViewController<Label> {
         textField.text = component.text
         
         //set the font
+        component.textStyle = .featureMedium
         fontCategory = .feature
-        fontCategoryPickerSelectorView.text = "Feature"
-        textSize = .xlarge
-        textSizePickerSelectorView.text = "XLarge"
+        fontCategoryPickerSelectorView.text = fontCategory.rawValue.capitalized
+        textSize = .medium
+        textSizePickerSelectorView.text = textSize!.rawValue.capitalized
         updateLabelStyle()
             
     }
@@ -249,7 +249,7 @@ class LabelViewController: BaseViewController<Label> {
         }
     }
     
-    private var textSize: TextStyle.FontSize? = .large {
+    private var textSize: TextStyle.FontSize? = .medium {
         didSet {
             textSizePickerSelectorView.text = textSize?.rawValue ?? ""
             updateLabelStyle()