From 6b3bcbea6af60eaea6952f9b6a4b33f85be8bc8a Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 16 Feb 2021 17:27:35 -0500 Subject: [PATCH 1/5] asd --- .../MultiItemDropdownEntryFieldModel.swift | 12 +++ .../FormFields/TextFields/EntryField.swift | 76 ++++++++++++++----- 2 files changed, 71 insertions(+), 17 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift index fbdde6f3..1dea0b0d 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift @@ -39,6 +39,18 @@ import Foundation return delimiters[index] } + /* + public func delimiter(for index: Int) -> String { + + guard index != components.count - 1 else { return "" } + guard let delimiters = delimiters, + index < delimiters.count + else { return " " } + + return delimiters[index] + } + */ + /// A string of the picker row concatenated by whitespace or delimiters if provided. public var selectedRowText: String { diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift index 3996c7fc..b9b60847 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift @@ -52,6 +52,8 @@ import UIKit /// Validate on each entry in the textField. Default: true public var validateEachCharacter: Bool = true +// private var observation: NSKeyValueObservation? = nil + //-------------------------------------------------- // MARK: - Computed Properties //-------------------------------------------------- @@ -60,10 +62,10 @@ import UIKit public var isEnabled: Bool { get { entryFieldContainer.isEnabled } set (enabled) { - self.titleLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3 - self.feedbackLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3 - self.entryFieldContainer.isEnabled = enabled - self.entryFieldModel?.enabled = enabled + titleLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3 + feedbackLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3 + entryFieldContainer.isEnabled = enabled + entryFieldModel?.enabled = enabled } } @@ -71,10 +73,10 @@ import UIKit public var showError: Bool { get { entryFieldContainer.showError } set (error) { - self.feedback = error ? errorMessage : entryFieldModel?.feedback - self.feedbackLabel.textColor = error ? entryFieldModel?.errorTextColor?.uiColor ?? .mvmBlack : .mvmBlack - self.entryFieldContainer.showError = error - self.entryFieldModel?.showError = error + feedback = error ? errorMessage : entryFieldModel?.feedback + feedbackLabel.textColor = error ? entryFieldModel?.errorTextColor?.uiColor ?? .mvmBlack : .mvmBlack + entryFieldContainer.showError = error + entryFieldModel?.showError = error } } @@ -86,8 +88,8 @@ import UIKit public var isLocked: Bool { get { entryFieldContainer.isLocked } set (locked) { - self.entryFieldContainer.isLocked = locked - self.entryFieldModel?.locked = locked + entryFieldContainer.isLocked = locked + entryFieldModel?.locked = locked } } @@ -95,17 +97,17 @@ import UIKit public var isSelected: Bool { get { entryFieldContainer.isSelected } set (selected) { - self.entryFieldContainer.isSelected = selected - self.entryFieldModel?.selected = selected + entryFieldContainer.isSelected = selected + entryFieldModel?.selected = selected } } /// Sets the text of titleLabel public var title: String? { get { titleLabel.text } - set (newText) { - titleLabel.text = newText - setAccessibilityString(newText) + set { + titleLabel.text = newValue + setAccessibilityString(newValue) } } @@ -118,8 +120,8 @@ import UIKit /// Sets feedback text in the textField. public var feedback: String? { get { feedbackLabel.text } - set (newFeedback) { - feedbackLabel.text = newFeedback + set { + feedbackLabel.text = newValue feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true entryFieldContainer.refreshUI(updateMoleculeLayout: true) } @@ -217,6 +219,46 @@ import UIKit layoutMarginsGuide.bottomAnchor.constraint(equalTo: feedbackLabel.bottomAnchor).isActive = true } + /* + isAccessibilityElement = false + setContentCompressionResistancePriority(.required, for: .vertical) + accessibilityElements = [titleLabel, feedbackLabel] + backgroundColor = .mvmWhite + +// observation = observe(\.feedbackLabel.text, options: [.new]) { [weak self] _, _ in +// self?.entryFieldContainer.refreshUI(updateMoleculeLayout: true) +// } + + addSubview(titleLabel) + addSubview(entryFieldContainer) + addSubview(feedbackLabel) + + + titleLabelLeading = titleLabel.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor) + titleLabelTrailing = layoutMarginsGuide.trailingAnchor.constraint(equalTo: titleLabel.trailingAnchor) + titleContainerDistance = entryFieldContainer.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: Padding.One) + entryFieldContainerLeading = entryFieldContainer.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor) + feedbackContainerDistance = feedbackLabel.topAnchor.constraint(equalTo: entryFieldContainer.bottomAnchor, constant: Padding.Two) + entryFieldContainerTrailing = layoutMarginsGuide.trailingAnchor.constraint(equalTo: entryFieldContainer.trailingAnchor) + feedbackLabelLeading = feedbackLabel.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor) + feedbackLabelTrailing = layoutMarginsGuide.trailingAnchor.constraint(equalTo: feedbackLabel.trailingAnchor) + + NSLayoutConstraint.activate([ + titleLabel.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor), + titleLabelLeading!, + titleLabelLeading!, + titleContainerDistance!, + entryFieldContainerLeading!, + entryFieldContainerTrailing!, + feedbackContainerDistance!, + feedbackLabelLeading!, + feedbackLabelTrailing!, + layoutMarginsGuide.bottomAnchor.constraint(equalTo: feedbackLabel.bottomAnchor) + ]) + + entryFieldContainer.setContentCompressionResistancePriority(.required, for: .vertical) + setupFieldContainerContent(entryFieldContainer) + */ @objc open override func layoutSubviews() { super.layoutSubviews() From 84adccd18745ee3b031b43ed67f0898097fefacd Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 17 Feb 2021 10:09:06 -0500 Subject: [PATCH 2/5] updates --- .../MultiItemDropdownEntryField.swift | 12 ++--- .../MultiItemDropdownEntryFieldModel.swift | 46 +++++++++++-------- .../FormFields/TextFields/EntryField.swift | 43 ----------------- 3 files changed, 34 insertions(+), 67 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift index 2c509bb3..8bed3996 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift @@ -71,6 +71,10 @@ open class MultiItemDropdownEntryField: BaseItemPickerEntryField { } } + func pickerHasComponent(_ index: Int) -> Bool { + !pickerComponents.isEmpty && !pickerComponents[index].isEmpty + } + //-------------------------------------------------- // MARK: - TextField Observation //-------------------------------------------------- @@ -122,18 +126,14 @@ open class MultiItemDropdownEntryField: BaseItemPickerEntryField { @objc public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? { - guard !pickerComponents.isEmpty, - !pickerComponents[component].isEmpty - else { return nil } + guard pickerHasComponent(component) else { return nil } return pickerComponents[component][row] } @objc public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { - guard !pickerComponents.isEmpty, - !pickerComponents[component].isEmpty - else { return } + guard pickerHasComponent(component) else { return } let oldText = text ?? "" dropdownModel?.selectedIndexes[component] = row diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift index 1dea0b0d..bc7899d7 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift @@ -18,7 +18,7 @@ import Foundation public var components: [[String]] = [[]] public var selectedIndexes: [Int: Int] = [:] - public var delimiters: [String]? + public var delimiters: [Int: String] = [:] //-------------------------------------------------- // MARK: - Validation @@ -31,26 +31,19 @@ import Foundation return selectedRowText } + //-------------------------------------------------- + // MARK: - Methods + //-------------------------------------------------- + + /// - parameter index: The index of the delimiter. + /// - returns: The delimiter for a given idenx. Defaults to whitespace for valid index if no delimiters is provided. If invalid index, emoty string. public func delimiter(for index: Int) -> String { - - guard let delimiters = delimiters else { return " " } + guard index != components.count - 1 else { return "" } - return delimiters[index] + return delimiters[index] ?? " " } - /* - public func delimiter(for index: Int) -> String { - - guard index != components.count - 1 else { return "" } - guard let delimiters = delimiters, - index < delimiters.count - else { return " " } - - return delimiters[index] - } - */ - /// A string of the picker row concatenated by whitespace or delimiters if provided. public var selectedRowText: String { @@ -76,6 +69,18 @@ import Foundation return indexArray } + public var delimiterArray: [String] { + + var array: [String] = [] + + for i in 0.. Date: Wed, 17 Feb 2021 17:13:57 -0500 Subject: [PATCH 3/5] moved by request --- .../TextFields/TextEntryField.swift | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift index 91d64e90..6ff196c7 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift @@ -97,23 +97,7 @@ import UIKit get { textField.text } set { textEntryFieldModel?.text = newValue - - guard let regex = textEntryFieldModel?.displayFormat, - let mask = textEntryFieldModel?.displayMask, - let newText = newValue - else { - textField.text = newValue - return - } - - let range = NSRange(newText.startIndex..., in: newText) - - if let regex = try? NSRegularExpression(pattern: regex) { - let maskedText = regex.stringByReplacingMatches(in: newText, - range: range, - withTemplate: mask) - textField.text = maskedText - } + textField.text = newValue } } @@ -279,9 +263,28 @@ import UIKit self.isValid = isValid } + regexTextFieldOutputIfAvailable() + shouldShowError(!isValid) } + func regexTextFieldOutputIfAvailable() { + + if let regex = textEntryFieldModel?.displayFormat, + let mask = textEntryFieldModel?.displayMask, + let finalText = text { + + let range = NSRange(finalText.startIndex..., in: finalText) + + if let regex = try? NSRegularExpression(pattern: regex) { + let maskedText = regex.stringByReplacingMatches(in: finalText, + range: range, + withTemplate: mask) + textField.text = maskedText + } + } + } + @objc public func dismissFieldInput(_ sender: Any?) { resignFirstResponder() } From d9af965aa893e8c51694023f7f97921a891faa89 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 18 Feb 2021 09:20:23 -0500 Subject: [PATCH 4/5] default --- .../Item Dropdown/MultiItemDropdownEntryFieldModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift index bc7899d7..248a86e1 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift @@ -41,7 +41,7 @@ import Foundation guard index != components.count - 1 else { return "" } - return delimiters[index] ?? " " + return delimiters[index, default: " "] } /// A string of the picker row concatenated by whitespace or delimiters if provided. From cd721967556ff68885ff8640976159464dfffb0d Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 18 Feb 2021 10:15:25 -0500 Subject: [PATCH 5/5] spelling fix --- .../Item Dropdown/MultiItemDropdownEntryFieldModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift index 248a86e1..8799f6aa 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift @@ -36,7 +36,7 @@ import Foundation //-------------------------------------------------- /// - parameter index: The index of the delimiter. - /// - returns: The delimiter for a given idenx. Defaults to whitespace for valid index if no delimiters is provided. If invalid index, emoty string. + /// - returns: The delimiter for a given index. Defaults to whitespace for valid index if no delimiters is provided. If invalid index, empty string. public func delimiter(for index: Int) -> String { guard index != components.count - 1 else { return "" }