EntryField Models. Updated dropdown for new dropdown.

MVMCoreUI.xcodeproj/project.pbxproj

@@ -15,7 +15,6 @@
 		0116A4E5228B19640094F3ED /* RadioButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0116A4E4228B19640094F3ED /* RadioButtonModel.swift */; };
 		011B58F023A2AA980085F53C /* ListItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011B58EF23A2AA980085F53C /* ListItemModelProtocol.swift */; };
 		011B58F223A2AE2C0085F53C /* DropDownListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011B58F123A2AE2C0085F53C /* DropDownListItemModel.swift */; };
-		011B58F423A2CCC80085F53C /* DropDownModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011B58F323A2CCC80085F53C /* DropDownModel.swift */; };
 		012A889C23889E8400FE3DA1 /* TemplateModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A889B23889E8400FE3DA1 /* TemplateModelProtocol.swift */; };
 		012A88AD238C418100FE3DA1 /* TemplateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */; };
 		012A88B1238C880100FE3DA1 /* CarouselPagingModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88B0238C880100FE3DA1 /* CarouselPagingModelProtocol.swift */; };
@@ -83,6 +82,13 @@
 		0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */; };
 		0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */; };
 		0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */; };
+		0A7EF85B23D8A52800B2AAD1 /* EntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */; };
+		0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */; };
+		0A7EF85F23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */; };
+		0A7EF86123D8AC2500B2AAD1 /* DigitEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF86023D8AC2500B2AAD1 /* DigitEntryFieldModel.swift */; };
+		0A7EF86323D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF86223D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift */; };
+		0A7EF86523D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */; };
+		0A7EF86723D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF86623D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift */; };
 		0AA33B3A2398524F0067DD0F /* Toggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AA33B392398524F0067DD0F /* Toggle.swift */; };
 		0ABD136B237B193A0081388D /* EntryFieldContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ABD136A237B193A0081388D /* EntryFieldContainer.swift */; };
 		0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */; };
@@ -148,7 +154,6 @@
 		D260D7B622D68514007E7233 /* MVMCoreUIPagingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D268C70C2386DFFD007F2C1C /* MoleculeStackItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368A23609801006832FA /* MoleculeStackItemModel.swift */; };
 		D268C70E238C22D7007F2C1C /* DropDownFilterTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D268C70D238C22D7007F2C1C /* DropDownFilterTableViewCell.swift */; };
-		D268C712238D6699007F2C1C /* DropDown.swift in Sources */ = {isa = PBXBuildFile; fileRef = D268C711238D6699007F2C1C /* DropDown.swift */; };
 		D274CA332236A78900B01B62 /* FooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D274CA322236A78900B01B62 /* FooterView.swift */; };
 		D2755D7B23689C7500485468 /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2755D7A23689C7500485468 /* TableViewCell.swift */; };
 		D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */; };
@@ -318,7 +323,6 @@
 		0116A4E4228B19640094F3ED /* RadioButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonModel.swift; sourceTree = "<group>"; };
 		011B58EF23A2AA980085F53C /* ListItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListItemModelProtocol.swift; sourceTree = "<group>"; };
 		011B58F123A2AE2C0085F53C /* DropDownListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDownListItemModel.swift; sourceTree = "<group>"; };
-		011B58F323A2CCC80085F53C /* DropDownModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDownModel.swift; sourceTree = "<group>"; };
 		012A889B23889E8400FE3DA1 /* TemplateModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateModelProtocol.swift; sourceTree = "<group>"; };
 		012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateProtocol.swift; sourceTree = "<group>"; };
 		012A88AE238C626E00FE3DA1 /* CarouselModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselModel.swift; sourceTree = "<group>"; };
@@ -375,6 +379,13 @@
 		0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
 		0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
 		0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxWithLabelView.swift; sourceTree = "<group>"; };
+		0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MdnEntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF86023D8AC2500B2AAD1 /* DigitEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DigitEntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF86223D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseDropdownEntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemDropdownEntryFieldModel.swift; sourceTree = "<group>"; };
+		0A7EF86623D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateDropdownEntryFieldModel.swift; sourceTree = "<group>"; };
 		0A8321AE2355FE9500CB7F00 /* DigitBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DigitBox.swift; sourceTree = "<group>"; };
 		0AA33B33239813C50067DD0F /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
 		0AA33B392398524F0067DD0F /* Toggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toggle.swift; sourceTree = "<group>"; };
@@ -440,7 +451,6 @@
 		D260D7B022D65BDD007E7233 /* MVMCoreUIPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIPageControl.m; sourceTree = "<group>"; };
 		D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIPagingProtocol.h; sourceTree = "<group>"; };
 		D268C70D238C22D7007F2C1C /* DropDownFilterTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropDownFilterTableViewCell.swift; sourceTree = "<group>"; };
-		D268C711238D6699007F2C1C /* DropDown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDown.swift; sourceTree = "<group>"; };
 		D274CA322236A78900B01B62 /* FooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterView.swift; sourceTree = "<group>"; };
 		D2755D7A23689C7500485468 /* TableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
 		D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsTableViewCell.swift; sourceTree = "<group>"; };
@@ -1138,8 +1148,6 @@
 				D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */,
 				017BEB7A236763000024EF95 /* LineModel.swift */,
 				D213347623843825008E41B3 /* Line.swift */,
