From f923c4de528872dca63c195c0047809711831a0b Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 8 May 2020 15:33:04 -0400
Subject: [PATCH] latest functioning state

---
 .../Atoms/TextFields/TextViewEntryField.swift | 34 +++++--------------
 .../Views/EntryFieldContainer.swift           |  6 ++--
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index f2188c24..91ca1c2e 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -52,7 +52,11 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
                 guard let self = self else { return }
                 
                 self.textView.isEnabled = enabled
-                self.textView.textColor = enabled ? self.textViewEntryFieldModel?.enabledTextColor.uiColor : self.textViewEntryFieldModel?.disabledTextColor.uiColor
+                if self.textView.isShowingPlaceholder {
+                    self.textView.textColor = self.textView.placeholderTextColor
+                } else {
+                    self.textView.textColor = enabled ? self.textViewEntryFieldModel?.enabledTextColor.uiColor : self.textViewEntryFieldModel?.disabledTextColor.uiColor
+                }
             }
         }
     }
@@ -184,19 +188,6 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
         }
     }
     
-    @objc public func updateValidation(_ isValid: Bool) {
-        let previousValidity = self.isValid
-        self.isValid = isValid
-        
-        if previousValidity && !isValid {
-//            showError = true
-//            observingTextViewDelegate?.isInvalid?(textfield: self)
-        } else if (!previousValidity && isValid) {
-//            showError = false
-//            observingTextViewDelegate?.isValid?(textfield: self)
-        }
-    }
-    
     /// Executes on UITextField.textDidBeginEditingNotification
     @objc func startEditing() {
         isSelected = true
@@ -262,8 +253,8 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
             entryFieldContainer.bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
         } else {
             showError = true
-            entryFieldContainer.disableAllBorders = false
         }
+        
         proprietorTextDelegate?.textViewDidEndEditing?(textView)
     }
     
@@ -281,16 +272,6 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
             heightConstraint?.isActive = true
         }
         
-        model.updateUI = { [weak self] in
-            MVMCoreDispatchUtility.performBlock(onMainThread: {
-                guard let self = self else { return }
-                
-                if self.isSelected {
-                    self.updateValidation(model.isValid ?? true)
-                }
-            })
-        }
-        
         text = model.text
         uiTextViewDelegate = delegateObject?.uiTextViewDelegate
         
@@ -302,6 +283,9 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
         textView.textAlignment = model.textAlignment
         textView.textColor = model.enabled ? model.enabledTextColor.uiColor : model.disabledTextColor.uiColor
         textView.font = model.fontStyle.getFont()
+        textView.placeholder = model.placeholder ?? ""
+        textView.placeholderFontStyle = model.placeholderFontStyle
+        textView.placeholderTextColor = model.placeholderTextColor.uiColor
         textView.setPlaceholderIfAvailable()
         
         switch model.type {
diff --git a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
index ff54ef7c..9ccd1d25 100644
--- a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
@@ -19,7 +19,7 @@ import UIKit
         let layer = CAShapeLayer()
         layer.backgroundColor = UIColor.mvmBlack.cgColor
         layer.drawsAsynchronously = true
-        layer.anchorPoint = CGPoint(x: 0.5, y: 1.0)
+        layer.anchorPoint = CGPoint(x: 0.5, y: 1.0);
         return layer
     }()
     
@@ -140,7 +140,7 @@ import UIKit
         
         borderPath.removeAllPoints()
         
-        if (disableAllBorders && showError) || (!disableAllBorders && !hideBorders) {
+        if !disableAllBorders && !hideBorders {
             // Brings the other half of the line inside the view to prevent cropping.
             let origin = bounds.origin
             let size = frame.size
@@ -260,7 +260,7 @@ import UIKit
     
     open func refreshUI(bottomBarSize: CGFloat? = nil, updateMoleculeLayout: Bool = false) {
         
-        if !disableAllBorders || (disableAllBorders && showError) {
+        if !disableAllBorders {
             let size: CGFloat = bottomBarSize ?? (showError ? 4 : 1)
             var heightChanged = false