Merge branch 'develop' into feature/designed_accessibility

MVMCoreUI.xcodeproj/project.pbxproj

@@ -183,6 +183,8 @@
 		94CA227D24058534002D6750 /* VerizonNHGeDS-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */; };
 		94CA227E24058534002D6750 /* VerizonNHGeDS-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227A24058533002D6750 /* VerizonNHGeDS-Bold.otf */; };
 		94F6516D2437954100631BF9 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94F6516C2437954100631BF9 /* Tabs.swift */; };
+		AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0A257724766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift */; };
+		AA0A257A24766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0A257924766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift */; };
 		AA104B1A24474A66004D2810 /* HeadersH2Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */; };
 		AA104B1C24474A76004D2810 /* HeadersH2ButtonsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */; };
 		AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */; };
@@ -273,11 +275,13 @@
 		D236E5B4241FEB1000C38625 /* ListTwoColumnPriceDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B2241FEB1000C38625 /* ListTwoColumnPriceDescription.swift */; };
 		D236E5B5241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */; };
 		D236E5B7242007C500C38625 /* MVMControllerModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */; };
-		D23EA7E82473654300D60C34 /* PanelNavigationItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7E72473654300D60C34 /* PanelNavigationItemModelProtocol.swift */; };
 		D23EA7FB2475F09800D60C34 /* CarouselItemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7FA2475F09800D60C34 /* CarouselItemProtocol.swift */; };
+		D23EA7FE247EBBB700D60C34 /* NavigationLabelButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7FD247EBBB700D60C34 /* NavigationLabelButtonModel.swift */; };
+		D23EA800247EBD6C00D60C34 /* LabelBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA7FF247EBD6C00D60C34 /* LabelBarButtonItem.swift */; };
+		D23EA802247EBED400D60C34 /* ImageBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23EA801247EBED400D60C34 /* ImageBarButtonItem.swift */; };
 		D243859923A16B1800332775 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = D243859823A16B1800332775 /* Container.swift */; };
 		D2509ED12472ED9B001BFB9D /* NavigationItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2509ED02472ED9B001BFB9D /* NavigationItemModelProtocol.swift */; };
-		D2509ED62472EE2F001BFB9D /* NavigationItemButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2509ED52472EE2F001BFB9D /* NavigationItemButtonModel.swift */; };
+		D2509ED62472EE2F001BFB9D /* NavigationImageButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2509ED52472EE2F001BFB9D /* NavigationImageButtonModel.swift */; };
 		D253BB8A24574CC5002DE544 /* StackModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260106423D0CEA700764D80 /* StackModel.swift */; };
 		D253BB9C245874F8002DE544 /* BGImageMolecule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D253BB9B245874F8002DE544 /* BGImageMolecule.swift */; };
 		D253BB9E2458751F002DE544 /* BGImageMoleculeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D253BB9D2458751F002DE544 /* BGImageMoleculeModel.swift */; };
@@ -324,6 +328,7 @@
 		D28A838F23CCDEDE00DFE4FC /* TwoButtonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */; };
 		D28A839123CD4FD400DFE4FC /* CornerLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */; };
 		D28A839323CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */; };
+		D28BA730247EC2EB00B75CB8 /* NavigationButtomModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28BA72F247EC2EB00B75CB8 /* NavigationButtomModelProtocol.swift */; };
 		D296E14722A5984C0051EBE7 /* MVMCoreUIViewConstrainingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D296E14622A597490051EBE7 /* MVMCoreUIViewConstrainingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29B771022C281F400D6ACE0 /* ModuleMolecule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D29B770F22C281F400D6ACE0 /* ModuleMolecule.swift */; };
 		D29C94D5242901C9003813BA /* MVMCoreUICommonViewsUtility+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D29C94D4242901C9003813BA /* MVMCoreUICommonViewsUtility+Extension.swift */; };