-				011B58F323A2CCC80085F53C /* DropDownModel.swift */,
-				D268C711238D6699007F2C1C /* DropDown.swift */,
 				DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
 				94C2D9822386F3E30006CF46 /* Label */,
 				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
@@ -1161,13 +1169,20 @@
 			children = (
 				017BEB3F23620A230024EF95 /* TextFieldModel.swift */,
 				0A41BA7E23453A6400D4C0BC /* TextEntryField.swift */,
+				0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */,
 				0A8321AE2355FE9500CB7F00 /* DigitBox.swift */,
 				0A21DB7E235DECC500C160A2 /* EntryField.swift */,
+				0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */,
 				0A21DB82235DFBC500C160A2 /* MdnEntryField.swift */,
+				0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */,
 				0A21DB93235E24ED00C160A2 /* DigitEntryField.swift */,
+				0A7EF86023D8AC2500B2AAD1 /* DigitEntryFieldModel.swift */,
 				0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */,
+				0A7EF86223D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift */,
 				0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */,
+				0A7EF86623D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift */,
 				0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */,
+				0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */,
 				012CA9992384A687003F810F /* MFTextField+ModelExtension.swift */,
 			);
 			path = TextFields;
@@ -1500,6 +1515,7 @@
 				0AA33B3A2398524F0067DD0F /* Toggle.swift in Sources */,
 				D29DF12F21E6851E003B2FB9 /* MVMCoreUITopAlertMainView.m in Sources */,
 				012A88C8238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift in Sources */,
+				0A7EF86123D8AC2500B2AAD1 /* DigitEntryFieldModel.swift in Sources */,
 				DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */,
 				D224798C231450C8003FCCF9 /* HeadlineBodySwitch.swift in Sources */,
 				017BEB442362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift in Sources */,
@@ -1554,24 +1570,29 @@
 				D268C70C2386DFFD007F2C1C /* MoleculeStackItemModel.swift in Sources */,
 				DBEFFA04225A829700230692 /* Label.swift in Sources */,
 				D2D6CD4022E78C1A00D701B8 /* Scroller.swift in Sources */,
+				0A7EF85F23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift in Sources */,
 				01509D952327ED1900EF99AA /* HeadlineBodyTextButtonSwitch.swift in Sources */,
 				D260105523CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift in Sources */,
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
 				0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */,
+				0A7EF85B23D8A52800B2AAD1 /* EntryFieldModel.swift in Sources */,
 				0A1B4A96233BB18F005B3FB4 /* CheckboxWithLabelView.swift in Sources */,
 				0A21DB8B235E06EF00C160A2 /* MFDigitTextBox.m in Sources */,
 				D260D7B222D65BDD007E7233 /* MVMCoreUIPageControl.m in Sources */,
 				D2B18B812360945C00A9AEDC /* View.swift in Sources */,
 				C6FA7D5423C77A4A00A3614A /* NumberedList.swift in Sources */,
 				D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */,
+				0A7EF86723D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift in Sources */,
 				D260105323CEA61600764D80 /* ToggleModel.swift in Sources */,
 				014AA72523C501E2006F3E93 /* ContainerModel.swift in Sources */,
