mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

borders gone, observe validation

Browse Source
This commit is contained in:
Kevin G Christiano 2020-05-08 13:42:47 -04:00
parent 7f4360de3d
commit f1466763b7
3 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
View File

@ -246,6 +246,7 @@ import UIKit
titleLabel.textColor = .mvmBlack titleLabel.textColor = .mvmBlack
feedbackLabel.font = Styler.Font.RegularMicro.getFont() feedbackLabel.font = Styler.Font.RegularMicro.getFont()
feedbackLabel.textColor = .mvmBlack feedbackLabel.textColor = .mvmBlack
entryFieldContainer.disableAllBorders = false
feedbackLabel.text = nil feedbackLabel.text = nil
entryFieldContainer.reset() entryFieldContainer.reset()
} }
@ -261,6 +262,7 @@ import UIKit
title = model.title title = model.title
feedback = model.feedback feedback = model.feedback
isEnabled = model.enabled isEnabled = model.enabled
entryFieldContainer.disableAllBorders = model.hideBorders
if let isLocked = model.locked { if let isLocked = model.locked {
self.isLocked = isLocked self.isLocked = isLocked

4
MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
View File

@ -25,6 +25,7 @@ import Foundation
public var errorTextColor: Color? public var errorTextColor: Color?
public var enabled: Bool = true public var enabled: Bool = true
public var showError: Bool? public var showError: Bool?
public var hideBorders = false
public var locked: Bool? public var locked: Bool?
public var selected: Bool? public var selected: Bool?
public var text: String? public var text: String?
@ -55,6 +56,7 @@ import Foundation
case locked case locked
case selected case selected
case showError case showError
case hideBorders
case text case text
case fieldKey case fieldKey
case groupName case groupName
@ -96,6 +98,7 @@ import Foundation
locked = try typeContainer.decodeIfPresent(Bool.self, forKey: .locked) locked = try typeContainer.decodeIfPresent(Bool.self, forKey: .locked)
selected = try typeContainer.decodeIfPresent(Bool.self, forKey: .selected) selected = try typeContainer.decodeIfPresent(Bool.self, forKey: .selected)
text = try typeContainer.decodeIfPresent(String.self, forKey: .text) text = try typeContainer.decodeIfPresent(String.self, forKey: .text)
hideBorders = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideBorders) ?? false
baseValue = text baseValue = text
fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey) fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
@ -117,6 +120,7 @@ import Foundation
try container.encodeIfPresent(errorTextColor, forKey: .errorTextColor) try container.encodeIfPresent(errorTextColor, forKey: .errorTextColor)
try container.encodeIfPresent(errorMessage, forKey: .errorMessage) try container.encodeIfPresent(errorMessage, forKey: .errorMessage)
try container.encode(enabled, forKey: .enabled) try container.encode(enabled, forKey: .enabled)
try container.encode(hideBorders, forKey: .hideBorders)
try container.encodeIfPresent(fieldKey, forKey: .fieldKey) try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
try container.encodeIfPresent(groupName, forKey: .groupName) try container.encodeIfPresent(groupName, forKey: .groupName)
} }

83
MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
View File