@@ -609,6 +614,8 @@
 		94CA227A24058533002D6750 /* VerizonNHGeDS-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeDS-Bold.otf"; sourceTree = "<group>"; };
 		94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeTX-Regular.otf"; sourceTree = "<group>"; };
 		94F6516C2437954100631BF9 /* Tabs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tabs.swift; sourceTree = "<group>"; };
+		AA0A257724766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretBodyTextModel.swift; sourceTree = "<group>"; };
+		AA0A257924766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretBodyText.swift; sourceTree = "<group>"; };
 		AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2Buttons.swift; sourceTree = "<group>"; };
 		AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2ButtonsModel.swift; sourceTree = "<group>"; };
 		AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePayments.swift; sourceTree = "<group>"; };
@@ -699,11 +706,13 @@
 		D236E5B2241FEB1000C38625 /* ListTwoColumnPriceDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescription.swift; sourceTree = "<group>"; };
 		D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescriptionModel.swift; sourceTree = "<group>"; };
 		D236E5B6242007C500C38625 /* MVMControllerModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMControllerModelProtocol.swift; sourceTree = "<group>"; };
-		D23EA7E72473654300D60C34 /* PanelNavigationItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelNavigationItemModelProtocol.swift; sourceTree = "<group>"; };
 		D23EA7FA2475F09800D60C34 /* CarouselItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselItemProtocol.swift; sourceTree = "<group>"; };
+		D23EA7FD247EBBB700D60C34 /* NavigationLabelButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationLabelButtonModel.swift; sourceTree = "<group>"; };
+		D23EA7FF247EBD6C00D60C34 /* LabelBarButtonItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelBarButtonItem.swift; sourceTree = "<group>"; };
+		D23EA801247EBED400D60C34 /* ImageBarButtonItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageBarButtonItem.swift; sourceTree = "<group>"; };
 		D243859823A16B1800332775 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
 		D2509ED02472ED9B001BFB9D /* NavigationItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationItemModelProtocol.swift; sourceTree = "<group>"; };
-		D2509ED52472EE2F001BFB9D /* NavigationItemButtonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationItemButtonModel.swift; sourceTree = "<group>"; };
+		D2509ED52472EE2F001BFB9D /* NavigationImageButtonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationImageButtonModel.swift; sourceTree = "<group>"; };
 		D253BB9B245874F8002DE544 /* BGImageMolecule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageMolecule.swift; sourceTree = "<group>"; };
 		D253BB9D2458751F002DE544 /* BGImageMoleculeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageMoleculeModel.swift; sourceTree = "<group>"; };
 		D256E9922412880000360572 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = "<group>"; };
@@ -748,6 +757,7 @@
 		D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonViewModel.swift; sourceTree = "<group>"; };
 		D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabelsModel.swift; sourceTree = "<group>"; };
 		D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyCaretLinkImageModel.swift; sourceTree = "<group>"; };
+		D28BA72F247EC2EB00B75CB8 /* NavigationButtomModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationButtomModelProtocol.swift; sourceTree = "<group>"; };
 		D296E14622A597490051EBE7 /* MVMCoreUIViewConstrainingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewConstrainingProtocol.h; sourceTree = "<group>"; };
 		D29B770F22C281F400D6ACE0 /* ModuleMolecule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModuleMolecule.swift; sourceTree = "<group>"; };
 		D29C94D4242901C9003813BA /* MVMCoreUICommonViewsUtility+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MVMCoreUICommonViewsUtility+Extension.swift"; sourceTree = "<group>"; };
@@ -884,7 +894,6 @@
 				D2E2A9A223E096B1000B42E6 /* DisableableModelProtocol.swift */,
 				D2092354244FA0FD0044AD09 /* ThreeLayerTemplateModelProtocol.swift */,
 				D2509ED02472ED9B001BFB9D /* NavigationItemModelProtocol.swift */,
-				D23EA7E72473654300D60C34 /* PanelNavigationItemModelProtocol.swift */,
 			);
 			path = ModelProtocols;
 			sourceTree = "<group>";
@@ -1302,6 +1311,8 @@
 				522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */,
 				8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */,
 				8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */,
+				AA0A257724766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift */,
+				AA0A257924766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift */,
 				0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */,
 				0A6682A12434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift */,
 				AA99724F2475309F00FC7472 /* ListLeftVariableIconAllTextLinksModel.swift */,
@@ -1364,10 +1375,22 @@
 			path = TwoColumn;
 			sourceTree = "<group>";
 		};
