Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unified_grid

MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift

@@ -319,12 +319,14 @@ import UIKit
         model.updateUIDynamicError = { [weak self] in
             MVMCoreDispatchUtility.performBlock(onMainThread: {
                 guard let self = self else { return }
+                
                 let validState = model.isValid ?? false
-                self.updateValidation(validState)
                 if !validState && model.shouldClearText {
                     self.text = ""
                     model.shouldClearText = false
                 }
+                _ = FormValidator.validate(delegate: self.delegateObject?.formHolderDelegate)
+                self.updateValidation(validState)
             })
         }
         

MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift

@@ -147,6 +147,16 @@ import MVMCore
         MVMCoreNavigationHandler.shared()?.present(picker, animated: true)
     }
     
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        
+        textField.keyboardType = .phonePad
+    }
+    
     //--------------------------------------------------
     // MARK: - Contact Picker Delegate
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift

@@ -200,6 +200,7 @@ import UIKit
     open override func reset() {
         super.reset()
         
+        textField.isSecureTextEntry = false
         textField.font = Styler.Font.RegularBodyLarge.getFont()
     }
     
@@ -350,7 +351,8 @@ import UIKit
         case .phone:
             textField.keyboardType = .phonePad
             
-        default: break
+        default:
+            textField.keyboardType = .default
         }
         
         // Override the preset keyboard set in type.
@@ -364,6 +366,12 @@ import UIKit
         setupTextFieldToolbar()
         
         if isSelected { startEditing() }
+        
+        //Added to override text when view is reloaded.
+        if let text = model.text, !text.isEmpty {
+            regexTextFieldOutputIfAvailable()
+        }
+        
     }
 }
 

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -624,9 +624,6 @@ public typealias ActionBlock = () -> ()
         } else if !MVMCoreGetterUtility.fequal(a: Float(standardFontSize), b: 0.0), let sizeObject = sizeObject ?? MFStyler.sizeObjectGeneric(forCurrentDevice: standardFontSize) {
             font = font.updateSize(sizeObject.getValueBased(onSize: size))
         }
-        
-        // Provide the label additional size information to help calculate its intrinsic content.
-        preferredMaxLayoutWidth = Styler.maxAvailableLayoutWidth(size: size)
     }
     
     @objc public func setFont(_ font: UIFont, scale: Bool) {
@@ -688,7 +685,7 @@ public typealias ActionBlock = () -> ()
     static func getTextAttachmentImage(name: String = "externalLink", dimension: CGFloat) -> NSTextAttachment {
         
         let imageAttachment = NSTextAttachment()
-        imageAttachment.image = MVMCoreUIUtility.imageNamed(name)
+        imageAttachment.image = MVMCoreCache.shared()?.getImageFromRegisteredBundles(name)
         imageAttachment.bounds = CGRect(x: 0, y: 0, width: dimension, height: dimension)
         
         return imageAttachment

MVMCoreUI/Atomic/Atoms/Views/WebView.swift

@@ -16,8 +16,8 @@ import WebKit
     var webviewModel: WebViewModel? {
         return model as? WebViewModel
     }
-    var webView: WKWebView?
+    open var webView: WKWebView?
-    var overLayer = MVMCoreUICommonViewsUtility.commonView()
+    open var overLayer = MVMCoreUICommonViewsUtility.commonView()
     public let loadingSpinner = MFLoadingSpinner(frame: .zero)
     var delegateObject: MVMCoreUIDelegateObject?
     var webViewHeight: NSLayoutConstraint?

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -9,9 +9,6 @@
 import Foundation
 
 @objcMembers public class MoleculeObjectMapping: NSObject {
-    
-    public var moleculeMapping: [String: MoleculeViewProtocol.Type] = [:]
-
     /// Returns the mapping object stored in the singleton
     public static func shared() -> Self? {
         return MVMCoreActionUtility.initializerClassCheck(CoreUIObject.sharedInstance()?.moleculeMap, classToVerify: self) as? Self
@@ -19,18 +16,17 @@ import Foundation
     
     /// Registers the model with the model registry and the view with the mapper.
     public func register<M: ModelProtocol, V: MoleculeViewProtocol>(viewClass: V.Type, viewModelClass: M.Type) {
-        try? ModelRegistry.register(viewModelClass)
+        try? ModelRegistry.register(handler: viewClass, for: viewModelClass)
-        moleculeMapping.updateValue(viewClass, forKey: viewModelClass.identifier)
     }
 
     /// Returns the type of molecule view for the given model
     public func getMoleculeClass(_ model: MoleculeModelProtocol) -> MoleculeViewProtocol.Type? {
-        return moleculeMapping[model.moleculeName]
+        return ModelRegistry.getHandler(model) as? MoleculeViewProtocol.Type
     }
 
     /// Creates a molecule with the given model.
     public func createMolecule(_ model: MoleculeModelProtocol, delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> MoleculeViewProtocol? {
-        guard let type = moleculeMapping[model.moleculeName] else { return nil }
+        guard let type = getMoleculeClass(model) else { return nil }
         return type.init(model: model, delegateObject, additionalData)
     }
     
@@ -286,3 +282,4 @@ import Foundation
         }
     }
 }
+

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

@@ -12,7 +12,7 @@
     //--------------------------------------------------
     
     public let leftImage = LoadImageView(pinnedEdges: .all)
-    public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink()
+    public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(spacing: 2.0)
     public let rightLabel = Label(fontStyle: .RegularBodySmall)
     
     public lazy var rightLabelStackItem: StackItem = {

MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift

@@ -21,6 +21,9 @@ import Foundation
     public var peakingUI: Bool?
     public var peakingArrowColor: Color?
     public var analyticsData: JSONValueDictionary?
+    public var fieldValue: String?
+    
+    public func formFieldValue() -> AnyHashable? { return fieldValue }
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -30,6 +33,7 @@ import Foundation
         case peakingUI
         case peakingArrowColor
         case analyticsData
+        case fieldValue
     }
 
     //--------------------------------------------------
@@ -41,6 +45,7 @@ import Foundation
         peakingUI = try typeContainer.decodeIfPresent(Bool.self, forKey: .peakingUI)
         peakingArrowColor = try typeContainer.decodeIfPresent(Color.self, forKey: .peakingArrowColor)
         analyticsData = try typeContainer.decodeIfPresent(JSONValueDictionary.self, forKey: .analyticsData)
+        fieldValue = try typeContainer.decodeIfPresent(String.self, forKey: .fieldValue)
         try super.init(from: decoder)
     }
 
@@ -50,5 +55,6 @@ import Foundation
         try container.encodeIfPresent(peakingUI, forKey: .peakingUI)
         try container.encodeIfPresent(peakingArrowColor, forKey: .peakingArrowColor)
         try container.encodeIfPresent(analyticsData, forKey: .analyticsData)
+        try container.encodeIfPresent(fieldValue, forKey: .fieldValue)
     }
 }

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift

@@ -22,6 +22,16 @@
         get { return model as? EyebrowHeadlineBodyLinkModel }
     }
     
+    //--------------------------------------------------
+    // MARK: - Initialization
+    //--------------------------------------------------
+    
+    public convenience init(spacing: CGFloat) {
+        self.init(frame: .zero)
+        stack.stackModel?.spacing = spacing
+        stack.restack()
+    }
+    
     //--------------------------------------------------
     // MARK: - MFViewProtocol
     //--------------------------------------------------

MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift

@@ -167,12 +167,17 @@ open class Carousel: View {
         
         registerCells(with: carouselModel, delegateObject: delegateObject)
         prepareMolecules(with: carouselModel)
+        FormValidator.setupValidation(for: carouselModel, delegate: delegateObject?.formHolderDelegate)
 
         setupPagingMolecule(carouselModel.pagingMolecule, delegateObject: delegateObject)
         
         pageIndex = carouselModel.index
         pagingView?.currentIndex = carouselModel.index
         collectionView.reloadData()
+        if let selectedIndex = carouselModel.selectedIndex {
+            let adjustedIndex = loop ? selectedIndex + 2 : selectedIndex
+            collectionView.selectItem(at: IndexPath(row: adjustedIndex, section: 0), animated: false, scrollPosition: [])
+        }
     }
     
     //--------------------------------------------------
@@ -391,8 +396,25 @@ extension Carousel: UICollectionViewDataSource {
 }
 
 extension Carousel: UICollectionViewDelegate {
+    public func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+        guard let cell = collectionView.cellForItem(at: indexPath) as? CollectionTemplateItemProtocol else { return false }
+        return cell.shouldSelect(at: indexPath, delegateObject: delegateObject, additionalData: nil)
+    }
+    
     open func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        (collectionView.cellForItem(at: indexPath) as? CollectionTemplateItemProtocol)?.didSelectCell(at: indexPath, delegateObject: delegateObject, additionalData: nil)
