From 7357a199d2adcf8a4c2bc8e864c426badf9f6886 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Sat, 29 Jun 2024 09:48:18 -0500 Subject: [PATCH 1/5] fixes for VDS TileContainer update Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift | 3 +-- MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift index 8ed4fd55..7d0968df 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift @@ -137,8 +137,7 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{ extension Tilelet: MVMCoreUIViewConstrainingProtocol { - // Investigate later. - //public func horizontalAlignment() -> UIStackView.Alignment { .leading } + public func horizontalAlignment() -> UIStackView.Alignment { .leading } public func isClippable() -> Bool { return false diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift index cf5d382b..561d45b4 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift @@ -44,7 +44,9 @@ open class TileletModel: TileContainerBaseModel, Molec case directionalIcon case textWidth case textPercentage + case aspectRatio } + required public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString @@ -86,8 +88,10 @@ open class TileletModel: TileContainerBaseModel, Molec } else { subTitleColor = .primary } - + try super.init(from: decoder) + //Tilelet default is .none, not ratio1x1 (TileContainer) + aspectRatio = try container.decodeIfPresent(Tilelet.AspectRatio.self, forKey: .aspectRatio) ?? .none } public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? { From f3efb91fee0792860241f80e9acc21a595b5dfb6 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 1 Jul 2024 11:12:57 -0500 Subject: [PATCH 2/5] remove horizontalAlignment Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift | 2 -- MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift | 3 --- 2 files changed, 5 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift b/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift index 6296f640..eb5020c1 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift @@ -135,8 +135,6 @@ open class TileContainer: VDS.TileContainer, VDSMoleculeViewProtocol{ } extension TileContainer: MVMCoreUIViewConstrainingProtocol { - public func horizontalAlignment() -> UIStackView.Alignment { .leading } - public func isClippable() -> Bool { return false } diff --git a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift index 7d0968df..bd2c0c73 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift @@ -136,9 +136,6 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{ } extension Tilelet: MVMCoreUIViewConstrainingProtocol { - - public func horizontalAlignment() -> UIStackView.Alignment { .leading } - public func isClippable() -> Bool { return false } From dee11d77329758178587f1740c44af625a0afaeb Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 1 Jul 2024 11:13:18 -0500 Subject: [PATCH 3/5] aspectRatio set to .none Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift | 4 ++-- MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift index b8b64f3d..0e7c6032 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift @@ -67,7 +67,7 @@ open class TileContainerBaseModel, Molec case directionalIcon case textWidth case textPercentage - case aspectRatio } required public init(from decoder: Decoder) throws { @@ -90,8 +89,6 @@ open class TileletModel: TileContainerBaseModel, Molec } try super.init(from: decoder) - //Tilelet default is .none, not ratio1x1 (TileContainer) - aspectRatio = try container.decodeIfPresent(Tilelet.AspectRatio.self, forKey: .aspectRatio) ?? .none } public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? { From 9e712aa21333a76b382c29f10030cced19c00018 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Wed, 3 Jul 2024 09:33:57 -0400 Subject: [PATCH 4/5] Digital ACT191 defect CXTDT-578423 - Fix to missing navigation line when the subnav tabs are manually hidden. --- .../Managers/SubNav/SubNavManagerController.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift index d5e0182e..7ac663d6 100644 --- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift +++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift @@ -137,7 +137,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, open override func pageShown() { // Currently not calling super until we can decouple page shown logics for managers. - hideNavigationBarLine(true) + hideNavigationBarLine(!tabs.isHidden) } open override func viewWillDisappear(_ animated: Bool) { @@ -148,7 +148,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, open override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - hideNavigationBarLine(true) + hideNavigationBarLine(!tabs.isHidden) } /// ensures margin for tabs are correct private func updateTabsMargin() { @@ -263,7 +263,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, } tabs.selectIndex(index, animated: true) self.index = nil - hideNavigationBarLine(true) + hideNavigationBarLine(!tabs.isHidden) } public func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) { @@ -354,12 +354,12 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, open func newDataReceived(in viewController: UIViewController) { manager?.newDataReceived?(in: viewController) - hideNavigationBarLine(true) + hideNavigationBarLine(!tabs.isHidden) } public func willDisplay(_ viewController: UIViewController) { manager?.willDisplay?(viewController) - hideNavigationBarLine(true) + hideNavigationBarLine(!tabs.isHidden) } public func displayedViewController(_ viewController: UIViewController) { From aa773dc8f544cd6502e532593443c96d940eb572 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 3 Jul 2024 11:42:08 -0500 Subject: [PATCH 5/5] added base FormField model class Signed-off-by: Matt Bruce --- MVMCoreUI.xcodeproj/project.pbxproj | 4 + .../Atoms/FormFields/FormFieldModel.swift | 110 ++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 MVMCoreUI/Atomic/Atoms/FormFields/FormFieldModel.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 3433e17b..39bd239c 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -581,6 +581,7 @@ EA41F4AC2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA41F4AB2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift */; }; EA5124FD243601600051A3A4 /* BGImageHeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5124FC243601600051A3A4 /* BGImageHeadlineBodyButton.swift */; }; EA5124FF2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */; }; + EA5DBDAB2C35B6C500290DF8 /* FormFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5DBDAA2C35B6C500290DF8 /* FormFieldModel.swift */; }; EA6642912BCDA97300D81DC4 /* TileContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6642902BCDA97300D81DC4 /* TileContainer.swift */; }; EA6642932BCDA97D00D81DC4 /* TileContainerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6642922BCDA97D00D81DC4 /* TileContainerModel.swift */; }; EA6E8B952B504A43000139B4 /* ButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6E8B942B504A43000139B4 /* ButtonGroup.swift */; }; @@ -1201,6 +1202,7 @@ EA41F4AB2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicRuleFormFieldEffectModel.swift; sourceTree = ""; }; EA5124FC243601600051A3A4 /* BGImageHeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageHeadlineBodyButton.swift; sourceTree = ""; }; EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageHeadlineBodyButtonModel.swift; sourceTree = ""; }; + EA5DBDAA2C35B6C500290DF8 /* FormFieldModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormFieldModel.swift; sourceTree = ""; }; EA6642902BCDA97300D81DC4 /* TileContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainer.swift; sourceTree = ""; }; EA6642922BCDA97D00D81DC4 /* TileContainerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainerModel.swift; sourceTree = ""; }; EA6E8B942B504A43000139B4 /* ButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroup.swift; sourceTree = ""; }; @@ -2487,6 +2489,7 @@ D2BEFEF5248A954C00FAB3A9 /* FormFields */ = { isa = PBXGroup; children = ( + EA5DBDAA2C35B6C500290DF8 /* FormFieldModel.swift */, D2BEFEF6248A957A00FAB3A9 /* Tags */, D29DF22B21E6A0FA003B2FB9 /* TextFields */, ); @@ -3292,6 +3295,7 @@ D28BA7432480284E00B75CB8 /* TabBar.swift in Sources */, AA3561AE24C96B9000452EB1 /* ListRightVariableRightCaretAllTextAndLinks.swift in Sources */, AA26850C244840AE00CE34CC /* HeadersH2TinyButton.swift in Sources */, + EA5DBDAB2C35B6C500290DF8 /* FormFieldModel.swift in Sources */, 011D95AB2405C553000E3791 /* FormItemProtocol.swift in Sources */, D21EE53C23AD3AD4003D1A30 /* NSLayoutConstraintAxis+Extension.swift in Sources */, 0A25209824645B76000FA9F6 /* TextViewEntryFieldModel.swift in Sources */, diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/FormFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/FormFieldModel.swift new file mode 100644 index 00000000..b15c23d6 --- /dev/null +++ b/MVMCoreUI/Atomic/Atoms/FormFields/FormFieldModel.swift @@ -0,0 +1,110 @@ +// +// FormFieldModel.swift +// MVMCoreUI +// +// Created by Matt Bruce on 7/3/24. +// Copyright © 2024 Verizon Wireless. All rights reserved. +// + +import Foundation + +@objcMembers open class FormFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol, UIUpdatableModelProtocol { + + //-------------------------------------------------- + // MARK: - Properties + //-------------------------------------------------- + public class var identifier: String { "" } + public var id: String = UUID().uuidString + + public var backgroundColor: Color? + public var accessibilityIdentifier: String? + + public var enabled: Bool = true + public var required: Bool = true + public var readOnly: Bool = false + public var showError: Bool? + public var errorMessage: String? + + public var fieldKey: String? + public var groupName: String = FormValidator.defaultGroupName + public var baseValue: AnyHashable? + + public var isValid: Bool? = true { + didSet { updateUI?() } + } + + /// Temporary binding mechanism for the view to update on enable changes. + public var updateUI: ActionBlock? + + //-------------------------------------------------- + // MARK: - Initializer + //-------------------------------------------------- + + public init() {} + + //-------------------------------------------------- + // MARK: - Keys + //-------------------------------------------------- + + private enum CodingKeys: String, CodingKey { + case id + case moleculeName + case accessibilityIdentifier + case errorMessage + case enabled + case readOnly + case required + case fieldKey + case groupName + } + + //-------------------------------------------------- + // MARK: - Validation Methods + //-------------------------------------------------- + + open func formFieldValue() -> AnyHashable? { + fatalError("developer must implement") + } + + open func formFieldServerValue() -> AnyHashable? { + return formFieldValue() + } + + public func setValidity(_ valid: Bool, errorMessage: String?) { + + if let ruleErrorMessage = errorMessage, fieldKey != nil { + self.errorMessage = ruleErrorMessage + } + + self.isValid = valid + updateUI?() + } + + //-------------------------------------------------- + // MARK: - Codable + //-------------------------------------------------- + required public init(from decoder: Decoder) throws { + let typeContainer = try decoder.container(keyedBy: CodingKeys.self) + id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString + accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier) + errorMessage = try typeContainer.decodeIfPresent(String.self, forKey: .errorMessage) + enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true + required = try typeContainer.decodeIfPresent(Bool.self, forKey: .required) ?? true + readOnly = try typeContainer.decodeIfPresent(Bool.self, forKey: .readOnly) ?? false + fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey) + groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) ?? FormValidator.defaultGroupName + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(id, forKey: .id) + try container.encodeIfPresent(moleculeName, forKey: .moleculeName) + try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier) + try container.encodeIfPresent(errorMessage, forKey: .errorMessage) + try container.encodeIfPresent(fieldKey, forKey: .fieldKey) + try container.encodeIfPresent(groupName, forKey: .groupName) + try container.encode(readOnly, forKey: .readOnly) + try container.encode(enabled, forKey: .enabled) + try container.encode(required, forKey: .required) + } +}