Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks

# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj

MVMCoreUI.xcodeproj/project.pbxproj

@@ -200,6 +200,8 @@
 		AA7F32AB246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7F32AA246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift */; };
 		AA7F32AD246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7F32AC246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift */; };
 		AA85236C244435A20059CC1E /* RadioSwatchCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA85236B244435A20059CC1E /* RadioSwatchCollectionViewCell.swift */; };
+		AA9972502475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */; };
+		AA997252247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */; };
 		AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */; };
 		AAA74A192410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */; };
 		AAB7EDEF246ADA1600E54929 /* ListProgressBarThinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB7EDEE246ADA1600E54929 /* ListProgressBarThinModel.swift */; };
@@ -619,6 +621,8 @@
 		AA7F32AA246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		AA7F32AC246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAllTextAndLinks.swift; sourceTree = "<group>"; };
 		AA85236B244435A20059CC1E /* RadioSwatchCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatchCollectionViewCell.swift; sourceTree = "<group>"; };
+		AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconAllTextLinksModel.swift; sourceTree = "<group>"; };
+		AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconAllTextLinks.swift; sourceTree = "<group>"; };
 		AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyText.swift; sourceTree = "<group>"; };
 		AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyTextModel.swift; sourceTree = "<group>"; };
 		AAB7EDEE246ADA1600E54929 /* ListProgressBarThinModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListProgressBarThinModel.swift; sourceTree = "<group>"; };
@@ -1289,6 +1293,8 @@
 				0A6682A12434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift */,
 				AA7F32AA246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift */,
 				AA7F32AC246C0F8C00C965BA /* ListLeftVariableRadioButtonAllTextAndLinks.swift */,
+				AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */,
+				AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */,
 			);
 			path = LeftVariable;
 			sourceTree = "<group>";
@@ -2158,6 +2164,7 @@
 				D2E2A99623D8CF85000B42E6 /* HeadlineBodyLinkToggleModel.swift in Sources */,
 				C6FA7D5323C77A4A00A3614A /* StringAndMoleculeStack.swift in Sources */,
 				011D958524042432000E3791 /* RulesProtocol.swift in Sources */,
+				AA9972502475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift in Sources */,
 				AA69AAF62445BF5700AF3D3B /* ListLeftVariableCheckboxBodyText.swift in Sources */,
 				D264FAA3243E632F00D98315 /* ProgrammaticCollectionViewController.swift in Sources */,
 				D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */,
@@ -2252,6 +2259,7 @@
 				948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */,
 				013F801923FB4A8E00AD8013 /* UIContentMode+Extension.swift in Sources */,
 				525239C22407BD1000454969 /* ListTwoColumnPriceDetails.swift in Sources */,
+				AA997252247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift in Sources */,
 				D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */,
 				D2E2A9A323E096B1000B42E6 /* DisableableModelProtocol.swift in Sources */,
 				D29DF11821E6805F003B2FB9 /* NSLayoutConstraint+MFConvenience.m in Sources */,

MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift

@@ -322,7 +322,7 @@ import UIKit
     @objc override open func resignFirstResponder() -> Bool {
         
         if validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         
         selectedDigitBox?.isSelected = false
@@ -440,7 +440,7 @@ extension DigitEntryField {
         selectedDigitBox = nil
         
         if !switchFieldsAutomatically && validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         
         proprietorTextDelegate?.textFieldDidEndEditing?(textField)

MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift

@@ -49,6 +49,9 @@ import UIKit
     
     public var isValid: Bool = false
     
+    /// Validate on each entry in the textField. Default: true
+    public var validateEachCharacter: Bool = true
+    
     //--------------------------------------------------
     // MARK: - Computed Properties
     //--------------------------------------------------
@@ -229,6 +232,48 @@ import UIKit
         entryFieldContainer.updateView(size)
     }
     
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
+    
+    /// Validates the text of the entry field.
+    @objc public func validateText() {
+        if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
+            self.isValid = isValid
+        }
+    }
+    
+    /// Executes on .textDidBeginEditingNotification
+    @objc func startEditing() {
+        isSelected = true
+    }
+    
+    /// Executes on .textDidChangeNotification (each character entry)
+    @objc func valueChanged() {
+        guard validateEachCharacter else { return }
+    }
+    
+    /// Executes on .textDidEndEditingNotification
+    @objc func endInputing() {
+        isSelected = false
+        resignFirstResponder()
+    }
+    
+    @objc public func updateValidation(_ isValid: Bool) {
+        let previousValidity = self.isValid
+        self.isValid = isValid
+        
+        if previousValidity && !isValid {
+            shouldShowError(true)
+        } else if (!previousValidity && isValid) {
+            shouldShowError(false)
+        }
+    }
+    
+    func shouldShowError(_ showError: Bool) {
+        self.showError = showError
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
@@ -255,6 +300,18 @@ import UIKit
         
         entryFieldContainer.set(with: model, delegateObject, additionalData)
         
+        model.updateUI = { [weak self] in
+            MVMCoreDispatchUtility.performBlock(onMainThread: {
+                guard let self = self else { return }
+                
+                if self.isSelected {
+                    self.updateValidation(model.isValid ?? true)
+                } else if model.isValid ?? true && self.showError {
+                    self.showError = false
+                }
+            })
+        }
+        
         title = model.title
         feedback = model.feedback
         isEnabled = model.enabled

MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift

@@ -71,12 +71,13 @@ import Foundation
     }
     
     public func setValidity(_ valid: Bool, rule: RulesProtocol) {
-        if let fieldKey = fieldKey,
+        
-            let ruleErrorMessage = rule.errorMessage?[fieldKey] {
+        if let fieldKey = fieldKey, let ruleErrorMessage = rule.errorMessage?[fieldKey] {
             self.errorMessage = ruleErrorMessage
         }
-        self.isValid = valid
         
+        self.isValid = valid
+        updateUI?()
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift

@@ -51,9 +51,6 @@ import UIKit
     
     private var observingForChange: Bool = false
     
-    /// Validate on each entry in the textField. Default: true
-    public var validateEachCharacter: Bool = true
-    
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
     
@@ -226,7 +223,7 @@ import UIKit
     @discardableResult
     @objc override open func resignFirstResponder() -> Bool {
         if validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         textField.resignFirstResponder()
         isSelected = false
@@ -234,56 +231,37 @@ import UIKit
     }
     
     /// Validates the text of the entry field.
-    @objc public func validateTextField() {
+    @objc public override func validateText() {
         text = textField.text
-        _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
+        super.validateText()
     }
     
-    @objc public func updateValidation(_ isValid: Bool) {
-        let previousValidity = self.isValid
-        self.isValid = isValid
-        
-        if previousValidity && !isValid {
-            shouldShowError(true)
-        } else if (!previousValidity && isValid) {
-            shouldShowError(false)
-        }
-    }
-
-    func shouldShowError(_ showError: Bool) {
-        self.showError = showError
-        if showError {
-            observingTextFieldDelegate?.isValid?(textfield: self)
-            entryFieldContainer.originalUI()
-        } else {
-            observingTextFieldDelegate?.isInvalid?(textfield: self)
-        }
-    }
     /// Executes on UITextField.textDidBeginEditingNotification
-    @objc func startEditing() {
+    @objc override func startEditing() {
-        isSelected = true
+        super.startEditing()
         textField.becomeFirstResponder()
     }
     
     /// Executes on UITextField.textDidChangeNotification (each character entry)
-    @objc func valueChanged() {
+    @objc override func valueChanged() {
-        guard validateEachCharacter else { return }
+        super.valueChanged()
-        isSelected = true
+        validateText()
-        validateTextField()
     }
     
     /// Executes on UITextField.textDidEndEditingNotification
-    @objc func endInputing() {
+    @objc override func endInputing() {
-        resignFirstResponder()
+        super.endInputing()
         
         // Don't show error till user starts typing.
         guard text?.count ?? 0 != 0 else {
+            showError = false
             return
         }
 
-        if let isValid = (model as? TextEntryFieldModel)?.isValid {
+        if let isValid = textEntryFieldModel?.isValid {
             self.isValid = isValid
         }
+        
         shouldShowError(!isValid)
     }
     
@@ -311,6 +289,16 @@ import UIKit
         }
     }
     
+    override func shouldShowError(_ showError: Bool) {
+        super.shouldShowError(showError)
+        
+        if showError {
+            observingTextFieldDelegate?.isValid?(textfield: self)
+        } else {
+            observingTextFieldDelegate?.isInvalid?(textfield: self)
+        }
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
@@ -320,16 +308,6 @@ import UIKit
         
         guard let model = model as? TextEntryFieldModel else { return }
         
-        model.updateUI = { [weak self] in
-            MVMCoreDispatchUtility.performBlock(onMainThread: {
-                guard let self = self else { return }
-                
-                if self.isSelected {
-                    self.updateValidation(model.isValid ?? true)
-                }
-            })
-        }
-        
         self.delegateObject = delegateObject
         FormValidator.setupValidation(for: model, delegate: delegateObject?.formHolderDelegate)
         text = model.text

MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift

@@ -24,9 +24,6 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     // MARK: - Properties
     //--------------------------------------------------
     
-    /// Validate on each entry in the textView. Default: true
-    public var validateEachCharacter: Bool = true
-    
     private var observingForChange: Bool = false
     
     //--------------------------------------------------
@@ -71,7 +68,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// The text of this textView.
     open override var text: String? {
-        get { return textView.text }
+        get { return textViewEntryFieldModel?.text }
         set {
             textView.text = newValue
             textViewEntryFieldModel?.text = newValue
@@ -186,29 +183,37 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     //--------------------------------------------------
     
     /// Validates the text of the entry field.
-    @objc public func validateTextView() {
+    @objc public override func validateText() {
         text = textView.text
-        if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
+        super.validateText()
-            self.isValid = isValid
-        }
     }
     
     /// Executes on UITextView.textDidBeginEditingNotification
-    @objc func startEditing() {
+    @objc override func startEditing() {
-        isSelected = true
+        super.startEditing()
         _ = textView.becomeFirstResponder()
     }
     
     /// Executes on UITextView.textDidChangeNotification (each character entry)
-    @objc func valueChanged() {
+    @objc override func valueChanged() {
-        guard validateEachCharacter else { return }
+        super.valueChanged()
-        validateTextView()
+        validateText()
     }
     
     /// Executes on UITextView.textDidEndEditingNotification
-    @objc func endInputing() {
+    @objc override func endInputing() {
-        resignFirstResponder()
+        super.endInputing()
-        isSelected = false
+
+        // Don't show error till user starts typing.
+        guard text?.count ?? 0 != 0 else {
+            showError = false
+            return
+        }
+        
+        if let isValid = textViewEntryFieldModel?.isValid {
+            self.isValid = isValid
+        }
+        
         showError = !isValid
     }
     

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -146,6 +146,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonAndPaymentMethod.self, viewModelClass: ListLeftVariableRadioButtonAndPaymentMethodModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonBodyText.self, viewModelClass: ListLeftVariableRadioButtonBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableCheckboxBodyText.self, viewModelClass: ListLeftVariableCheckboxBodyTextModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconAllTextLinks.self, viewModelClass: ListLeftVariableIconAllTextLinksModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRVWheel.self, viewModelClass: ListRVWheelModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariablePayments.self, viewModelClass: ListRightVariablePaymentsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariableTotalData.self, viewModelClass: ListRightVariableTotalDataModel.self)

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift

@@ -0,0 +1,54 @@
+//
+//  ListLeftVariableIconAllTextLinks.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 20/05/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+@objcMembers open class ListLeftVariableIconAllTextLinks: TableViewCell {
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    public let leftImage = LoadImageView()
+    public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
+    public var stack: Stack<StackModel>
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftImage, model: StackItemModel(horizontalAlignment: .fill)), (view: eyebrowHeadlineBodyLink, model: StackItemModel(horizontalAlignment: .leading))], axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+   
+    //--------------------------------------------------
+    // MARK: - Life Cycle
+    //--------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        leftImage.addSizeConstraintsForAspectRatio = true
+        leftImage.imageView.contentMode = .scaleAspectFit
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Molecule
+    //------------------------------------------------------
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListLeftVariableIconAllTextLinksModel else { return }
+        leftImage.set(with: model.image, delegateObject, additionalData)
+        eyebrowHeadlineBodyLink.set(with: model.eyebrowHeadlineBodyLink, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 140
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinksModel.swift

@@ -0,0 +1,49 @@
+//
+//  ListLeftVariableIconAllTextLinksModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 20/05/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+public class ListLeftVariableIconAllTextLinksModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "listLVImgAll"
+    public var image: ImageViewModel
+    public var eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel
+    
+    override public func setDefaults() {
+        super.setDefaults()
+        if image.width == nil, image.height == nil {
+            image.width = 30
+            image.height = 30
+        }
+    }
+    
+    public init(image: ImageViewModel, eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel) {
+        self.image = image
+        self.eyebrowHeadlineBodyLink = eyebrowHeadlineBodyLink
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case image
+        case eyebrowHeadlineBodyLink
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        image = try typeContainer.decode(ImageViewModel.self, forKey: .image)
+        eyebrowHeadlineBodyLink = try typeContainer.decode(EyebrowHeadlineBodyLinkModel.self, forKey: .eyebrowHeadlineBodyLink)
+        try super.init(from: decoder)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(image, forKey: .image)
+        try container.encode(eyebrowHeadlineBodyLink, forKey: .eyebrowHeadlineBodyLink)
+    }
+}

MVMCoreUI/Atomic/Organisms/Carousel.swift

@@ -173,7 +173,7 @@ open class Carousel: View {
         numberOfPages = newMolecules.count
         molecules = newMolecules
         
-        if carouselModel?.loop ?? false && newMolecules.count > 2 {
+        if carouselModel?.loop ?? false && newMolecules.count > 1 {
             // Sets up the row data with buffer cells on each side (for illusion of endless scroll... also has one more buffer cell on each side in case we can peek that cell).
             loop = true
             

MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift

@@ -42,6 +42,11 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol {
             if let fieldValue = formField.formFieldValue() as? String,
                 compareString.caseInsensitiveCompare(fieldValue) == .orderedSame {
                 valid = true
+                for formKey in fields {
+                    guard let formField = fieldMolecules[formKey] else { continue }
+                    (formField as? FormRuleWatcherFieldProtocol)?.setValidity(true, rule: self)
+                }
+                break
             }
             
             (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)