+				0A7EF86523D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift in Sources */,
 				D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */,
 				D22479942316AE5E003FCCF9 /* NSLayoutConstraintExtension.swift in Sources */,
 				D2B18B94236214AD00A9AEDC /* NavigationController.swift in Sources */,
 				D29E28DA23D21AFA00ACEA85 /* StringAndMoleculeModel.swift in Sources */,
 				D282AACB2243C61700C46919 /* ButtonView.swift in Sources */,
 				D260105D23D0BCD400764D80 /* Stack.swift in Sources */,
+				0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */,
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
 				0105618F224BBE7700E1557D /* FormValidator+FormParams.swift in Sources */,
@@ -1651,7 +1672,6 @@
 				D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */,
 				D29DF11821E6805F003B2FB9 /* NSLayoutConstraint+MFConvenience.m in Sources */,
 				94C2D9A323872C110006CF46 /* LabelAttributeStrikeThroughModel.swift in Sources */,
-				011B58F423A2CCC80085F53C /* DropDownModel.swift in Sources */,
 				D28A838523CCCA8900DFE4FC /* ScrollerModel.swift in Sources */,
 				D29DF26C21E6AA0B003B2FB9 /* FLAnimatedImage.m in Sources */,
 				D28A839123CD4FD400DFE4FC /* CornerLabelsModel.swift in Sources */,
@@ -1662,12 +1682,12 @@
 				DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */,
 				0198F7A82256A80B0066C936 /* MFRadioButton.m in Sources */,
 				0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */,
-				D268C712238D6699007F2C1C /* DropDown.swift in Sources */,
 				0A41BA6E2344FCD400D4C0BC /* CATransaction+Extension.swift in Sources */,
 				C7192E7D23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift in Sources */,
 				D29DF13221E6851E003B2FB9 /* MVMCoreUITopAlertBaseView.m in Sources */,
 				D29DF29C21E7ADB9003B2FB9 /* MFProgrammaticTableViewController.m in Sources */,
 				0105618E224BBE7700E1557D /* FormValidator+TextFields.swift in Sources */,
+				0A7EF86323D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift in Sources */,
 				0A1214A022C11A18007C7030 /* ActionDetailWithImage.swift in Sources */,
 				D2B18B922361E65A00A9AEDC /* CoreUIObject.swift in Sources */,
 				D29DF2BE21E7BEA4003B2FB9 /* TopTabbar.m in Sources */,

MVMCoreUI/Atoms/TextFields/BaseDropdownEntryField.swift

@@ -68,6 +68,12 @@ import UIKit
         container.trailingAnchor.constraint(equalTo: dropDownCaretView.trailingAnchor, constant: 16).isActive = true
         dropDownCaretView.centerYAnchor.constraint(equalTo: container.centerYAnchor).isActive = true
     }
+    
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        
+        dropDownCaretView.setWithModel(model, delegateObject, additionalData)
+    }
 }
 
 // MARK: - MVMCoreUIMoleculeViewProtocol

MVMCoreUI/Atoms/TextFields/BaseDropdownEntryFieldModel.swift

@@ -0,0 +1,18 @@
+//
+//  BaseDropdownEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+@objcMembers public class BaseDropdownEntryFieldModel: TextEntryFieldModel {
+    
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return ""
+    }
+}

MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift

@@ -112,6 +112,16 @@ import UIKit
         
         return formatter
     }
+    
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        
+        guard let model = model as? DateDropdownEntryFieldModel else { return }
+        
+        if let dateFormat = model.dateFormat {
+            self.dateFormat = dateFormat
+        }
+    }
 }
 
 // MARK: - MVMCoreUIMoleculeViewProtocol

MVMCoreUI/Atoms/TextFields/DateDropdownEntryFieldModel.swift

@@ -0,0 +1,43 @@
+//
+//  DateDropdownEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+@objcMembers public class DateDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return "DateDropdownEntryField"
+    }
+    
+    public var dateFormat: String?
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case dateFormat
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        try super.init(from: decoder)
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        dateFormat = try typeContainer.decodeIfPresent(String.self, forKey: .dateFormat)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(dateFormat, forKey: .dateFormat)
+    }
+}