+        // Set the selection in the model
+        if let model = model as? CarouselModel {
+            // Adjust for looping
+            var adjustedIndex = loop ? indexPath.row - 2 : indexPath.row
+            if adjustedIndex < 0 {
+                adjustedIndex = adjustedIndex + numberOfPages
+            }
+            model.selectedIndex =  adjustedIndex
+        }
+        if let cell = collectionView.cellForItem(at: indexPath) as? CollectionTemplateItemProtocol {
+            cell.didSelectCell(at: indexPath, delegateObject: delegateObject, additionalData: nil)
+        }
+        _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
     }
 }
 
@@ -414,6 +436,7 @@ extension Carousel: UIScrollViewDelegate {
         if !animated {
             scrollViewDidEndScrollingAnimation(collectionView)
         }
+        _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
     }
     
     /// Adjusts the current contentOffset if we are going onto buffer cells while looping to help with the endless scrolling appearance.

MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift

@@ -9,7 +9,8 @@
 import UIKit
 
 
-@objcMembers public class CarouselModel: MoleculeModelProtocol {
+@objcMembers public class CarouselModel: MoleculeModelProtocol, FormFieldProtocol {
+    
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -33,11 +34,31 @@ import UIKit
     public var leftPadding: CGFloat?
     public var rightPadding: CGFloat?
     public var accessibilityText: String?
-
+    public var baseValue: AnyHashable?
+    public var fieldKey: String?
+    public var groupName: String = FormValidator.defaultGroupName
+    
+    public var selectable = false
+    public var selectedIndex: Int?
+    
     public init(molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]) {
         self.molecules = molecules
     }
     
+    public func formFieldValue() -> AnyHashable? {
+        guard selectable else {
+            // Use visible item value, else index
+            if let fieldValue = molecules[index].formFieldValue() {
+                return fieldValue
+            }
+            return index
+        }
+        // Use selected item value, else index
+        guard let selectedIndex = selectedIndex else { return nil }
+        guard let fieldValue = molecules[selectedIndex].formFieldValue() else { return selectedIndex }
+        return fieldValue
+    }
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------
@@ -59,6 +80,10 @@ import UIKit
         case leftPadding
         case rightPadding
         case accessibilityText
+        case groupName
+        case fieldKey
+        case selectable
+        case selectedIndex
     }
     
     //--------------------------------------------------
@@ -69,6 +94,8 @@ import UIKit
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         molecules = try typeContainer.decodeModels(codingKey: .molecules)
         index = try typeContainer.decodeIfPresent(Int.self, forKey: .index) ?? 0
+        selectable = try typeContainer.decodeIfPresent(Bool.self, forKey: .selectable) ?? false
+        selectedIndex = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         spacing = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .spacing)
         border = try typeContainer.decodeIfPresent(Bool.self, forKey: .border)
@@ -86,6 +113,11 @@ import UIKit
         leftPadding = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .leftPadding)
         rightPadding = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .rightPadding)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
+        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
+        if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
+            self.groupName = groupName
+        }
+        baseValue = formFieldValue()
    }
 
    public func encode(to encoder: Encoder) throws {
@@ -105,5 +137,10 @@ import UIKit
         try container.encodeIfPresent(leftPadding, forKey: .leftPadding)
         try container.encodeIfPresent(rightPadding, forKey: .rightPadding)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
+        try container.encode(groupName, forKey: .groupName)
+        try container.encode(index, forKey: .index)
+        try container.encode(selectable, forKey: .selectable)
+        try container.encode(selectedIndex, forKey: .selectedIndex)
     }
 }

MVMCoreUI/Atomic/Organisms/Stack.swift