@ -104,15 +104,15 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
didSet { didSet {
if observingTextFieldDelegate != nil && !observingForChange { if observingTextFieldDelegate != nil && !observingForChange {
observingForChange = true observingForChange = true
NotificationCenter.default.addObserver(self, selector: #selector(valueChanged), name: UITextView.textDidChangeNotification, object: textView) // NotificationCenter.default.addObserver(self, selector: #selector(valueChanged), name: UITextView.textDidChangeNotification, object: textView)
NotificationCenter.default.addObserver(self, selector: #selector(endInputing), name: UITextView.textDidEndEditingNotification, object: textView) // NotificationCenter.default.addObserver(self, selector: #selector(endInputing), name: UITextView.textDidEndEditingNotification, object: textView)
NotificationCenter.default.addObserver(self, selector: #selector(startEditing), name: UITextView.textDidBeginEditingNotification, object: textView) // NotificationCenter.default.addObserver(self, selector: #selector(startEditing), name: UITextView.textDidBeginEditingNotification, object: textView)
} else if observingTextFieldDelegate == nil && observingForChange { } else if observingTextFieldDelegate == nil && observingForChange {
observingForChange = false observingForChange = false
NotificationCenter.default.removeObserver(self, name: UITextView.textDidChangeNotification, object: textView) // NotificationCenter.default.removeObserver(self, name: UITextView.textDidChangeNotification, object: textView)
NotificationCenter.default.removeObserver(self, name: UITextView.textDidEndEditingNotification, object: textView) // NotificationCenter.default.removeObserver(self, name: UITextView.textDidEndEditingNotification, object: textView)
NotificationCenter.default.removeObserver(self, name: UITextView.textDidBeginEditingNotification, object: textView) // NotificationCenter.default.removeObserver(self, name: UITextView.textDidBeginEditingNotification, object: textView)
} }
} }
} }
@ -153,10 +153,9 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
]) ])
heightConstraint = textView.heightAnchor.constraint(equalToConstant: 0) heightConstraint = textView.heightAnchor.constraint(equalToConstant: 0)
heightConstraint?.isActive = true
let tap = UITapGestureRecognizer(target: self, action: #selector(startEditing)) // let tap = UITapGestureRecognizer(target: self, action: #selector(startEditing))
entryFieldContainer.addGestureRecognizer(tap) // entryFieldContainer.addGestureRecognizer(tap)
accessibilityElements = [titleLabel, textView, feedbackLabel] accessibilityElements = [titleLabel, textView, feedbackLabel]
} }
@ -173,42 +172,43 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
textView.font = Styler.Font.RegularBodyLarge.getFont() textView.font = Styler.Font.RegularBodyLarge.getFont()
heightConstraint?.constant = 0 heightConstraint?.constant = 0
heightConstraint?.isActive = false
} }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods
//-------------------------------------------------- //--------------------------------------------------
//
/// Executes on UITextField.textDidBeginEditingNotification // /// Executes on UITextField.textDidBeginEditingNotification
@objc func startEditing() { // @objc func startEditing() {
textView.becomeFirstResponder() // textView.becomeFirstResponder()
} // }
//
/// Executes on UITextField.textDidChangeNotification (each character entry) // /// Executes on UITextField.textDidChangeNotification (each character entry)
@objc func valueChanged() { // @objc func valueChanged() {
guard validateEachCharacter else { return } // guard validateEachCharacter else { return }
isSelected = true // isSelected = true
validateTextField() // validateTextField()
} // }
//
/// Validates the text of the entry field. // /// Validates the text of the entry field.
@objc public func validateTextField() { @objc public func validateTextField() {
text = textView.text text = textView.text
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
} }
//
/// Executes on UITextField.textDidEndEditingNotification // /// Executes on UITextField.textDidEndEditingNotification
@objc func endInputing() { // @objc func endInputing() {
resignFirstResponder() // resignFirstResponder()
if isValid { // if isValid {
showError = false // showError = false
entryFieldContainer.bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor // entryFieldContainer.bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
} // }
} // }
//
@objc public func dismissFieldInput(_ sender: Any?) { // @objc public func dismissFieldInput(_ sender: Any?) {
resignFirstResponder() // resignFirstResponder()
} // }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - UITextViewDelegate // MARK: - UITextViewDelegate
@ -233,6 +233,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
@objc public func textViewDidChange(_ textView: UITextView) { @objc public func textViewDidChange(_ textView: UITextView) {
validateTextField()
proprietorTextDelegate?.textViewDidChange?(textView) proprietorTextDelegate?.textViewDidChange?(textView)
} }
@ -245,6 +246,10 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
self.textView.setPlaceholderIfAvailable() self.textView.setPlaceholderIfAvailable()
isSelected = false isSelected = false
if isValid {
showError = false
entryFieldContainer.bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
}
proprietorTextDelegate?.textViewDidEndEditing?(textView) proprietorTextDelegate?.textViewDidEndEditing?(textView)
} }
@ -257,7 +262,11 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
guard let model = model as? TextViewEntryFieldModel else { return } guard let model = model as? TextViewEntryFieldModel else { return }
heightConstraint?.constant = model.height ?? 0 if let height = model.height {
heightConstraint?.constant = height
heightConstraint?.isActive = true
}
text = model.text text = model.text
uiTextViewDelegate = delegateObject?.uiTextViewDelegate uiTextViewDelegate = delegateObject?.uiTextViewDelegate