From 595dc99936ad24e1579b3c9d784d49756f21abfc Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 6 Feb 2020 09:50:03 -0500
Subject: [PATCH] button minimum caretLink

---
 MVMCoreUI/Atoms/Buttons/CaretButton.swift | 38 +++++------------------
 MVMCoreUI/Atoms/Buttons/PillButton.swift  |  6 ++--
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/MVMCoreUI/Atoms/Buttons/CaretButton.swift b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
index 3fcf453a..97f8d55e 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
@@ -8,7 +8,7 @@
 //
 
 
-open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUIViewConstrainingProtocol, ModelMoleculeViewProtocol {
+open class CaretButton: Button, MVMCoreUIViewConstrainingProtocol {
     
     //------------------------------------------------------
     // MARK: - Constants
@@ -49,7 +49,9 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
         didSet { changeCaretColor() }
     }
     
-    public func updateView(_ size: CGFloat) { }
+    public override func updateView(_ size: CGFloat) {
+        titleLabel?.font = MFStyler.fontB1()
+    }
     
     //------------------------------------------------------
     // MARK: - Methods
@@ -115,33 +117,7 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
         setTitleColor(disabledColor, for: .disabled)
     }
     
-    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        setWithActionMap(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json else { return }
-        
-        if let title = dictionary.optionalStringForKey(KeyTitle) {
-            setTitle(title, for: .normal)
-        }
-        
-        if let disableButtonAsAny = dictionary[KeyDisableButton], let isDisabled = disableButtonAsAny as? Bool {
-            isEnabled = !isDisabled
-        }
-        
-        if let backgroundColorHex = dictionary[KeyBackgroundColor] as? String {
-            backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
-        }
-        
-        if let enabledColorHex = dictionary["enabledColor"] as? String {
-            enabledColor = UIColor.mfGet(forHex: enabledColorHex)
-        }
-        
-        if let disabledColorHex = dictionary["disabledColor"] as? String {
-            disabledColor = UIColor.mfGet(forHex: disabledColorHex)
-        }
-    }
-    
-    public func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let caretLinkModel = model as? CaretLinkModel else { return }
         if let color = caretLinkModel.backgroundColor {
             backgroundColor = color.uiColor
@@ -163,7 +139,7 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
         return .leading
     }
     
-    public class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return 10
+    open override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return CARET_VIEW_HEIGHT
     }
 }
diff --git a/MVMCoreUI/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atoms/Buttons/PillButton.swift
index 0d0a3090..d3d09cee 100644
--- a/MVMCoreUI/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/PillButton.swift
@@ -97,9 +97,9 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol, FormValidation
     public static func getHeight(for buttonSize: ButtonSize?, size: CGFloat) -> CGFloat {
         switch buttonSize {
         case .tiny:
-            return MFSizeObject(standardSize: ButtonHeight.tiny.rawValue, standardiPadPortraitSize: 34, iPadProLandscapeSize: 38)?.getValueBased(onSize: size) ?? 20
+            return MFSizeObject(standardSize: ButtonHeight.tiny.rawValue, standardiPadPortraitSize: 34, iPadProLandscapeSize: 38)?.getValueBased(onSize: size) ?? ButtonHeight.tiny.rawValue
         default:
-            return MFSizeObject(standardSize: ButtonHeight.standard.rawValue, standardiPadPortraitSize: 46, iPadProLandscapeSize: 50)?.getValueBased(onSize: size) ?? 42
+            return MFSizeObject(standardSize: ButtonHeight.standard.rawValue, standardiPadPortraitSize: 46, iPadProLandscapeSize: 50)?.getValueBased(onSize: size) ?? ButtonHeight.standard.rawValue
         }
     }
 
@@ -108,7 +108,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol, FormValidation
         case .tiny:
             return MFSizeObject(standardSize: 49.0, standardiPadPortraitSize: 90.0, iPadProLandscapeSize: 135.0)?.getValueBased(onSize: size) ?? 49.0
         default:
-            return MFSizeObject(standardSize: 102.0, standardiPadPortraitSize: 136.0, iPadProLandscapeSize: 153.0)?.getValueBased(onSize: size) ?? 102.0
+            return 151.0
         }
     }