+		D23EA7FC247EBB7500D60C34 /* Buttons */ = {
+			isa = PBXGroup;
+			children = (
+				D28BA72F247EC2EB00B75CB8 /* NavigationButtomModelProtocol.swift */,
+				D2509ED52472EE2F001BFB9D /* NavigationImageButtonModel.swift */,
+				D23EA801247EBED400D60C34 /* ImageBarButtonItem.swift */,
+				D23EA7FD247EBBB700D60C34 /* NavigationLabelButtonModel.swift */,
+				D23EA7FF247EBD6C00D60C34 /* LabelBarButtonItem.swift */,
+			);
+			path = Buttons;
+			sourceTree = "<group>";
+		};
 		D2509ED42472EE0B001BFB9D /* NavigationBar */ = {
 			isa = PBXGroup;
 			children = (
-				D2509ED52472EE2F001BFB9D /* NavigationItemButtonModel.swift */,
+				D23EA7FC247EBB7500D60C34 /* Buttons */,
 				D20FB164241A5D75004AFC3A /* NavigationItemModel.swift */,
 			);
 			path = NavigationBar;
@@ -1972,6 +1995,7 @@
 			files = (
 				AAC6F167243332E400F295C1 /* RadioSwatchesModel.swift in Sources */,
 				5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */,
+				AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */,
 				0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */,
 				8D070BB0241B56530099AC56 /* ListRightVariableTotalDataModel.swift in Sources */,
 				943784F5236B77BB006A1E82 /* Wheel.swift in Sources */,
@@ -1979,7 +2003,7 @@
 				8D3BA9BF2433789900D341BA /* ListThreeColumnInternationalDataDivider.swift in Sources */,
 				94C661DA23CCF4FB00D9FE5B /* UIColor+Extension.swift in Sources */,
 				D28A838123CCB0D800DFE4FC /* AccordionListItemModel.swift in Sources */,
-				D2509ED62472EE2F001BFB9D /* NavigationItemButtonModel.swift in Sources */,
+				D2509ED62472EE2F001BFB9D /* NavigationImageButtonModel.swift in Sources */,
 				32F8804824765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift in Sources */,
 				DBC4391822442197001AB423 /* CaretView.swift in Sources */,
 				C07065C42395677300FBF997 /* Link.swift in Sources */,
@@ -2124,7 +2148,6 @@
 				01509D952327ED1900EF99AA /* HeadlineBodyLinkToggle.swift in Sources */,
 				31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */,
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
-				D23EA7E82473654300D60C34 /* PanelNavigationItemModelProtocol.swift in Sources */,
 				94F6516D2437954100631BF9 /* Tabs.swift in Sources */,
 				5248BFEC23F12E350059236A /* ListThreeColumnPlanDataDivider.swift in Sources */,
 				0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */,
@@ -2157,7 +2180,9 @@
 				BB54C5212434D92F0038326C /* ListRightVariableButtonAllTextAndLinksModel.swift in Sources */,
 				D2092349244A51D40044AD09 /* RadioSwatchModel.swift in Sources */,
 				8DD1E370243B3D0500D8F2DF /* ListThreeColumnInternationalData.swift in Sources */,
+				D23EA802247EBED400D60C34 /* ImageBarButtonItem.swift in Sources */,
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
+				D23EA800247EBD6C00D60C34 /* LabelBarButtonItem.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
 				0A6682AC243531C300AD3CA1 /* Padding.swift in Sources */,
 				AA1EC59924373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift in Sources */,
@@ -2227,6 +2252,7 @@
 				BBAA4F03243D8E3B005AAD5F /* RadioBoxes.swift in Sources */,
 				D2E1FAE12268E81D00AEFD8C /* MoleculeListTemplate.swift in Sources */,
 				525019E72406853600EED91C /* ListFourColumnDataUsageDivider.swift in Sources */,
+				D28BA730247EC2EB00B75CB8 /* NavigationButtomModelProtocol.swift in Sources */,
 				0AE98BB323FF0934004C5109 /* ExternalLinkModel.swift in Sources */,
 				D20FB165241A5D75004AFC3A /* NavigationItemModel.swift in Sources */,
 				AA2AD118244EE48C00BBFFE3 /* ListDeviceComplexLinkMediumModel.swift in Sources */,
@@ -2295,6 +2321,7 @@
 				94C2D9A323872C110006CF46 /* LabelAttributeStrikeThroughModel.swift in Sources */,
 				D28A838523CCCA8900DFE4FC /* ScrollerModel.swift in Sources */,
 				D29DF26C21E6AA0B003B2FB9 /* FLAnimatedImage.m in Sources */,
+				D23EA7FE247EBBB700D60C34 /* NavigationLabelButtonModel.swift in Sources */,
 				D28A839123CD4FD400DFE4FC /* CornerLabelsModel.swift in Sources */,
 				012A88F123985E0100FE3DA1 /* Color.swift in Sources */,
 				D22D8393241C27B100D3DF69 /* TemplateModel.swift in Sources */,
@@ -2345,6 +2372,7 @@
 				8D3BA9BD2433787000D341BA /* ListThreeColumnInternationalDataDividerModel.swift in Sources */,
 				D29DF2CB21E7BFCC003B2FB9 /* MFSizeThreshold.m in Sources */,
 				011D959F240453A1000E3791 /* RuleAllValueChangedModel.swift in Sources */,
+				AA0A257A24766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift in Sources */,
 				011D95AD2406BB57000E3791 /* FormHolderProtocol.swift in Sources */,
 				01509D932327ECFB00EF99AA /* ProgressBar.swift in Sources */,
 				0A6682AA2435125F00AD3CA1 /* Styler.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift

@@ -11,7 +11,7 @@ import UIKit
 public typealias FacadeElements = (fill: UIColor?, text: UIColor?, border: UIColor?)
 
 
-public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWatcherFieldProtocol {
+public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWatcherFieldProtocol, EnableableModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Buttons/CaretLinkModel.swift

@@ -10,7 +10,7 @@ import Foundation
 import MVMCore
 
 
-public class CaretLinkModel: ButtonModelProtocol, MoleculeModelProtocol {
+public class CaretLinkModel: ButtonModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Buttons/Link/LinkModel.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 
-open class LinkModel: ButtonModelProtocol, MoleculeModelProtocol {
+open class LinkModel: ButtonModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -135,6 +135,11 @@ import Foundation
         // Other Molecules
         MoleculeObjectMapping.shared()?.register(viewClass: DoughnutChartView.self, viewModelClass: DoughnutChartModel.self)
         
+        // Navigation Molecules
+        try? ModelRegistry.register(NavigationItemModel.self)
+        try? ModelRegistry.register(NavigationImageButtonModel.self)
+        try? ModelRegistry.register(NavigationLabelButtonModel.self)
+
         // Other Organisms
         MoleculeObjectMapping.shared()?.register(viewClass: Carousel.self, viewModelClass: CarouselModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: BarsIndicatorView.self, viewModelClass: BarsCarouselIndicatorModel.self)
@@ -142,6 +147,7 @@ import Foundation
         
         // Designed List Items
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconWithRightCaretBodyText.self, viewModelClass: ListLeftVariableIconWithRightCaretBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableCheckboxAllTextAndLinks.self, viewModelClass: ListLeftVariableCheckboxAllTextAndLinksModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonAndPaymentMethod.self, viewModelClass: ListLeftVariableRadioButtonAndPaymentMethodModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonBodyText.self, viewModelClass: ListLeftVariableRadioButtonBodyTextModel.self)

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

@@ -0,0 +1,66 @@
+//
+//  ListLeftVariableIconWithRightCaretBodyText.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 21/05/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+@objcMembers open class ListLeftVariableIconWithRightCaretBodyText: TableViewCell {
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-------------------------------------------------------
+    public let leftImage = LoadImageView()
+    public let headlineBody = HeadlineBody()
+    public let rightLabel = Label.createLabelRegularBodySmall(true)
+    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: headlineBody, model: StackItemModel(horizontalAlignment: .leading)),
+                                                     (view: rightLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))], axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - View Lifecycle
+    //-------------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        leftImage.addSizeConstraintsForAspectRatio = true
+        leftImage.contentMode = .scaleAspectFit
+        rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        rightLabel.numberOfLines = 1
+        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? ListLeftVariableIconWithRightCaretBodyTextModel else { return }
+        leftImage.set(with: model.image, delegateObject, additionalData)
+        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 90
+    }
+    
+    open override func reset() {
+        super.reset()
+        rightLabel.styleRegularBodySmall(true)
+    }
+}

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

@@ -0,0 +1,56 @@
+//
+//  ListLeftVariableIconWithRightCaretBodyTextModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 21/05/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+public class ListLeftVariableIconWithRightCaretBodyTextModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "listLVImgBdy"
+    public var image: ImageViewModel
+    public var headlineBody: HeadlineBodyModel
+    public var rightLabel: LabelModel
+    
+    override public func setDefaults() {
+        super.setDefaults()
+        if image.width == nil, image.height == nil {
+            image.width = 30
+            image.height = 30
+        }
+        headlineBody.style = .item
+        headlineBody.headline?.hero = 0
+    }
+    
+    public init(image: ImageViewModel, headlineBody: HeadlineBodyModel, rightLabel: LabelModel) {
+        self.image = image
+        self.headlineBody = headlineBody
+        self.rightLabel = rightLabel
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case image
+        case headlineBody
+        case rightLabel
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        image = try typeContainer.decode(ImageViewModel.self, forKey: .image)
+        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        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(headlineBody, forKey: .headlineBody)
+        try container.encode(rightLabel, forKey: .rightLabel)
+    }
+}

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/ImageBarButtonItem.swift

@@ -0,0 +1,45 @@
+//
+//  ImageBarButtonItem.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/27/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ImageBarButtonItem: BarButtonItem {
+
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    public static func create(with image: UIImage?) -> Self {
+        let actionObject = ActionDelegate()
+        let button = self.init(image: image, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:)))
+        button.actionDelegate = actionObject
+        return button
+    }
+    
+    /// Creates the item with the passed in action.
+    public static func create(with image: UIImage?, actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+        let button = create(with: image)
+        button.set(with: actionModel, delegateObject: delegateObject, additionalData: additionalData)
+        return button
+    }
+    
+    /// Creates the item with the passed in action map.
+    public static func create(with image: UIImage?, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+        let button = create(with: image)
+        button.set(with: actionMap, delegateObject: delegateObject, additionalData: additionalData)
+        return button
+    }
+    
+    /// Creates the item with the passed in action.
+    public static func create(with image: UIImage?, action: @escaping BarButtonAction) -> Self {
+        let button = create(with: image)
+        button.actionDelegate?.buttonAction = action
+        return button
+    }
+}
+

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift

@@ -0,0 +1,44 @@
+//
+//  LabelBarButtonItem.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/27/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class LabelBarButtonItem: BarButtonItem {
+
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    public static func create(with title: String?) -> Self {
+        let actionObject = ActionDelegate()
+        let button = self.init(title: title, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:)))
+        button.actionDelegate = actionObject
+        return button
+    }
+    
+    /// Creates the item with the passed in action.
+    public static func create(with title: String?, actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+        let button = create(with: title)
+        button.set(with: actionModel, delegateObject: delegateObject, additionalData: additionalData)
+        return button
+    }
+    
+    /// Creates the item with the passed in action map.
+    public static func create(with title: String?, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+        let button = create(with: title)
+        button.set(with: actionMap, delegateObject: delegateObject, additionalData: additionalData)
+        return button
+    }
+    
+    /// Creates the item with the passed in action.
+    public static func create(with title: String?, action: @escaping BarButtonAction) -> Self {
+        let button = create(with: title)
+        button.actionDelegate?.buttonAction = action
+        return button
+    }
+}

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationButtomModelProtocol.swift

@@ -0,0 +1,17 @@
+//
+//  NavigationButtonModelProtocol.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/27/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public protocol NavigationButtonModelProtocol: ButtonModelProtocol {
+    // TODO: add color setting to models and items
+    //var color: Color? { get set }
+    
+    /// Returns a bar button item created using data from the model.
+    func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> UIBarButtonItem
+}

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift

@@ -7,9 +7,12 @@
 
 import Foundation
 
-public class NavigationItemButtonModel: Codable {
+public class NavigationImageButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol {
-    var imageName: String
+    public var backgroundColor: Color?
-    var action: ActionModelProtocol
+    public static var identifier: String = "navigationImageButton"
+
+    public var imageName: String
+    public var action: ActionModelProtocol
     
     public init(with imageName: String, action: ActionModelProtocol) {
         self.imageName = imageName
@@ -34,8 +37,8 @@ public class NavigationItemButtonModel: Codable {
     }
     
     /// Convenience function that creates a BarButtonItem for the model.
-    public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> BarButtonItem {
+    public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem {
         let image = UIImage(named: imageName, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
-        return BarButtonItem.create(with: image, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+        return ImageBarButtonItem.create(with: image, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
     }
 }

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift

@@ -0,0 +1,44 @@
+//
+//  NavigationLabelButtonModel.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/27/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class NavigationLabelButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol {
+    public var backgroundColor: Color?
+    public static var identifier: String = "navigationLabelButton"
+
+    public var title: String
+    public var action: ActionModelProtocol
+    
+    public init(with title: String, action: ActionModelProtocol) {
+        self.title = title
+        self.action = action
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case title
+        case action
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        title = try typeContainer.decode(String.self, forKey: .title)
+        action = try typeContainer.decodeModel(codingKey: .action)
+    }
+    
+    open func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(title, forKey: .title)
+        try container.encodeModel(action, forKey: .action)
+    }
+    
+    /// Convenience function that creates a BarButtonItem for the model.
+    public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem {
+        return LabelBarButtonItem.create(with: title, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+    }
+}

MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class NavigationItemModel: NavigationItemModelProtocol, PanelNavigationItemModelProtocol, MoleculeModelProtocol {
+public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtocol {
     public class var identifier: String {
         return "navigationBar"
     }
@@ -18,22 +18,15 @@ public class NavigationItemModel: NavigationItemModelProtocol, PanelNavigationIt
     public var backgroundColor: Color?
     public var tintColor: Color
     public var line: LineModel?
-    public var backButton: NavigationItemButtonModel?
+    public var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? = NavigationImageButtonModel(with: "back", action: ActionBackModel())
-    public var additionalLeftButtons: [NavigationItemButtonModel]?
+    public var additionalLeftButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
-    public var additionalRightButtons: [NavigationItemButtonModel]?
+    public var additionalRightButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
-    
-    // Legacy, will remove once menu is gone.
-    public var showLeftPanelButton: Bool
-    public var showRightPanelButton: Bool
     
     public init() {
         hidden = false
         backgroundColor = Color(uiColor: .white)
         tintColor = Color(uiColor: .black)
         line = LineModel(type: .standard)
-        showLeftPanelButton = true
-        showRightPanelButton = true
-        backButton = NavigationItemButtonModel(with: "back", action: ActionBackModel())
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -56,11 +49,11 @@ public class NavigationItemModel: NavigationItemModelProtocol, PanelNavigationIt
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) ?? Color(uiColor: .white)
         tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) ?? Color(uiColor: .black)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
-        backButton = try typeContainer.decodeIfPresent(NavigationItemButtonModel.self, forKey: .backButton) ?? NavigationItemButtonModel(with: "back", action: ActionBackModel())
+        if let backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol) = try typeContainer.decodeModelIfPresent(codingKey: .backButton) {
-        showLeftPanelButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .showLeftPanelButton) ?? true
+            self.backButton = backButton
-        showRightPanelButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .showRightPanelButton) ?? true
+        }
-        additionalLeftButtons = try typeContainer.decodeIfPresent([NavigationItemButtonModel].self, forKey: .additionalLeftButtons)
+        additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons)
-        additionalRightButtons = try typeContainer.decodeIfPresent([NavigationItemButtonModel].self, forKey: .additionalRightButtons)
+        additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons)
     }
               
     open func encode(to encoder: Encoder) throws {
@@ -70,10 +63,8 @@ public class NavigationItemModel: NavigationItemModelProtocol, PanelNavigationIt
         try container.encode(backgroundColor, forKey: .backgroundColor)
         try container.encode(tintColor, forKey: .tintColor)
         try container.encodeIfPresent(line, forKey: .line)
-        try container.encodeIfPresent(backButton, forKey: .backButton)
+        try container.encodeModelIfPresent(backButton, forKey: .backButton)
-        try container.encode(showLeftPanelButton, forKey: .showLeftPanelButton)
+        try container.encodeModelsIfPresent(additionalLeftButtons, forKey: .additionalLeftButtons)
-        try container.encode(showRightPanelButton, forKey: .showRightPanelButton)
+        try container.encodeModelsIfPresent(additionalRightButtons, forKey: .additionalRightButtons)
-        try container.encodeIfPresent(additionalLeftButtons, forKey: .additionalLeftButtons)
-        try container.encodeIfPresent(additionalRightButtons, forKey: .additionalRightButtons)
     }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/ButtonModelProtocol.swift

@@ -8,6 +8,6 @@
 
 import Foundation
 
-public protocol ButtonModelProtocol: EnableableModelProtocol {
+public protocol ButtonModelProtocol {
     var action: ActionModelProtocol { get set }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/NavigationItemModelProtocol.swift

@@ -14,7 +14,7 @@ public protocol NavigationItemModelProtocol {
     var backgroundColor: Color? { get set }
     var tintColor: Color { get set }
     var line: LineModel? { get set }
-    var backButton: NavigationItemButtonModel? { get set }
+    var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? { get set }
-    var additionalLeftButtons: [NavigationItemButtonModel]? { get set }
+    var additionalLeftButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]? { get set }
-    var additionalRightButtons: [NavigationItemButtonModel]? { get set }
+    var additionalRightButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]? { get set }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift

@@ -13,5 +13,5 @@ public protocol PageModelProtocol {
     /// Temporary: for legacy response
     var screenHeading: String? { get set }
     var backgroundColor: Color? { get set }
-    var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set }
+    var navigationBar: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set }
 }

MVMCoreUI/Atomic/Protocols/ModelProtocols/PanelNavigationItemModelProtocol.swift

@@ -1,14 +0,0 @@
-//
-//  PanelNavigationItemModelProtocol.swift
-//  MVMCoreUI
-//
-//  Created by Scott Pfeil on 5/18/20.
-//  Copyright © 2020 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-public protocol PanelNavigationItemModelProtocol {
-    var showLeftPanelButton: Bool { get set }
-    var showRightPanelButton: Bool { get set }
-}

MVMCoreUI/Atomic/Templates/TemplateModel.swift

@@ -26,7 +26,7 @@ import Foundation
 
     public var backgroundColor: Color?
     public var screenHeading: String?
-    public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
+    public var navigationBar: (NavigationItemModelProtocol & MoleculeModelProtocol)?
     public var formRules: [FormGroupRule]?
     public var behaviors: [PageBehaviorProtocol]?
 
@@ -49,7 +49,7 @@ import Foundation
         case backgroundColor
         case formRules
         case behaviors
-        case navigationItem
+        case navigationBar
     }
     
     //--------------------------------------------------
@@ -63,7 +63,7 @@ import Foundation
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         formRules = try typeContainer.decodeIfPresent([FormGroupRule].self, forKey: .formRules)
         behaviors = try typeContainer.decodeModelsIfPresent(codingKey: .behaviors)
-        navigationItem = try typeContainer.decodeModelIfPresent(codingKey: .navigationItem)
+        navigationBar = try typeContainer.decodeModelIfPresent(codingKey: .navigationBar)
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -73,6 +73,6 @@ import Foundation
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(screenHeading, forKey: .screenHeading)
         try container.encodeIfPresent(formRules, forKey: .formRules)
-        try container.encodeModelIfPresent(navigationItem, forKey: .navigationItem)
+        try container.encodeModelIfPresent(navigationBar, forKey: .navigationBar)
     }
 }

MVMCoreUI/BaseClasses/BarButtonItem.swift

@@ -8,9 +8,9 @@
 
 public typealias BarButtonAction = (BarButtonItem) -> ()
 
-@objc fileprivate class ActionDelegate: NSObject {
+@objc class ActionDelegate: NSObject {
-    fileprivate var buttonAction: BarButtonAction?
+    var buttonAction: BarButtonAction?
-    @objc fileprivate func callActionBlock(_ sender: BarButtonItem) {
+    @objc func callActionBlock(_ sender: BarButtonItem) {
         buttonAction?(sender)
     }
 }
@@ -22,39 +22,7 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     //--------------------------------------------------
     
     open weak var buttonDelegate: ButtonDelegateProtocol?
-    private var actionDelegate: ActionDelegate?
+    var actionDelegate: ActionDelegate?
-
-    //--------------------------------------------------
-    // MARK: - Initializers
-    //--------------------------------------------------
-    
-    public static func create(with image: UIImage?) -> Self {
-        let actionObject = ActionDelegate()
-        let button = self.init(image: image, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:)))
-        button.actionDelegate = actionObject
-        return button
-    }
-    
-    /// Creates the item with the passed in action.
-    public static func create(with image: UIImage?, actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
-        let button = create(with: image)
-        button.set(with: actionModel, delegateObject: delegateObject, additionalData: additionalData)
-        return button
-    }
-    
-    /// Creates the item with the passed in action map.
-    public static func create(with image: UIImage?, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
-        let button = create(with: image)
-        button.set(with: actionMap, delegateObject: delegateObject, additionalData: additionalData)
-        return button
-    }
-    
-    /// Creates the item with the passed in action.
-    public static func create(with image: UIImage?, action: @escaping BarButtonAction) -> Self {
-        let button = create(with: image)
-        button.actionDelegate?.buttonAction = action
-        return button
-    }
 
     //--------------------------------------------------
     // MARK: - Methods

MVMCoreUI/BaseClasses/Button.swift

@@ -94,9 +94,11 @@ public typealias ButtonAction = (Button) -> ()
            self.backgroundColor = backgroundColor.uiColor
         }
 
-        guard let model = model as? ButtonModelProtocol else { return }
+        if let model = model as? EnableableModelProtocol {
+            isEnabled = model.enabled
+        }
         
-        isEnabled = model.enabled
+        guard let model = model as? ButtonModelProtocol else { return }
         set(with: model.action, delegateObject: delegateObject, additionalData: additionalData)
     }
     

MVMCoreUI/BaseControllers/ViewController.swift

@@ -163,8 +163,6 @@ import UIKit
     open func createDefaultLegacyNavigationModel() -> NavigationItemModel {
         let navigationModel = NavigationItemModel()
         navigationModel.title = pageModel?.screenHeading
-        navigationModel.showLeftPanelButton = isMasterInitiallyAccessible()
-        navigationModel.showRightPanelButton = isSupportInitiallyAccessible()
         if /*(self as? MVMCoreUITabBarPageControlViewController) != nil ||*/ manager != nil || loadObject?.requestParameters?.tabWasPressed ?? false == true {
             navigationModel.line = LineModel(type: .none)
         }
@@ -174,9 +172,9 @@ import UIKit
     /// Processes any new data. Called after the page is loaded the first time and on response updates for this page,
     open func handleNewData() {
         // TODO: remove legacy. Temporary, convert legacy to navigation model.
-        if pageModel?.navigationItem == nil {
+        if pageModel?.navigationBar == nil {
             let navigationItem = createDefaultLegacyNavigationModel()
-            pageModel?.navigationItem = navigationItem
+            pageModel?.navigationBar = navigationItem
         }
         
         if formValidator == nil {
@@ -191,18 +189,28 @@ import UIKit
     
     // MARK: - Navigation Item (Move to model base)
     open func setNavigationController() {
-        guard let navigationItemModel = pageModel?.navigationItem,
+        let viewController = manager ?? self
-            let navigationController = manager?.navigationController ?? navigationController else {
+        guard let navigationItemModel = pageModel?.navigationBar,
+            let navigationController = viewController.navigationController else {
             MVMCoreUISession.sharedGlobal()?.splitViewController?.parent?.setNeedsStatusBarAppearanceUpdate()
             return
         }
-        let viewController = manager ?? self
+        
-        if navigationController == MVMCoreUISplitViewController.main()?.navigationController,
+        // We additionally want our left items
-            navigationController.topViewController == viewController {
+        navigationItem.leftItemsSupplementBackButton = true
-            MVMCoreUISession.sharedGlobal()?.splitViewController?.setupPanels()
+        
-            showBottomProgressBar()
-        }
         NavigationController.set(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+        
+        // Special logic when using the split view controller. Legacy Update Panels. Change how this is done.
+        guard navigationController == MVMCoreUISplitViewController.main()?.navigationController,
+            navigationController.topViewController == viewController else { return }
+        
+        MVMCoreUISession.sharedGlobal()?.splitViewController?.setupPanels()
+        showBottomProgressBar()
+
+        MVMCoreUISplitViewController.main()?.setLeftPanelIsAccessible(isMasterInitiallyAccessible(), for: viewController)
+        MVMCoreUISplitViewController.main()?.setRightPanelIsAccessible(isSupportInitiallyAccessible(), for: viewController)
+        MVMCoreUISession.sharedGlobal()?.splitViewController?.setNavigationIconColor(navigationItemModel.tintColor.uiColor)
     }
     
     // Eventually will be moved to server

MVMCoreUI/Containers/NavigationController.swift

@@ -46,23 +46,25 @@ import UIKit
     /// Convenience function for setting the navigation buttons.
     public static func setNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
         let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
-        var items: [UIBarButtonItem] = []
+        var leftItems: [UIBarButtonItem] = []
         if let backButtonModel = navigationItemModel.backButton,
             navigationController.viewControllers.count > 1 {
-            items.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+            leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
         }
         if let leftItemModels = navigationItemModel.additionalLeftButtons {
             for item in leftItemModels {
-                items.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+                leftItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
             }
-            viewController.navigationItem.leftBarButtonItems = items
         }
+        viewController.navigationItem.leftBarButtonItems = leftItems.count > 0 ? leftItems : nil
+
+        var rightItems: [UIBarButtonItem] = []
         if let rightItemModels = navigationItemModel.additionalRightButtons {
             for item in rightItemModels {
-                items.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+                rightItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
             }
-            viewController.navigationItem.rightBarButtonItems = items
         }
+        viewController.navigationItem.rightBarButtonItems = rightItems.count > 0 ? rightItems : nil
     }
     
     /// Convenience function for setting navigation bar with model.
@@ -85,21 +87,7 @@ import UIKit
             navigationController.separatorView?.isHidden = navigationItemModel.line?.type ?? .standard == .none
         }
     
-        // Let legacy splitview controller handle buttons for now.
+        // Sets up the navigation buttons.
-        guard navigationController == MVMCoreUISplitViewController.main()?.navigationController,
+        setNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
-            navigationController.topViewController == viewController else {
-            // Not the main split view controller, add buttons.
-            setNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
-            return
-        }
-        
-        // Update icons if main navigation controller.
-        MVMCoreUISession.sharedGlobal()?.splitViewController?.setNavigationIconColor(tint)
-
-        // Update Panels
-        if let model = navigationItemModel as? PanelNavigationItemModelProtocol {
-            MVMCoreUISplitViewController.main()?.setLeftPanelIsAccessible(model.showLeftPanelButton, for: viewController)
-            MVMCoreUISplitViewController.main()?.setRightPanelIsAccessible(model.showRightPanelButton, for: viewController)
-        }
     }
 }

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -107,29 +107,12 @@ CGFloat const PanelAnimationDuration = 0.2;
     return (width > 2000 ? MFTwoDrawer : (width > 1000 ? MFOneDrawer : MFNoDrawer));
 }
 
-- (nullable UIBarButtonItem *)getBackButtonForViewController:(nonnull UIViewController *)viewController {
-    if (![viewController conformsToProtocol:@protocol(MVMCoreViewControllerProtocol)]) { return self.backButton; }
-    UIViewController <MVMCoreViewControllerProtocol>*controller = (UIViewController <MVMCoreViewControllerProtocol>*)viewController;
-    NSDictionary *item = [controller.loadObject.pageJSON dictWithChainOfKeysOrIndexes:@[@"navigationItem",@"backButton"]];
-    if (!item) { return self.backButton; }
-    DelegateObject *delegate = [controller delegateObject];
-    return [self createNavigationItemButtonFrom:item delegateObject:[delegate isKindOfClass:[MVMCoreUIDelegateObject class]] ? (MVMCoreUIDelegateObject *)delegate : nil];
-}
-
 - (nullable NSArray <UIBarButtonItem *>*)additionalLeftButtonsForViewController:(nonnull UIViewController *)viewController {
-    if (![viewController conformsToProtocol:@protocol(MVMCoreViewControllerProtocol)]) { return nil; }
+    return viewController.navigationItem.leftBarButtonItems;
-    UIViewController <MVMCoreViewControllerProtocol>*controller = (UIViewController <MVMCoreViewControllerProtocol>*)viewController;
-    NSArray *items = [controller.loadObject.pageJSON arrayForChainOfKeysOrIndexes:@[@"navigationItem",@"additionalLeftButtons"]];
-    DelegateObject *delegate = [controller delegateObject];
-    return [self createNavigationItemButtonsFrom:items delegateObject:[delegate isKindOfClass:[MVMCoreUIDelegateObject class]] ? (MVMCoreUIDelegateObject *)delegate : nil];
 }
 
 - (nullable NSArray <UIBarButtonItem *>*)additionalRightButtonsForViewController:(nonnull UIViewController *)viewController {
-    if (![viewController conformsToProtocol:@protocol(MVMCoreViewControllerProtocol)]) { return nil; }
+    return viewController.navigationItem.rightBarButtonItems;
-    UIViewController <MVMCoreViewControllerProtocol>*controller = (UIViewController <MVMCoreViewControllerProtocol>*)viewController;
-    NSArray *items = [controller.loadObject.pageJSON arrayForChainOfKeysOrIndexes:@[@"navigationItem",@"additionalRightButtons"]];
-    DelegateObject *delegate = [controller delegateObject];
-    return [self createNavigationItemButtonsFrom:items delegateObject:[delegate isKindOfClass:[MVMCoreUIDelegateObject class]] ? (MVMCoreUIDelegateObject *)delegate : nil];
 }
 
 - (CGFloat)leftPanelExtendedWidth {
@@ -251,22 +234,13 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
     NSMutableArray *leftBarButtonItems = [NSMutableArray array];
-    if ([viewController.navigationController.viewControllers count] > 1) {
-        UIBarButtonItem *button = [self getBackButtonForViewController:viewController];
-        if (button) {
-            viewController.navigationItem.hidesBackButton = YES;
-            [leftBarButtonItems addObject:button];
-        } else {
-            viewController.navigationItem.hidesBackButton = NO;
-        }
-    }
-    if ((accessible && !extended) && self.leftPanelButton) {
-        [leftBarButtonItems addObject:self.leftPanelButton];
-    }
     NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController];
     if (extraButtons) {
         [leftBarButtonItems addObjectsFromArray:extraButtons];
     }
+    if ((accessible && !extended) && self.leftPanelButton) {
+        [leftBarButtonItems addObject:self.leftPanelButton];
+    }
     [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations];
 }
 
@@ -625,24 +599,6 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 #pragma mark - Other Panel Functions
 
-/// Convenience function, creates a BarButtonItem from button json
-- (nonnull UIBarButtonItem *)createNavigationItemButtonFrom:(nonnull NSDictionary *)JSON delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject {
-    UIImage *image = [UIImage imageNamed:[JSON string:@"imageName"] inBundle:[[MVMCoreCache sharedCache] bundleToUseForImages] compatibleWithTraitCollection:nil];
-    BarButtonItem *item = [BarButtonItem createWith:image actionMap:[JSON dict:@"action"] delegateObject:delegateObject additionalData:nil];
-    return item;
-}
-
-/// Convenience function, creates a list of BarButtonItems list of json
-- (nullable NSArray <UIBarButtonItem *>*)createNavigationItemButtonsFrom:(nullable NSArray <NSDictionary *>*)JSONlist delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject {
-    if (JSONlist.count == 0) { return nil; }
-    NSMutableArray *items = [NSMutableArray arrayWithCapacity:JSONlist.count];
-    for (NSDictionary *itemData in JSONlist) {
-        UIBarButtonItem *item = [self createNavigationItemButtonFrom:itemData delegateObject:delegateObject];
-        [items addObject:item];
-    }
-    return items;
-}
-
 - (void)forceHideBothDrawers {
     [self hideBothDrawersShouldForceHide:YES];
 }