MVMCoreUI/Atoms/TextFields/DigitEntryField.swift

@@ -327,6 +327,22 @@ import UIKit
             }
         }
     }
+    
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        
+        guard let model = model as? DigitEntryFieldModel else { return }
+        
+        numberOfDigits = model.digits ?? 4
+        
+        if let secureEntry = model.secureEntry, secureEntry {
+            setAsSecureTextEntry(true)
+        }
+        
+        for digitBox in digitBoxes {
+            MVMCoreUICommonViewsUtility.addDismissToolbar(digitBox.digitField, delegate: delegateObject as? UITextFieldDelegate)
+        }
+    }
 }
 
 // MARK: - TextField Delegate

MVMCoreUI/Atoms/TextFields/DigitEntryFieldModel.swift

@@ -0,0 +1,49 @@
+//
+//  DigitEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+
+@objcMembers public class DigitEntryFieldModel: TextEntryFieldModel {
+    
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return "DigitEntryField"
+    }
+    
+    public var digits: Int?
+    public var secureEntry: Bool?
+
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case digits
+        case secureEntry
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        try super.init(from: decoder)
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        digits = try typeContainer.decodeIfPresent(Int.self, forKey: .digits)
+        secureEntry = try typeContainer.decodeIfPresent(Bool.self, forKey: .secureEntry)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(digits, forKey: .digits)
+        try container.encodeIfPresent(secureEntry, forKey: .secureEntry)
+    }
+}

MVMCoreUI/Atoms/TextFields/EntryField.swift

@@ -238,6 +238,43 @@ import UIKit
         feedbackLabel.textColor = .black
         entryFieldContainer.reset()
     }
+    
+    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        self.delegateObject = delegateObject
+        
+        guard let model = model as? EntryFieldModel else { return }
+        
+        entryFieldContainer.setWithModel(model, delegateObject, additionalData)
+        
+        if let title = model.title {
+            self.title = title
+        }
+        
+        if let isDisabled = model.isDisabled {
+            self.isEnabled = isDisabled
+        }
+        
+        if let feedback = model.feedback {
+            self.feedback = feedback
+        }
+        
+        if let errorMessage = model.errorMessage {
+            self.errorMessage = errorMessage
+        }
+        
+        if let isLocked = model.isLocked {
+            self.isLocked = isLocked
+        }
+        
+        if let isSelected = model.isSelected {
+            self.isSelected = isSelected
+        }
+        
+        if let fieldKey = model.fieldKey {
+            self.fieldKey = fieldKey
+        }
+    }
 }
 
 // MARK: - MVMCoreUIMoleculeViewProtocol

MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift

@@ -0,0 +1,74 @@
+//
+//  EntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+
+@objcMembers public class EntryFieldModel: MoleculeModelProtocol {
+    
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public class var identifier: String {
+        return ""
+    }
+    
+    public var backgroundColor: Color?
+    public var title: String?
+    public var feedback: String?
+    public var errorMessage: String?
+    public var isDisabled: Bool?
+    public var isLocked: Bool?
+    public var isSelected: Bool?
+    
+    public var fieldKey: String?
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case backgroundColor
+        case title
+        case isDisabled
+        case feedback
+        case errorMessage
+        case isLocked
+        case isSelected
+        case fieldKey
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
+        feedback = try typeContainer.decodeIfPresent(String.self, forKey: .feedback)
+        errorMessage = try typeContainer.decodeIfPresent(String.self, forKey: .errorMessage)
+        isDisabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .isDisabled)
+        isLocked = try typeContainer.decodeIfPresent(Bool.self, forKey: .isLocked)
+        isSelected = try typeContainer.decodeIfPresent(Bool.self, forKey: .isSelected)
+        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
+        try container.encodeIfPresent(title, forKey: .title)
+        try container.encodeIfPresent(feedback, forKey: .feedback)
+        try container.encodeIfPresent(errorMessage, forKey: .errorMessage)
+        try container.encodeIfPresent(isDisabled, forKey: .isDisabled)
+        try container.encodeIfPresent(isLocked, forKey: .isLocked)
+        try container.encodeIfPresent(isSelected, forKey: .isSelected)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
+    }
+}

MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift

@@ -21,7 +21,7 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
     public var setInitialValueInTextField = true
     
     /// Closure passed here will run as picker changes items.