@@ -199,7 +199,7 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
         }
         var name = "stack<"
         for case let item in model.molecules {
-            if let moleculeClass = MoleculeObjectMapping.shared()?.moleculeMapping[item.moleculeName],
+            if let moleculeClass = MoleculeObjectMapping.shared()?.getMoleculeClass(item),
                 let nameForReuse = moleculeClass.nameForReuse(with: item, delegateObject) {
                 name.append(nameForReuse + ",")
             } else {

MVMCoreUI/Atomic/Protocols/ModelProtocols/CarouselItemModelProtocol.swift

@@ -11,11 +11,14 @@ import Foundation
 
 public protocol CarouselItemModelProtocol: ContainerModelProtocol {
     var analyticsData: JSONValueDictionary? { get set }
+    func formFieldValue() -> AnyHashable?
 }
+
 public extension CarouselItemModelProtocol {
     
     var analyticsData: JSONValueDictionary?  {
         get { return nil }
         set { analyticsData = newValue }
     }
+    func formFieldValue() -> AnyHashable? { return nil }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift

@@ -14,7 +14,7 @@ public protocol MoleculeModelProtocol: ModelProtocol, AccessibilityModelProtocol
 
 public extension MoleculeModelProtocol {
     
-    var moleculeName: String { Self.identifier }
+    var moleculeName: String { type(of: self).identifier }
     
     static var categoryName: String { "\(MoleculeModelProtocol.self)" }
     

MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift

@@ -9,7 +9,7 @@
 import UIKit
 import MVMCore.MVMCoreViewProtocol
 
-public protocol MoleculeViewProtocol: UIView {
+public protocol MoleculeViewProtocol: UIView, ModelHandlerProtocol {
     
     /// Initializes the view with the model
     init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?)
@@ -31,6 +31,7 @@ public protocol MoleculeViewProtocol: UIView {
 }
 
 extension MoleculeViewProtocol {
+    
     /// Calls set with model
     public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         self.init(frame: .zero)

MVMCoreUI/Atomic/Templates/CollectionTemplateItemProtocol.swift

@@ -19,6 +19,9 @@ public protocol CollectionTemplateItemProtocol: UICollectionViewCell {
 
     /// Called when the cell will display.
     func willDisplay()
+    
+    /// Handle the selection of cell
+    func shouldSelect(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Bool
 }
 
 // Default implementation does nothing
@@ -26,4 +29,8 @@ extension CollectionTemplateItemProtocol {
     public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {}
 
     public func willDisplay() {}
+    
+    public func shouldSelect(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Bool {
+        return false
+    }
 }

MVMCoreUI/BaseClasses/CollectionViewCell.swift

@@ -116,11 +116,15 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     
     // MARK: - Override
     
-    open func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+    open func shouldSelect(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Bool {
-        guard let action = model?.action else { return }
+        if let action = model?.action {
-        Button.performButtonAction(with: action, button: self, delegateObject: delegateObject, additionalData: additionalData)
+            Button.performButtonAction(with: action, button: self, delegateObject: delegateObject, additionalData: additionalData)
+        }
+        return false
     }
     
+    open func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {}
+    
     // Column logic, set width.
     override open func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let autoLayoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)

MVMCoreUI/BaseControllers/ViewController.swift

@@ -461,7 +461,7 @@ import UIKit
     open func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) {
         addFormParams(requestParameters)
         requestParameters.parentPageType = loadObject?.pageJSON?.optionalStringForKey("parentPageType")
-        MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, additionalData: additionalData, delegateObject: delegateObject())
+        MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, actionInformation: actionInformation, additionalData: additionalData, delegateObject: delegateObject())
     }
     
     open func logAction(withActionInformation actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Utility/MVMCoreUIUtility.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Getters
 
-//Returns localized imageName
+// Returns localized imageName
 + (nullable NSString *)localizedImageName:(nullable NSString *)imageName;
 
 // The bundle for this framework

MVMCoreUI/Utility/MVMCoreUIUtility.m

@@ -23,24 +23,14 @@
     return [NSBundle bundleWithIdentifier:@"com.vzw.MVMCoreUI"];
 }
 
-+ (BOOL)userPrefersSpanish {
-    // This should be enough for us to look at what the user prefers.
-    NSString *preference = [[[[NSLocale preferredLanguages] objectAtIndex:0] substringToIndex:2] lowercaseString];
-    return [preference isEqualToString:@"es"] || [preference isEqualToString:@"es-mx"];
-}
-
 + (nullable NSString *)hardcodedStringWithKey:(nonnull NSString *)key {
-    // If the app language is not english... force load from the english file anyway.
+    // Redirect key with relevant module.
-    if ([MVMCoreUIUtility userPrefersSpanish]) {
+    return [MVMCoreGetterUtility hardcodedStringWithKey:key bundle:[MVMCoreUIUtility bundleForMVMCoreUI]];
-        return [[NSBundle bundleWithPath:[[MVMCoreUIUtility bundleForMVMCoreUI] pathForResource:@"es" ofType:@"lproj"]] localizedStringForKey:key value:@"" table:nil];
-    } else {
-        return [[NSBundle bundleWithPath:[[MVMCoreUIUtility bundleForMVMCoreUI] pathForResource:@"en" ofType:@"lproj"]] localizedStringForKey:key value:@"" table:nil];
-    }
 }
 
 + (nullable NSString *)localizedImageName:(nullable NSString *)imageName {
     if (imageName.length > 0) {
-        if ([MVMCoreUIUtility userPrefersSpanish]) {
+        if ([MVMCoreGetterUtility userPrefersSpanish]) {
             imageName = [NSString stringWithFormat:@"%@_es", imageName];
         } else {
             imageName = [NSString stringWithFormat:@"%@_en", imageName];