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

Merge remote-tracking branch 'origin/develop' into feature/view_masking

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2022-03-25 08:26:30 -04:00
commit 6431e77122
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
View File

@ -249,6 +249,10 @@ import UIKit
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods
//-------------------------------------------------- //--------------------------------------------------
public override func showErrorView(_ show: Bool) {
//do nothing since you should show the error view
//within a digitEntryField
}
@objc public func setAsSecureTextEntry(_ secureEntry: Bool) { @objc public func setAsSecureTextEntry(_ secureEntry: Bool) {

5
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
View File

@ -84,7 +84,7 @@ import UIKit
textField.accessibilityValue = nil textField.accessibilityValue = nil
} }
if textField.isSecureTextEntry { if !textField.isSecureTextEntry {
showErrorView(error) showErrorView(error)
} }
@ -294,8 +294,7 @@ import UIKit
resignFirstResponder() resignFirstResponder()
} }
private func showErrorView(_ show: Bool) { open func showErrorView(_ show: Bool) {
if show { if show {
entryFieldContainer.addSubview(errorImage) entryFieldContainer.addSubview(errorImage)

2
MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
View File

@ -208,7 +208,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
} }
/// Handles when the controller has committed to be changed. /// Handles when the controller has committed to be changed.
private func commitTo(controller: UIViewController) { open func commitTo(controller: UIViewController) {
guard let index = index, guard let index = index,
index != tabs.selectedIndex else { return } index != tabs.selectedIndex else { return }
viewController = controller viewController = controller