-    public var observeDropdownChange: ((String)->())?
+    public var observeDropdownChange: ((String, String)->())?
     
     /// Closure passed here will run upon dismissing the selection picker.
     public var observeDropdownSelection: ((String)->())?
@@ -90,6 +90,17 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
             observeDropdownSelection?(pickerData[pickerIndex])
         }
     }
+    
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        
+        guard let model = model as? ItemDropdownEntryFieldModel else { return }
+        
+        if let options = model.options {
+            pickerData = options
+            setPickerDelegates(delegate: self)
+        }
+    }
 }
 
 // MARK:- Base Picker Delegate
@@ -108,8 +119,8 @@ extension ItemDropdownEntryField: UIPickerViewDelegate, UIPickerViewDataSource {
     }
     
     @objc public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        observeDropdownChange?(text ?? "", pickerData[row])
         text = pickerData[row]
-        observeDropdownChange?(pickerData[row])
     }
 }
 

MVMCoreUI/Atoms/TextFields/ItemDropdownEntryFieldModel.swift

@@ -0,0 +1,43 @@
+//
+//  ItemDropdownEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+@objcMembers public class ItemDropdownEntryFieldModel: BaseDropdownEntryFieldModel {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return "ItemDropdownEntryField"
+    }
+    
+    public var options: [String]?
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case options
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        try super.init(from: decoder)
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        options = try typeContainer.decodeIfPresent([String].self, forKey: .options)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(options, forKey: .options)
+    }
+}

MVMCoreUI/Atoms/TextFields/MdnEntryFieldModel.swift

@@ -0,0 +1,17 @@
+//
+//  MdnEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+@objcMembers public class MdnEntryFieldModel: TextEntryFieldModel {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return "MdnEntryField"
+    }
+}

MVMCoreUI/Atoms/TextFields/TextEntryField.swift

@@ -270,6 +270,62 @@ import UIKit
         
         resignFirstResponder()
     }
+    
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        
+        guard let model = model as? TextEntryFieldModel else { return }
+        
+        FormValidator.setupValidation(molecule: self, delegate: delegateObject?.formValidationProtocol)
+        
+        if let enabledTextColor = model.enabledTextColor {
+            textColor.enabled = enabledTextColor.uiColor
+        }
+        
+        if let disabledTextColor = model.disabledTextColor {
+            textColor.disabled = disabledTextColor.uiColor
+        }
+        
+        if let text = model.text {
+            self.text = text
+        }
+        
+        if let placeholder = model.placeholder {
+            self.placeholder = placeholder
+        }
+        
+        switch model.type {
+        case "password":
+            textField.isSecureTextEntry = true
+            
+        case "number":
+            textField.keyboardType = .numberPad
+            
+        case "email":
+            textField.keyboardType = .emailAddress
+            
+        default:
+            break
+        }
+        
+        let regex = model.regex ?? ""
+        
+        if !regex.isEmpty {
+            validationBlock = { enteredValue in
+                guard let value = enteredValue else { return false }
+                return MVMCoreUIUtility.validate(value, withRegularExpression: regex)
+            }
+        } else {
+            defaultValidationBlock()
+        }
+        
+        if let formValidationProtocol = delegateObject?.formValidationProtocol {
+            observingTextFieldDelegate = FormValidator.getFormValidatorFor(delegate: formValidationProtocol)
+        }
+        
+        uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
+        MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: uiTextFieldDelegate)
+    }
 }
 
 // MARK: - MVMCoreUIMoleculeViewProtocol

MVMCoreUI/Atoms/TextFields/TextEntryFieldModel.swift

@@ -0,0 +1,65 @@
+//
+//  TextEntryFieldModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 1/22/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+
+@objcMembers public class TextEntryFieldModel: EntryFieldModel {
+    
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public override class var identifier: String {
+        return "TextEntryField"
+    }
+    
+    public var text: String?
+    public var placeholder: String?
+    public var enabledTextColor: Color?
+    public var disabledTextColor: Color?
+    public var type: String?
+    public var regex: String?
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case text
+        case placeholder
+        case enabledTextColor
+        case disabledTextColor
+        case type
+        case regex
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        try super.init(from: decoder)
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        text = try typeContainer.decodeIfPresent(String.self, forKey: .text)
+        placeholder = try typeContainer.decodeIfPresent(String.self, forKey: .placeholder)
+        enabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .enabledTextColor)
+        disabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledTextColor)
+        type = try typeContainer.decodeIfPresent(String.self, forKey: .type)
+        regex = try typeContainer.decodeIfPresent(String.self, forKey: .regex)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(text, forKey: .text)
+        try container.encodeIfPresent(placeholder, forKey: .placeholder)
+        try container.encodeIfPresent(enabledTextColor, forKey: .enabledTextColor)
+        try container.encodeIfPresent(disabledTextColor, forKey: .disabledTextColor)
+        try container.encodeIfPresent(type, forKey: .type)
+        try container.encodeIfPresent(regex, forKey: .regex)
+    }
+}

MVMCoreUI/Atoms/Views/DropDown.swift

@@ -1,55 +0,0 @@
-//
-//  DropDown.swift
-//  MVMCoreUI
-//
-//  Created by Scott Pfeil on 11/26/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import UIKit
-
-@objcMembers public class DropDown: MFTextField {
-    let picker = MVMCoreUICommonViewsUtility.commonPickerView()!
-
-    public override func getNib() -> UINib? {
-        return UINib(nibName: String(describing: MFTextField.self), bundle: MVMCoreUIUtility.bundleForMVMCoreUI())
-    }
-    
-    public override func setupView() {
-        super.setupView()
-        dropDownCarrotWidth?.isActive = false
-        errorHeightConstraint?.constant = 0
-    }
-    
-    override public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)        
-        guard let textField = textField, textField.inputView == nil else { return }
-        picker.delegate = self
-        picker.dataSource = self
-        picker.tag = textField.tag
-        textField.inputView = picker
-        picker.reloadAllComponents()
-        MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: delegateObject?.uiTextFieldDelegate)
-        textField.text = json?.stringWithChainOfKeysOrIndexes(["options",picker.selectedRow(inComponent: 0)])
-    }
-}
-
-extension DropDown: UIPickerViewDelegate {
-    public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        return json?.stringWithChainOfKeysOrIndexes(["options",row])
-    }
-    
-    public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        textField?.text = json?.stringWithChainOfKeysOrIndexes(["options",row])
-    }
-}
-
-extension DropDown: UIPickerViewDataSource {
-    public func numberOfComponents(in pickerView: UIPickerView) -> Int {
-        return 1
-    }
-    
-    public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return json?.optionalArrayForKey("options")?.count ?? 0
-    }
-}

MVMCoreUI/Atoms/Views/DropDownModel.swift

@@ -1,22 +0,0 @@
-//
-//  DropDownModel.swift
-//  MVMCoreUI
-//
-//  Created by Suresh, Kamlesh on 12/12/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-
-@objcMembers public class DropDownModel: MoleculeModelProtocol {
-    public static var identifier: String = "dropDownModel"
-    public var backgroundColor: Color?
-    public var label: String
-    public var options: [String]
-
-    public init(label: String, options: [String]) {
-        self.label = label
-        self.options = options
-    }
-}

MVMCoreUI/Containers/views/EntryFieldContainer.swift

@@ -271,9 +271,17 @@ import UIKit
             layoutIfNeeded()
         }
     }
+    
+    //--------------------------------------------------
+    // MARK: - MVMCoreUIMoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        self.delegateObject = delegateObject
+    }
 }
 
-// MARK:- MVMCoreUIMoleculeViewProtocol
 extension EntryFieldContainer {
     
     override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift

@@ -9,37 +9,35 @@
 import UIKit
 
 @objcMembers public class DropDownFilterTableViewCell: TableViewCell {
+    
     var dropDownListItemModel: DropDownListItemModel?
-    let dropDown = DropDown(forDropDownWithBothDelegates: nil)
+    let dropDown = ItemDropdownEntryField()
     var delegateObject: MVMCoreUIDelegateObject?
     var previousIndex = NSNotFound
     var dropDownSelectionObservation: NSKeyValueObservation?
-
+    
     // MARK: - MFViewProtocol
     override public func setupView() {
         super.setupView()
-        guard let dropDown = dropDown, dropDown.superview == nil else {
+        guard dropDown.superview == nil else { return }
-            return
-        }
         
         dropDown.translatesAutoresizingMaskIntoConstraints = false
         contentView.addSubview(dropDown)
         
         NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: dropDown, useMargins: true).values))
         
-        #warning("Once we have the state manager, we will need to change this logic to only add or remove on user selection...Want to avoid re-use crashes from array size differences")
+        dropDown.observeDropdownChange = { [weak self] oldValue, newValue in
-        dropDownSelectionObservation = observe(
+            
-            \.dropDown?.textField?.text,
+            guard newValue != oldValue,
-            options: [.old, .new]
+                let self = self,
-        ) { [weak self] object, change in
+                let options = self.dropDown.json?.optionalArrayForKey("options") as? [NSString],
-            guard change.newValue != change.oldValue, let self = self,
+                let index = options.firstIndex(of: newValue as NSString),
-                let options = self.dropDown?.json?.optionalArrayForKey("options") as? [NSString],
-                let index = options.firstIndex(of: change.newValue!! as NSString),
                 let molecules = self.dropDownListItemModel?.molecules else { return }
             
             if self.previousIndex != NSNotFound {
                 self.delegateObject?.moleculeDelegate?.removeMolecules(molecules[self.previousIndex], sender: self, animation: .fade)
             }
+            
             self.delegateObject?.moleculeDelegate?.addMolecules(molecules[index], sender: self, animation: .fade)
             self.previousIndex = index
         }
@@ -47,17 +45,17 @@ import UIKit
     
     public override func updateView(_ size: CGFloat) {
         super.updateView(size)
-        dropDown?.updateView(size)
+        dropDown.updateView(size)
     }
-
+    
     public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         dropDownListItemModel = model as? DropDownListItemModel
         self.delegateObject = delegateObject
         super.setWithModel(model, delegateObject, additionalData)
-
+        
-        dropDown?.mfTextFieldDelegate = delegateObject?.uiTextFieldDelegate as? MFTextFieldDelegate
+        dropDown.observingTextFieldDelegate = delegateObject?.uiTextFieldDelegate as? ObservingTextFieldDelegate
-        dropDown?.uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
+        dropDown.uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
-        dropDown?.setWithModel(dropDownListItemModel, delegateObject, additionalData)
+        dropDown.setWithModel(dropDownListItemModel, delegateObject, additionalData)
     }
     
     public override func reset() {

MVMCoreUI/Molecules/Items/DropDownListItemModel.swift

@@ -11,12 +11,12 @@ import Foundation
 @objcMembers public class DropDownListItemModel: MoleculeContainerModel, ListItemModelProtocol {
     public static var identifier: String = "dropDownListItem"
     public var molecules: [[ListItemModelProtocol]]
-    public var dropDown: DropDownModel
+    public var dropDown: ItemDropdownEntryFieldModel
     public var backgroundColor: Color?
     public var line: LineModel? = LineModel(type: .none)
     public var hideArrow: Bool? = true
 
-    public init(molecule: MoleculeModelProtocol, molecules: [[ListItemModelProtocol]], dropDown: DropDownModel) {
+    public init(molecule: MoleculeModelProtocol, molecules: [[ListItemModelProtocol]], dropDown: ItemDropdownEntryFieldModel) {
         self.molecules = molecules
         self.dropDown = dropDown
         super.init(with: molecule)
@@ -32,7 +32,7 @@ import Foundation
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as! [[ListItemModelProtocol]]
-        dropDown = try typeContainer.decode(DropDownModel.self, forKey: .dropDown)
+        dropDown = try typeContainer.decode(ItemDropdownEntryFieldModel.self, forKey: .dropDown)
         if let lineModel = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) {
             line = lineModel
         }

MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

@@ -36,10 +36,10 @@
                      @"caretView": CaretView.class,
                      @"caretLink": CaretButton.class,
                      @"textField": MFTextField.class,
-                     @"dropDown": DropDown.class,
                      @"digitTextField": MFDigitTextField.class,
                      @"digitEntryField": DigitEntryField.class,
                      @"textEntryField": TextEntryField.class,
+                     @"mdnEntryField": MdnEntryField.class,
                      @"itemDropdownEntryField": ItemDropdownEntryField.class,
                      @"dateDropdownEntryField": DateDropdownEntryField.class,
                      @"checkbox": Checkbox.class,