From bb87cac010dccbfd4be1a6868ead84f022f13120 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Sun, 26 Apr 2020 00:40:09 +0530
Subject: [PATCH 01/33] removed space

---
 MVMCoreUI/Atomic/MoleculeObjectMapping.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index b8ffb9e6..436db9d5 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -118,7 +118,6 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeCollectionViewCell.self, viewModelClass: MoleculeCollectionItemModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: CarouselItem.self, viewModelClass: CarouselItemModel.self)
 
-
         // Other Container Molecules
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeContainer.self, viewModelClass: MoleculeContainerModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeHeaderView.self, viewModelClass: MoleculeHeaderModel.self)

From 6191dbb1905e31c48ff644be8142887b20102c20 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Sun, 26 Apr 2020 00:43:09 +0530
Subject: [PATCH 02/33] Revert "removed space"

This reverts commit bb87cac010dccbfd4be1a6868ead84f022f13120.
---
 MVMCoreUI/Atomic/MoleculeObjectMapping.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index 436db9d5..b8ffb9e6 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -118,6 +118,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeCollectionViewCell.self, viewModelClass: MoleculeCollectionItemModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: CarouselItem.self, viewModelClass: CarouselItemModel.self)
 
+
         // Other Container Molecules
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeContainer.self, viewModelClass: MoleculeContainerModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: MoleculeHeaderView.self, viewModelClass: MoleculeHeaderModel.self)

From 862fa066dd1dd9413004b2816c22795329cdb9cd Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Mon, 8 Jun 2020 17:28:58 +0530
Subject: [PATCH 03/33] 1. Changing imageName to image as per doc:
 https://oneconfluence.verizon.com/display/MFD/Navigation+Image+Button

---
 .../Buttons/NavigationImageButtonModel.swift     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
index aff9c58f..dc208949 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
@@ -11,34 +11,34 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
     public var backgroundColor: Color?
     public static var identifier: String = "navigationImageButton"
 
-    public var imageName: String
+    public var image: String
     public var action: ActionModelProtocol
     
-    public init(with imageName: String, action: ActionModelProtocol) {
-        self.imageName = imageName
+    public init(with image: String, action: ActionModelProtocol) {
+        self.image = image
         self.action = action
     }
     
     private enum CodingKeys: String, CodingKey {
-        case imageName
+        case image
         case action
     }
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        imageName = try typeContainer.decode(String.self, forKey: .imageName)
+        image = try typeContainer.decode(String.self, forKey: .image)
         action = try typeContainer.decodeModel(codingKey: .action)
     }
     
     open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(imageName, forKey: .imageName)
+        try container.encode(image, forKey: .image)
         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 {
-        let image = UIImage(named: imageName, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
-        return ImageBarButtonItem.create(with: image, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+        let imageName = UIImage(named: image, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
+        return ImageBarButtonItem.create(with: imageName, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
     }
 }

From 18f146f668f03b93fa89faabb188d3bcc3ef192d Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Wed, 10 Jun 2020 00:30:52 +0530
Subject: [PATCH 04/33] making few objects open to use in MF

---
 MVMCoreUI/BaseClasses/BarButtonItem.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/BaseClasses/BarButtonItem.swift b/MVMCoreUI/BaseClasses/BarButtonItem.swift
index 93eb63a3..e979e04f 100644
--- a/MVMCoreUI/BaseClasses/BarButtonItem.swift
+++ b/MVMCoreUI/BaseClasses/BarButtonItem.swift
@@ -8,9 +8,9 @@
 
 public typealias BarButtonAction = (BarButtonItem) -> ()
 
-@objc class ActionDelegate: NSObject {
-    var buttonAction: BarButtonAction?
-    @objc func callActionBlock(_ sender: BarButtonItem) {
+@objc open class ActionDelegate: NSObject {
+    open var buttonAction: BarButtonAction?
+    @objc open func callActionBlock(_ sender: BarButtonItem) {
         buttonAction?(sender)
     }
 }
@@ -22,7 +22,7 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     //--------------------------------------------------
     
     open weak var buttonDelegate: ButtonDelegateProtocol?
-    var actionDelegate: ActionDelegate?
+    open var actionDelegate: ActionDelegate?
 
     //--------------------------------------------------
     // MARK: - Methods

From b3020d9534db24ec11cdda6021e29a51f599669e Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Fri, 12 Jun 2020 00:57:36 +0530
Subject: [PATCH 05/33] Implemented Scott Feedback. Removed open keyword.

---
 MVMCoreUI/BaseClasses/BarButtonItem.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/BaseClasses/BarButtonItem.swift b/MVMCoreUI/BaseClasses/BarButtonItem.swift
index e979e04f..93eb63a3 100644
--- a/MVMCoreUI/BaseClasses/BarButtonItem.swift
+++ b/MVMCoreUI/BaseClasses/BarButtonItem.swift
@@ -8,9 +8,9 @@
 
 public typealias BarButtonAction = (BarButtonItem) -> ()
 
-@objc open class ActionDelegate: NSObject {
-    open var buttonAction: BarButtonAction?
-    @objc open func callActionBlock(_ sender: BarButtonItem) {
+@objc class ActionDelegate: NSObject {
+    var buttonAction: BarButtonAction?
+    @objc func callActionBlock(_ sender: BarButtonItem) {
         buttonAction?(sender)
     }
 }
@@ -22,7 +22,7 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     //--------------------------------------------------
     
     open weak var buttonDelegate: ButtonDelegateProtocol?
-    open var actionDelegate: ActionDelegate?
+    var actionDelegate: ActionDelegate?
 
     //--------------------------------------------------
     // MARK: - Methods

From 136b2d3f39e783acc43143489fc5480fbd8aecb8 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Fri, 12 Jun 2020 15:38:08 +0530
Subject: [PATCH 06/33] Initial commit -
 List_LeftVariable_NumberedList_BodyText

---
 MVMCoreUI.xcodeproj/project.pbxproj           |  8 ++
 MVMCoreUI/Atomic/MoleculeObjectMapping.swift  |  1 +
 ...ListLeftVariableNumberedListBodyText.swift | 90 +++++++++++++++++++
 ...eftVariableNumberedListBodyTextModel.swift | 58 ++++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
 create mode 100644 MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyTextModel.swift

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 3af65c10..114dd245 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -116,6 +116,8 @@
 		27F9736A246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27F97369246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift */; };
 		31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */; };
 		31BE15CC23D8924D00452370 /* CheckboxModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15CA23D8924C00452370 /* CheckboxModel.swift */; };
+		324FB6AA249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */; };
+		324FB6AC24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */; };
 		32F8804624765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */; };
 		32F8804824765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */; };
 		522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */; };
@@ -561,6 +563,8 @@
 		27F97369246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenBrightnessModifierBehavior.swift; sourceTree = "<group>"; };
 		31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxLabelModel.swift; sourceTree = "<group>"; };
 		31BE15CA23D8924C00452370 /* CheckboxModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxModel.swift; sourceTree = "<group>"; };
+		324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListBodyTextModel.swift; sourceTree = "<group>"; };
+		324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListBodyText.swift; sourceTree = "<group>"; };
 		32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListAllTextAndLinks.swift; sourceTree = "<group>"; };
 		522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinks.swift; sourceTree = "<group>"; };
@@ -1354,6 +1358,8 @@
 				AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */,
 				32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */,
 				32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */,
+				324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */,
+				324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */,
 			);
 			path = LeftVariable;
 			sourceTree = "<group>";
@@ -2053,6 +2059,7 @@
 			files = (
 				0A775F2624893916009EFB58 /* ThreeHeadlineBodyLink.swift in Sources */,
 				AAC6F167243332E400F295C1 /* RadioSwatchesModel.swift in Sources */,
+				324FB6AA249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift in Sources */,
 				5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */,
 				AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */,
 				0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */,
@@ -2309,6 +2316,7 @@
 				BB6C6AC0242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTallModel.swift in Sources */,
 				8DEFA95E243DAC2F000D27E5 /* ListThreeColumnDataUsageDivider.swift in Sources */,
 				D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */,
+				324FB6AC24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift in Sources */,
 				AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */,
 				522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */,
 				AA7F32AB246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift in Sources */,
diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index 98b1e6a3..508181cc 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -172,6 +172,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableCheckboxBodyText.self, viewModelClass: ListLeftVariableCheckboxBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconAllTextLinks.self, viewModelClass: ListLeftVariableIconAllTextLinksModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableNumberedListAllTextAndLinks.self, viewModelClass: ListLeftVariableNumberedListAllTextAndLinksModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableNumberedListBodyText.self, viewModelClass: ListLeftVariableNumberedListBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRVWheel.self, viewModelClass: ListRVWheelModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariablePayments.self, viewModelClass: ListRightVariablePaymentsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariableTotalData.self, viewModelClass: ListRightVariableTotalDataModel.self)
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
new file mode 100644
index 00000000..c63b3e1a
--- /dev/null
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
@@ -0,0 +1,90 @@
+//
+//  ListLeftVariableNumberedListBodyText.swift
+//  MVMCoreUI
+//
+//  Created by Subhankar Acharya on 12/06/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListLeftVariableNumberedListBodyText: TableViewCell {
+    //--------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    public let leftLabel = Label(fontStyle: .Title2XLarge)
+    public let headlineBody = HeadlineBody()
+    public var stack: Stack<StackModel>
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 10, horizontalAlignment: .fill)),
+                                                     (view: headlineBody, model: StackItemModel(percent: 90, horizontalAlignment: .fill))],
+                                              axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Life Cycle
+    //--------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        addMolecule(stack)
+        stack.restack()
+        updateAccessibilityLabel()
+    }
+    
+    //---------------------------------------------------
+    // 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? ListLeftVariableNumberedListBodyTextModel else { return }
+        leftLabel.text = String(model.number)
+        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        updateAccessibilityLabel()
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 140
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.setFontStyle(.Title2XLarge)
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Accessibility
+    //--------------------------------------------------
+    
+    func updateAccessibilityLabel() {
+        
+        var message = ""
+        
+        if let leftLabel = leftLabel.text {
+            message += leftLabel + ", "
+        }
+        
+        if let headlineLabel = headlineBody.headlineLabel.text {
+            message += headlineLabel + ", "
+        }
+        
+        if let messageLabel = headlineBody.messageLabel.text {
+            message += messageLabel
+        }
+        
+        accessibilityLabel = message
+    }
+}
+
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyTextModel.swift
new file mode 100644
index 00000000..372bab32
--- /dev/null
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyTextModel.swift
@@ -0,0 +1,58 @@
+//
+//  ListLeftVariableNumberedListBodyTextModel.swift
+//  MVMCoreUI
+//
+//  Created by Subhankar Acharya on 12/06/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListLeftVariableNumberedListBodyTextModel: ListItemModel, MoleculeModelProtocol {
+    //-----------------------------------------------------
+    // MARK: - Properties
+    //-----------------------------------------------------
+    
+    public static var identifier: String = "listLVNLBdy"
+    public var number: Int
+    public var headlineBody: HeadlineBodyModel
+    
+    //-----------------------------------------------------
+    // MARK: - Initializer
+    //-----------------------------------------------------
+    
+    public init(number: Int, headlineBody: HeadlineBodyModel) {
+        self.number = number
+        self.headlineBody = headlineBody
+        super.init()
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Keys
+    //-----------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case number
+        case headlineBody
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Codec
+    //-----------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        number = try typeContainer.decode(Int.self, forKey: .number)
+        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        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(number, forKey: .number)
+        try container.encode(headlineBody, forKey: .headlineBody)
+    }
+}

From 17a14e0634cdf2475c2f657ddf60f01e35a49f7a Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 14:43:01 -0400
Subject: [PATCH 07/33] Update accessibility for numberd left variable

---
 ...tVariableNumberedListAllTextAndLinks.swift | 59 ++++++-------------
 .../EyebrowHeadlineBodyLink.swift             | 40 +++++++++++++
 2 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index 5924b3d7..6b133172 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -40,7 +40,6 @@ import Foundation
         leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //---------------------------------------------------
@@ -76,56 +75,36 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String {
+        guard let leftLabel = leftLabel.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        return leftLabel + ", " + eyebrowHeadlineBodyLink.getAccessibilityMessage()
+    }
+    
     func updateAccessibilityLabel() {
-        
-        var message = ""
-        
-        if let leftLabel = leftLabel.text {
-            message += leftLabel + ", "
-        }
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
-        }
-        
+
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
         } else {
-            var elements: [UIView] = []
-            
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
+            var elements: [Any] = []
             if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
                 elements.append(leftLabel)
             }
-            
-            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
+                elements.append(otherElements)
             }
-            
-            if let headlineText = eyebrowHeadlineBodyLink.headline.text, !headlineText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.headline)
-            }
-            
-            if let bodyText = eyebrowHeadlineBodyLink.body.text, !bodyText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.body)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index 7d176ba2..8a4d6d38 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -69,4 +69,44 @@ import UIKit
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 65
     }
+    
+    //--------------------------------------------------
+    // MARK: - Accessibility Helpers
+    //--------------------------------------------------
+    
+    /// Returns the labels text in one message.
+    func getAccessibilityMessage() -> String {
+        var message = ""
+    
+        if let eyebrowLabel = eyebrow.text {
+            message += eyebrowLabel + ", "
+        }
+        
+        if let headlineLabel = headline.text {
+            message += headlineLabel + ", "
+        }
+        
+        if let bodyLabel = body.text {
+            message += bodyLabel
+        }
+        return message
+    }
+    
+    /// Returns an array of the appropriate accessibility elements.
+    func getAccessibilityElements() -> [Any]? {
+        var elements: [UIView] = []
+        if eyebrow.hasText {
+            elements.append(eyebrow)
+        }
+        if headline.hasText {
+            elements.append(headline)
+        }
+        if body.hasText {
+            elements.append(body)
+        }
+        if link.titleLabel?.text?.count ?? 0 > 0 {
+            elements.append(link)
+        }
+        return elements.count > 0 ? elements : nil
+    }
 }

From 061e9e6bd9f0eaa75f24e853a7d8e4a77cd2b572 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 15:13:53 -0400
Subject: [PATCH 08/33] left variable accessibility clean

---
 ...tLeftVariableCheckboxAllTextAndLinks.swift | 28 ++-------
 .../ListLeftVariableCheckboxBodyText.swift    |  2 +-
 .../ListLeftVariableIconAllTextLinks.swift    | 60 +++++++------------
 .../ListLeftVariableIconWithRightCaret.swift  |  5 +-
 ...ftVariableIconWithRightCaretBodyText.swift |  5 +-
 ...tVariableNumberedListAllTextAndLinks.swift |  7 ++-
 ...ftVariableRadioButtonAllTextAndLinks.swift | 25 +-------
 ...tVariableRadioButtonAndPaymentMethod.swift | 24 +-------
 .../EyebrowHeadlineBodyLink.swift             |  4 +-
 9 files changed, 44 insertions(+), 116 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
index ff1c6e1b..9c8976f6 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
@@ -53,7 +53,7 @@ import Foundation
         checkbox.isAccessibilityElement = false
         accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
-        // Update accessibility label on radio button state change.
+        // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
         }
@@ -92,16 +92,8 @@ import Foundation
             message += checkboxLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowLabel.isEmpty {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text, !headlineLabel.isEmpty {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text, !bodyLabel.isEmpty {
-            message += bodyLabel
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
+            message += label
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
@@ -114,19 +106,9 @@ import Foundation
             // Make whole cell focusable if no link.
             accessibilityLabel = message
         } else {
-            // Allow only radio button and link to be focused on.
+            // Allow only checkbox and link to be focused on.
             checkbox.accessibilityLabel = message
-            var elements: [UIView] = []
-            
-            if message.count > 0 {
-                elements.append(checkbox)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
+            accessibilityElements = [checkbox, eyebrowHeadlineBodyLink.link]
         }
     }
     
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
index 326c9320..1d83cbfb 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
@@ -52,7 +52,7 @@ import Foundation
         checkbox.isAccessibilityElement = false
         accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
-        // Update accessibility label on radio button state change.
+        // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
         }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 1f8a6a43..9e4d7533 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -42,7 +42,6 @@ import Foundation
         leftImage.imageView.contentMode = .scaleAspectFit
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -63,57 +62,40 @@ import Foundation
         return 140
     }
     
+    func getAccessibilityMessage() -> String? {
+        guard let leftImageLabel = leftImage.accessibilityLabel else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return leftImageLabel
+        }
+        return leftImageLabel + ", " + label
+    }
+    
     func updateAccessibilityLabel() {
         
-        var message = ""
-        
-        if let leftImageLabel = leftImage.accessibilityLabel {
-            message += leftImageLabel + ", "
-        }
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
         } else {
-            // Allow only radio button and link to be focused on.
-            var elements: [UIView] = []
-            
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
+            var elements: [Any] = []
             if let leftImageLabel = leftImage.accessibilityLabel, !leftImageLabel.isEmpty {
                 elements.append(leftImage)
             }
-            
-            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
+                elements.append(otherElements)
             }
-            
-            if let headlineText = eyebrowHeadlineBodyLink.headline.text, !headlineText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.headline)
-            }
-            
-            if let bodyText = eyebrowHeadlineBodyLink.body.text, !bodyText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.body)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
index 297ef31b..821becbe 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
@@ -48,8 +48,6 @@ import UIKit
         rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 902), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -78,7 +76,7 @@ import UIKit
     }
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftImageLabel = leftImage.accessibilityLabel {
@@ -94,5 +92,6 @@ import UIKit
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
index 0617b5e8..c416e536 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
@@ -58,10 +58,8 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.numberOfLines = 1
-        isAccessibilityElement = true
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -93,7 +91,7 @@ import Foundation
     //--------------------------------------------------
 
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftImageLabel = leftImage.accessibilityLabel {
@@ -113,5 +111,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index 6b133172..183514de 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -75,11 +75,14 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func getAccessibilityMessage() -> String {
+    func getAccessibilityMessage() -> String? {
         guard let leftLabel = leftLabel.text else {
             return eyebrowHeadlineBodyLink.getAccessibilityMessage()
         }
-        return leftLabel + ", " + eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return leftLabel
+        }
+        return leftLabel + ", " + label
     }
     
     func updateAccessibilityLabel() {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
index 5756d4f5..229a2456 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
@@ -89,16 +89,8 @@ import Foundation
             message += radioButtonLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
+            message += label
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
@@ -112,18 +104,7 @@ import Foundation
         } else {
             // Allow only radio button and link to be focused on.
             radioButton.accessibilityLabel = message
-
-            var elements: [UIView] = []
-            
-            if !message.isEmpty {
-                elements.append(radioButton)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
+            accessibilityElements = [radioButton, eyebrowHeadlineBodyLink.link]
         }
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
index 523c6d4e..6cc26352 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
@@ -107,16 +107,8 @@ import UIKit
             message += leftImageLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
+            message += label
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
@@ -130,17 +122,7 @@ import UIKit
         } else {
             // Allow only radio button and link to be focused on.
             radioButton.accessibilityLabel = message
-            var elements: [UIView] = []
-            
-            if !message.isEmpty {
-                elements.append(radioButton)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
+            accessibilityElements = [radioButton, eyebrowHeadlineBodyLink.link]
         }
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index 8a4d6d38..12b42e9f 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -75,7 +75,7 @@ import UIKit
     //--------------------------------------------------
     
     /// Returns the labels text in one message.
-    func getAccessibilityMessage() -> String {
+    func getAccessibilityMessage() -> String? {
         var message = ""
     
         if let eyebrowLabel = eyebrow.text {
@@ -89,7 +89,7 @@ import UIKit
         if let bodyLabel = body.text {
             message += bodyLabel
         }
-        return message
+        return message.count > 0 ? message : nil
     }
     
     /// Returns an array of the appropriate accessibility elements.

From 843616f75570b34002f944f9b0d0f7c458171b83 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 15:53:18 -0400
Subject: [PATCH 09/33] right variable changes

---
 .../List/ListProgressBarThin.swift            |  5 +-
 .../List/RightVariable/ListRVWheel.swift      |  5 +-
 ...stRightVariableButtonAllTextAndLinks.swift | 59 ++++++++---------
 .../ListRightVariablePayments.swift           |  5 +-
 ...htVariablePriceChangeAllTextAndLinks.swift | 61 +++++++-----------
 ...ListRightVariablePriceChangeBodyText.swift |  5 +-
 ...RightVariableTextLinkAllTextAndLinks.swift | 63 ++++++++-----------
 .../ListRightVariableTotalData.swift          |  5 +-
 8 files changed, 83 insertions(+), 125 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
index 08255db9..4e0eb83a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
@@ -78,8 +78,6 @@ import Foundation
         stack.restack()
         horizontalStack.restack()
         labelStack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //------------------------------------------------------
@@ -115,7 +113,7 @@ import Foundation
     //------------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftHeadlineText = leftHeadline.text {
@@ -135,5 +133,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
index f410c635..58b9ada0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift
@@ -41,8 +41,6 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //-------------------------------------------------
@@ -75,7 +73,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
@@ -91,5 +89,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
index 6e9503dc..c08d37cd 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
@@ -47,9 +47,9 @@ import Foundation
         
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
         accessibilityValue = button.accessibilityValue
         accessibilityHint = button.accessibilityHint
+        accessibilityTraits = .button
     }
     
     //-----------------------------------------------------
@@ -74,48 +74,39 @@ import Foundation
     // MARK: - Accessibility
     //----------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let buttonText = button.titleLabel?.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return buttonText
+        }
+        return label + ", " + buttonText
+    }
+    
     func updateAccessibilityLabel() {
-        
-        var message = ""
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel + ", "
-        }
-        
-        if let buttonLabel = button.accessibilityLabel {
-            message += buttonLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
         isAccessibilityElement = !linkShowing
-        button.isAccessibilityElement = linkShowing
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
-        if !linkShowing {
-            // Make whole cell focusable if no link.
-            accessibilityLabel = message
+        button.isAccessibilityElement = linkShowing
+
+        if !linkShowing && accessoryView == nil {
+            // Make whole cell focusable if one action
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
         } else {
-            // Allow only radio button and link to be focused on.
-            button.accessibilityLabel = message
-            var elements: [UIView] = []
-            
-            if !message.isEmpty {
-                elements.append(button)
+            // Make buttons focusable.
+            var elements: [Any] = []
+            if let accessoryView = accessoryView {
+                accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
+                elements.append(accessoryView)
+            } else {
+                button.accessibilityLabel = getAccessibilityMessage()
             }
-            
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            
+            elements.append(link)
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
index 5bb62b90..2b12a4c2 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
@@ -40,8 +40,6 @@ import Foundation
         rightImage.addSizeConstraintsForAspectRatio = true
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
@@ -72,7 +70,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
@@ -84,5 +82,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
index afbdd2b5..76ce1a37 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
@@ -67,7 +67,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -89,57 +88,39 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let rightLabelText = rightLabel.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return rightLabelText
+        }
+        return label + ", " + rightLabelText
+    }
+    
     func updateAccessibilityLabel() {
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         
         if !linkShowing {
             // Make whole cell focusable if no link.
-            var message = ""
-            
-            if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-                message += eyebrowLabel + ", "
-            }
-            
-            if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-                message += headlineLabel + ", "
-            }
-            
-            if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-                message += bodyLabel + ", "
-            }
-            
-            if let rightLabelText = rightLabel.text {
-                message += rightLabelText
-            }
-            
-            accessibilityLabel = message
-            
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
         } else {
-            var elements: [UIView] = []
-            
-            if let eyebrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
+            var elements: [Any] = []
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
+                elements.append(otherElements)
             }
-            
-            if let headlineText = eyebrowHeadlineBodyLink.headline.text, !headlineText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.headline)
-            }
-            
-            if let bodyText = eyebrowHeadlineBodyLink.body.text, !bodyText.isEmpty {
-                elements.append(eyebrowHeadlineBodyLink.body)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             if let rightLabelText = rightLabel.text, !rightLabelText.isEmpty {
                 elements.append(rightLabel)
             }
-            
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
index a93d50f9..8428dccc 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
@@ -54,8 +54,6 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         arrowAndRightLabelStack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -87,7 +85,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let headlineText = headlineBody.headlineLabel.text, !headlineText.isEmpty {
@@ -103,5 +101,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
index 2dd2ca99..d6714f60 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
@@ -47,7 +47,6 @@ import Foundation
         
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -72,52 +71,44 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let linkText = link.titleLabel?.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return linkText
+        }
+        return label + ", " + linkText
+    }
+    
     func updateAccessibilityLabel() {
-        
-        var message = ""
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel + ", "
-        }
-        
-        if let linkLabel = link.accessibilityLabel {
-            message += linkLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
         isAccessibilityElement = !linkShowing
-        link.isAccessibilityElement = linkShowing
+        accessibilityTraits = .button
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
-        if !linkShowing {
-            // Make whole cell focusable if no link.
-            accessibilityLabel = message
+        link.isAccessibilityElement = linkShowing
+
+        if !linkShowing && accessoryView == nil {
+            // Make whole cell focusable if one action
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
         } else {
-            // Allow only radio button and link to be focused on.
-            link.accessibilityLabel = message
-            var elements: [UIView] = []
-            
+            // Make buttons focusable.
+            var elements: [Any] = []
+            if let accessoryView = accessoryView {
+                accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
+                elements.append(accessoryView)
+            } else {
+                link.accessibilityLabel = getAccessibilityMessage()
+            }
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            
-            if !message.isEmpty {
-                elements.append(link)
-            }
-            
+            elements.append(link)
             accessibilityElements = elements
         }
     }
-    
+            
     open override func accessibilityActivate() -> Bool {
         return link.accessibilityActivate()
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
index a42cd81d..fe2c8a24 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
@@ -51,8 +51,6 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -86,7 +84,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
@@ -98,5 +96,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

From cdbdb907717c71c99a519092e9f3f642028e5ee5 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 16:22:12 -0400
Subject: [PATCH 10/33] accessibility columns

---
 .../ListDeviceComplexButtonMedium.swift       | 29 ++++++++++++++-----
 .../Device/ListDeviceComplexButtonSmall.swift | 29 ++++++++++++++-----
 .../ListFourColumnDataUsageListItem.swift     |  4 +--
 ...neColumnFullWidthTextAllTextAndLinks.swift | 29 ++++++++++---------
 .../ListOneColumnFullWidthTextBodyText.swift  |  4 +--
 .../ListThreeColumnDataUsage.swift            |  4 +--
 .../ListThreeColumnInternationalData.swift    |  4 +--
 .../ListTwoColumnCompareChanges.swift         |  1 -
 .../ListTwoColumnPriceDescription.swift       |  5 +---
 .../TwoColumn/ListTwoColumnPriceDetails.swift |  4 +--
 10 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index 983cfc59..0783ea99 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -58,10 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        isAccessibilityElement = true
         accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -100,10 +98,8 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
-        
+    func getAccessibilityMessage() -> String? {
         var message = ""
-        
         if let eyebrowText = eyebrow.text, !eyebrowText.isEmpty {
             message += eyebrowText + ", "
         }
@@ -123,8 +119,27 @@ import Foundation
         if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
-        
-        accessibilityLabel = message
+        return message.count > 0 ? message : nil
+    }
+    
+    func updateAccessibilityLabel() {
+        accessibilityTraits = .button
+        if let accessoryView = accessoryView {
+            // Both caret and button. Read all content on caret.
+            isAccessibilityElement = false
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, button]
+        } else {
+            // Make whole cell focusable if no action.
+            isAccessibilityElement = true
+            accessibilityElements = nil
+            if let message = getAccessibilityMessage(),
+                let buttonTitle = button.titleLabel?.text {
+                accessibilityLabel = message + ", " + buttonTitle
+            } else {
+                accessibilityLabel = getAccessibilityMessage()
+            }
+        }
     }
     
     open override func accessibilityActivate() -> Bool {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index f0ee4619..20433a45 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -58,10 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        isAccessibilityElement = true
         accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -100,10 +98,8 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
-        
+    func getAccessibilityMessage() -> String? {
         var message = ""
-        
         if let eyebrowText = eyebrow.text, !eyebrowText.isEmpty {
             message += eyebrowText + ", "
         }
@@ -123,8 +119,27 @@ import Foundation
         if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
-        
-        accessibilityLabel = message
+        return message.count > 0 ? message : nil
+    }
+    
+    func updateAccessibilityLabel() {
+        accessibilityTraits = .button
+        if let accessoryView = accessoryView {
+            // Both caret and button. Read all content on caret.
+            isAccessibilityElement = false
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, button]
+        } else {
+            // Make whole cell focusable if no action.
+            isAccessibilityElement = true
+            accessibilityElements = nil
+            if let message = getAccessibilityMessage(),
+                let buttonTitle = button.titleLabel?.text {
+                accessibilityLabel = message + ", " + buttonTitle
+            } else {
+                accessibilityLabel = getAccessibilityMessage()
+            }
+        }
     }
     
     open override func accessibilityActivate() -> Bool {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
index 4ae4c4d2..8455a5bf 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
@@ -54,8 +54,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         arrowAndLabel2Stack.restack()
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //-----------------------------------------------------
@@ -92,7 +90,7 @@ import Foundation
     //-----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let label1Text = label1.text, !label1Text.isEmpty {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index a5d2a374..ee97a369 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -43,7 +43,6 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -72,8 +71,7 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
-        
+    func getAccessibilityMessage() -> String? {
         var message = ""
         
         if let eyebrowLabel = eyebrow.text, !eyebrowLabel.isEmpty {
@@ -91,19 +89,26 @@ import Foundation
         if let bodyLabel = body.text, !bodyLabel.isEmpty {
             message += bodyLabel
         }
-        
+        return message.count > 0 ? message : nil
+    }
+    
+    func updateAccessibilityLabel() {
+
         let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
         link.isAccessibilityElement = linkShowing
         
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = nil
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, link]
         } else {
-            // Allow only radio button and link to be focused on.
-            var elements: [UIView] = []
-
-            
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
+            var elements: [Any] = []
             if let eyeBrowText = eyebrow.text, !eyeBrowText.isEmpty {
                 elements.append(eyebrow)
             }
@@ -119,11 +124,7 @@ import Foundation
             if let bodyText = body.text, !bodyText.isEmpty {
                 elements.append(body)
             }
-            
-            if linkShowing {
-                elements.append(link)
-            }
-            
+            elements.append(link)
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
index bad9caca..cced55dd 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift
@@ -24,8 +24,6 @@ import Foundation
         super.setupView()
         
         addMolecule(headlineBody)
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?){
@@ -46,7 +44,7 @@ import Foundation
     //-----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let headlineLabel = headlineBody.headlineLabel.text {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift
index 00a09527..6e0013d1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift
@@ -42,8 +42,6 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -77,7 +75,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftText = leftLabel.text, !leftText.isEmpty {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift
index 20e7378a..c8aaef83 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift
@@ -55,8 +55,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         arrowAndLabel2Stack.restack()
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -87,7 +85,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftText = leftLabel.text, !leftText.isEmpty {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift
index e0efa546..62048a71 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift
@@ -54,7 +54,6 @@ import Foundation
             ((molecule as? StackItem)?.view as? Stack<StackModel>)?.restack()
         }
         containingStack.restack()
-        isAccessibilityElement = false
     }
     
     //------------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift
index 16328584..472c522d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift
@@ -67,9 +67,6 @@ import Foundation
         leftHeadline.numberOfLines = 1
         rightLabel.numberOfLines = 1
         rightSubLabel.numberOfLines = 1
-        
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
@@ -107,7 +104,7 @@ import Foundation
     //----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftHeadline = leftHeadline.text, !leftHeadline.isEmpty {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift
index e725bb64..cc59a15a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift
@@ -31,8 +31,6 @@ import UIKit
         containerHelper.constrainView(view)
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func updateView(_ size: CGFloat) {
@@ -72,7 +70,7 @@ import UIKit
     //----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabel = leftLabel.text, !leftLabel.isEmpty {

From 023576d260ff3dc9bda2cb0eb44f151f4e01444c Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 16:32:50 -0400
Subject: [PATCH 11/33] remove unnecessary setters

---
 .../List/Device/ListDeviceComplexButtonMedium.swift         | 1 -
 .../List/Device/ListDeviceComplexButtonSmall.swift          | 1 -
 .../LeftVariable/ListLeftVariableIconAllTextLinks.swift     | 1 -
 .../ListOneColumnFullWidthTextAllTextAndLinks.swift         | 1 -
 .../ListRightVariableButtonAllTextAndLinks.swift            | 6 +++---
 .../ListRightVariablePriceChangeAllTextAndLinks.swift       | 1 -
 .../ListRightVariableTextLinkAllTextAndLinks.swift          | 4 ++--
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index 0783ea99..5ce18f6e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -132,7 +132,6 @@ import Foundation
         } else {
             // Make whole cell focusable if no action.
             isAccessibilityElement = true
-            accessibilityElements = nil
             if let message = getAccessibilityMessage(),
                 let buttonTitle = button.titleLabel?.text {
                 accessibilityLabel = message + ", " + buttonTitle
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index 20433a45..25ae3714 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -132,7 +132,6 @@ import Foundation
         } else {
             // Make whole cell focusable if no action.
             isAccessibilityElement = true
-            accessibilityElements = nil
             if let message = getAccessibilityMessage(),
                 let buttonTitle = button.titleLabel?.text {
                 accessibilityLabel = message + ", " + buttonTitle
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 9e4d7533..2411a339 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -82,7 +82,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index ee97a369..979f8110 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -101,7 +101,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
index c08d37cd..f7042b56 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
@@ -86,16 +86,16 @@ import Foundation
     
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         button.isAccessibilityElement = linkShowing
 
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
+            isAccessibilityElement = true
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else {
             // Make buttons focusable.
+            isAccessibilityElement = false
             var elements: [Any] = []
             if let accessoryView = accessoryView {
                 accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
@@ -106,7 +106,7 @@ import Foundation
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            elements.append(link)
+            elements.append(button)
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
index 76ce1a37..4f4180a0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
@@ -107,7 +107,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
index d6714f60..7a4c4595 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
@@ -83,17 +83,17 @@ import Foundation
     
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing
         accessibilityTraits = .button
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         link.isAccessibilityElement = linkShowing
 
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
+            isAccessibilityElement = true
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else {
             // Make buttons focusable.
+            isAccessibilityElement = false
             var elements: [Any] = []
             if let accessoryView = accessoryView {
                 accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()

From 799d6555c07058872b95d585168878fc9f8c1164 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 16:34:18 -0400
Subject: [PATCH 12/33] remove duplicate code device list

---
 .../List/Device/ListDeviceComplexButtonSmall.swift               | 1 -
 .../ListLeftVariableNumberedListAllTextAndLinks.swift            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index 25ae3714..2503cf8a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -123,7 +123,6 @@ import Foundation
     }
     
     func updateAccessibilityLabel() {
-        accessibilityTraits = .button
         if let accessoryView = accessoryView {
             // Both caret and button. Read all content on caret.
             isAccessibilityElement = false
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index 183514de..e0819e4e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -94,7 +94,6 @@ import Foundation
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
-            accessibilityElements = nil
         } else if let accessoryView = accessoryView {
             // Both caret and link. Read all content on caret.
             accessoryView.accessibilityLabel = getAccessibilityMessage()

From 00a71036f3e3954356e43e004e49b5aa5cf7c7c9 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 16:35:28 -0400
Subject: [PATCH 13/33] remove duplicate

---
 .../List/Device/ListDeviceComplexButtonMedium.swift              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index 5ce18f6e..cca10f8f 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -123,7 +123,6 @@ import Foundation
     }
     
     func updateAccessibilityLabel() {
-        accessibilityTraits = .button
         if let accessoryView = accessoryView {
             // Both caret and button. Read all content on caret.
             isAccessibilityElement = false

From 9498053dce49f8cccdd6e7dfb65ae4c77da70bcc Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 16:52:51 -0400
Subject: [PATCH 14/33] remove unneeded code

---
 .../ListLeftVariableCheckboxAllTextAndLinks.swift           | 6 ------
 .../LeftVariable/ListLeftVariableCheckboxBodyText.swift     | 1 -
 .../LeftVariable/ListLeftVariableIconAllTextLinks.swift     | 4 +---
 .../ListLeftVariableNumberedListAllTextAndLinks.swift       | 1 -
 .../ListLeftVariableRadioButtonAllTextAndLinks.swift        | 3 ---
 .../ListLeftVariableRadioButtonAndPaymentMethod.swift       | 3 ---
 .../LeftVariable/ListLeftVariableRadioButtonBodyText.swift  | 1 -
 .../ListRightVariableButtonAllTextAndLinks.swift            | 3 ---
 .../ListRightVariableTextLinkAllTextAndLinks.swift          | 3 ---
 9 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
index 9c8976f6..65d1bd63 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
@@ -49,8 +49,6 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         
-        isAccessibilityElement = true
-        checkbox.isAccessibilityElement = false
         accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
         // Update accessibility label on checkbox state change.
@@ -97,11 +95,7 @@ import Foundation
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
         isAccessibilityElement = !linkShowing
-        checkbox.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
index 1d83cbfb..9d58b625 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
@@ -49,7 +49,6 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         isAccessibilityElement = true
-        checkbox.isAccessibilityElement = false
         accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
         // Update accessibility label on checkbox state change.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 2411a339..15ec2c22 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -76,9 +76,7 @@ import Foundation
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index e0819e4e..1da91ee3 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -90,7 +90,6 @@ import Foundation
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
         accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
index 229a2456..e5e9e178 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift
@@ -95,9 +95,6 @@ import Foundation
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        radioButton.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
index 6cc26352..e8a2ed3c 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
@@ -113,9 +113,6 @@ import UIKit
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        radioButton.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
index 860b78f8..c6349aa1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
@@ -47,7 +47,6 @@ open class ListLeftVariableRadioButtonBodyText: TableViewCell {
         
         // Make the whole cell focusable.
         isAccessibilityElement = true
-        radioButton.isAccessibilityElement = false
         accessibilityTraits = radioButton.accessibilityTraits
         accessibilityHint = radioButton.accessibilityHint
         updateAccessibilityLabel()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
index f7042b56..9c590b0c 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
@@ -86,9 +86,6 @@ import Foundation
     
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        button.isAccessibilityElement = linkShowing
-
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
             isAccessibilityElement = true
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
index 7a4c4595..215eb9f0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
@@ -84,9 +84,6 @@ import Foundation
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         accessibilityTraits = .button
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        link.isAccessibilityElement = linkShowing
-
         if !linkShowing && accessoryView == nil {
             // Make whole cell focusable if one action
             isAccessibilityElement = true

From 36505156d570644c83f2ff0d9fd3ed1b7eca2376 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 17:36:13 -0400
Subject: [PATCH 15/33] image accessibility fix

---
 .../List/Device/ListDeviceComplexButtonMedium.swift         | 2 +-
 .../List/Device/ListDeviceComplexButtonSmall.swift          | 2 +-
 .../List/Device/ListDeviceComplexLinkMedium.swift           | 6 +++---
 .../List/Device/ListDeviceComplexLinkSmall.swift            | 6 +++---
 .../LeftVariable/ListLeftVariableIconAllTextLinks.swift     | 4 ++--
 .../ListLeftVariableIconWithRightCaretBodyText.swift        | 2 +-
 .../ListLeftVariableRadioButtonAndPaymentMethod.swift       | 2 +-
 .../ListOneColumnFullWidthTextAllTextAndLinks.swift         | 4 +---
 .../List/RightVariable/ListRightVariablePayments.swift      | 2 +-
 .../ListRightVariablePriceChangeAllTextAndLinks.swift       | 4 +---
 10 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index cca10f8f..d8885875 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -116,7 +116,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
+        if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
         return message.count > 0 ? message : nil
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index 2503cf8a..b2e4b25c 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -116,7 +116,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
+        if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
         return message.count > 0 ? message : nil
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
index 9c75f78c..ee6ade09 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
@@ -114,7 +114,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+        if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -145,8 +145,8 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
-            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
-                views.append(rightImage)
+            if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
+                views.append(rightImage.imageView)
             }
             
             accessibilityElements = views
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
index 6a469b0d..1791ec9d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
@@ -111,7 +111,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+        if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -142,8 +142,8 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
-            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
-                views.append(rightImage)
+            if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
+                views.append(rightImage.imageView)
             }
             
             accessibilityElements = views
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 15ec2c22..7396aefa 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -87,8 +87,8 @@ import Foundation
         } else {
             // Only link. Manually add accessibility elements to ensure they are read in the right order.
             var elements: [Any] = []
-            if let leftImageLabel = leftImage.accessibilityLabel, !leftImageLabel.isEmpty {
-                elements.append(leftImage)
+            if let leftImageLabel = leftImage.imageView.accessibilityLabel, !leftImageLabel.isEmpty {
+                elements.append(leftImage.imageView)
             }
             if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
                 elements.append(otherElements)
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
index c416e536..c69bebb2 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
@@ -94,7 +94,7 @@ import Foundation
         isAccessibilityElement = true
         var message = ""
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
index e8a2ed3c..9d036d4f 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
@@ -103,7 +103,7 @@ import UIKit
             message += radioButtonLabel + ", "
         }
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index 979f8110..a355dd4c 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -95,9 +95,7 @@ import Foundation
     func updateAccessibilityLabel() {
 
         let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing
-        link.isAccessibilityElement = linkShowing
-        
+        isAccessibilityElement = !linkShowing        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
index 2b12a4c2..f6526e10 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
@@ -77,7 +77,7 @@ import Foundation
             message += leftLabelText + ", "
         }
         
-        if let rightImageText = rightImage.accessibilityLabel, !rightImageText.isEmpty {
+        if let rightImageText = rightImage.imageView.accessibilityLabel, !rightImageText.isEmpty {
             message += rightImageText
         }
         
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
index 4f4180a0..65301304 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
@@ -101,9 +101,7 @@ import Foundation
     func updateAccessibilityLabel() {
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()

From d5447e5842cafb8b041c4b5628a365754bf2ac6a Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 17:37:35 -0400
Subject: [PATCH 16/33] missed image commit

---
 .../List/LeftVariable/ListLeftVariableIconAllTextLinks.swift    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
index 7396aefa..9655c4dd 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
@@ -63,7 +63,7 @@ import Foundation
     }
     
     func getAccessibilityMessage() -> String? {
-        guard let leftImageLabel = leftImage.accessibilityLabel else {
+        guard let leftImageLabel = leftImage.imageView.accessibilityLabel else {
             return eyebrowHeadlineBodyLink.getAccessibilityMessage()
         }
         guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {

From 0e42a10c13dbbb74408c32ab52a9232535086231 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 12 Jun 2020 17:46:14 -0400
Subject: [PATCH 17/33] image fix

---
 .../List/LeftVariable/ListLeftVariableIconWithRightCaret.swift  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
index 821becbe..2ebe1c98 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift
@@ -79,7 +79,7 @@ import UIKit
         isAccessibilityElement = true
         var message = ""
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         

From 7f7edb1ab6ba211933a564c5acd8e2e1bbf28151 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 15 Jun 2020 11:12:02 -0400
Subject: [PATCH 18/33] change ordering

---
 .../RightVariable/ListRightVariableButtonAllTextAndLinks.swift  | 2 +-
 .../ListRightVariableTextLinkAllTextAndLinks.swift              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
index 9c590b0c..f0d5cdbf 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift
@@ -100,10 +100,10 @@ import Foundation
             } else {
                 button.accessibilityLabel = getAccessibilityMessage()
             }
+            elements.append(button)
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            elements.append(button)
             accessibilityElements = elements
         }
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
index 215eb9f0..2c2f25bc 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift
@@ -98,10 +98,10 @@ import Foundation
             } else {
                 link.accessibilityLabel = getAccessibilityMessage()
             }
+            elements.append(link)
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            elements.append(link)
             accessibilityElements = elements
         }
     }

From fbc631d151a9fee2cdacacedb587578e7b5cfbdb Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 15 Jun 2020 11:42:31 -0400
Subject: [PATCH 19/33] trait miss

---
 .../OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index a355dd4c..184abebc 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -95,7 +95,8 @@ import Foundation
     func updateAccessibilityLabel() {
 
         let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
-        isAccessibilityElement = !linkShowing        
+        isAccessibilityElement = !linkShowing
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()

From 5502dd22f7f74503e7435af774e283be8026a2d3 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Tue, 16 Jun 2020 15:16:35 +0530
Subject: [PATCH 20/33] Changes for alignment issue in iPhone 11 simulator and
 accessibility updates

---
 .../ListLeftVariableNumberedListBodyText.swift       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
index c63b3e1a..572ede57 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
@@ -21,8 +21,9 @@ import Foundation
     //--------------------------------------------------
     
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 10, horizontalAlignment: .fill)),
-                                                     (view: headlineBody, model: StackItemModel(percent: 90, horizontalAlignment: .fill))],
+        
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(horizontalAlignment: .fill)),
+                                                     (view: headlineBody, model: StackItemModel(horizontalAlignment: .leading))],
                                               axis: .horizontal)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
@@ -36,10 +37,10 @@ import Foundation
     //--------------------------------------------------
     override open func setupView() {
         super.setupView()
-        leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        leftLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //---------------------------------------------------
@@ -70,6 +71,8 @@ import Foundation
     
     func updateAccessibilityLabel() {
         
+        isAccessibilityElement = true
+        
         var message = ""
         
         if let leftLabel = leftLabel.text {
@@ -85,6 +88,7 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }
 

From 9d1e1f4f4ba284628d8442a81ce6f0df001f6624 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Tue, 16 Jun 2020 20:16:52 +0530
Subject: [PATCH 21/33] Added horizontal hugging priority

---
 .../List/LeftVariable/ListLeftVariableNumberedListBodyText.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
index 572ede57..a0a7a462 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListBodyText.swift
@@ -39,6 +39,7 @@ import Foundation
         super.setupView()
         leftLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
         leftLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
         addMolecule(stack)
         stack.restack()
     }

From 8200fe07d26b195b040429e3253c2caa7b406c36 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 16 Jun 2020 11:02:31 -0400
Subject: [PATCH 22/33] swap trait and hint due to apple defect

---
 MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift          | 2 +-
 MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift       | 2 +-
 .../Views/CarouselIndicator/BarsIndicatorView.swift      | 2 +-
 MVMCoreUI/Atomic/Atoms/Views/Toggle.swift                | 4 ++--
 .../List/Device/ListDeviceComplexButtonMedium.swift      | 2 +-
 .../List/Device/ListDeviceComplexButtonSmall.swift       | 2 +-
 .../ListLeftVariableCheckboxAllTextAndLinks.swift        | 2 +-
 .../LeftVariable/ListLeftVariableCheckboxBodyText.swift  | 2 +-
 .../ListLeftVariableRadioButtonAndPaymentMethod.swift    | 4 ++--
 .../ListLeftVariableRadioButtonBodyText.swift            | 2 +-
 .../ListOneColumnFullWidthTextAllTextAndLinks.swift      | 9 ++++++++-
 .../VerticalCombinationViews/ThreeHeadlineBodyLink.swift | 2 +-
 MVMCoreUI/BaseClasses/TableViewCell.swift                | 2 +-
 13 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
index cffbb916..f23fd337 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
@@ -157,9 +157,9 @@ import MVMCore
     override public init(frame: CGRect) {
         super.init(frame: frame)
         
-        accessibilityTraits = .button
         isAccessibilityElement = true
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "checkbox_action_hint")
+        accessibilityTraits = .button
         updateAccessibilityLabel()
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
index 43750513..371d3f7a 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
@@ -147,8 +147,8 @@ import UIKit
         
         addTarget(self, action: #selector(tapAction), for: .touchUpInside)
         isAccessibilityElement = true
-        accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "radio_action_hint")
+        accessibilityTraits = .button
         updateAccessibilityLabel()
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
index 9dc4a0bd..69048e74 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
@@ -115,12 +115,12 @@ open class BarsIndicatorView: CarouselIndicator {
         
         for i in 0..<numberOfPages {
             let bar = View()
-            bar.accessibilityTraits = .button
             bar.isAccessibilityElement = true
             if let accessibleValueFormat = accessibilityValueFormat, let accessibleIndex = ordinalFormatter.string(from: NSNumber(value: i + 1)) {
                 bar.accessibilityLabel = String(format: accessibleValueFormat, accessibleIndex, numberOfPages)
             }
             bar.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
+            bar.accessibilityTraits = .button
             bar.widthAnchor.constraint(equalToConstant: BarsIndicatorView.indicatorBarWidth).isActive = true
             bar.backgroundColor = isEnabled ? (i == currentIndex ? currentIndicatorColor : indicatorColor) : disabledIndicatorColor
             let barHeight = i == currentIndex ? BarsIndicatorView.indicatorBarHeight.selected : BarsIndicatorView.indicatorBarHeight.unselected
diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 14cfb7b7..17fabef7 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -215,10 +215,10 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         super.setupView()
  
         isAccessibilityElement = true
-        accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccToggleHint")
         accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
-        
+        accessibilityTraits = .button
+
         heightConstraint = heightAnchor.constraint(equalToConstant: Self.containerSize.height)
         heightConstraint?.isActive = true
         
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index d8885875..986ee73b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -58,8 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
+        accessibilityTraits = button.accessibilityTraits
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index b2e4b25c..cd43215b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -58,8 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
+        accessibilityTraits = button.accessibilityTraits
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
index 65d1bd63..ff625e8b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
@@ -49,8 +49,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         
-        accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
+        accessibilityTraits = checkbox.accessibilityTraits
         // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
index 9d58b625..69ad2156 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxBodyText.swift
@@ -49,8 +49,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         isAccessibilityElement = true
-        accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
+        accessibilityTraits = checkbox.accessibilityTraits
         // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
index 9d036d4f..e14e91e2 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
@@ -50,9 +50,9 @@ import UIKit
         eyebrowHeadlineBodyLink.body.textColor = .mvmOrangeAA
         eyebrowHeadlineBodyLink.headline.setFontStyle(.BoldBodySmall)
 
-        accessibilityTraits = radioButton.accessibilityTraits
         accessibilityHint = radioButton.accessibilityHint
-        
+        accessibilityTraits = radioButton.accessibilityTraits
+
         // Update accessibility label on radio button state change.
         observation = observe(\.radioButton.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
index c6349aa1..a30f3f9e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift
@@ -47,8 +47,8 @@ open class ListLeftVariableRadioButtonBodyText: TableViewCell {
         
         // Make the whole cell focusable.
         isAccessibilityElement = true
-        accessibilityTraits = radioButton.accessibilityTraits
         accessibilityHint = radioButton.accessibilityHint
+        accessibilityTraits = radioButton.accessibilityTraits
         updateAccessibilityLabel()
         
         // Update accessibility label on radio button state change.
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index 184abebc..6e5a7245 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -92,11 +92,18 @@ import Foundation
         return message.count > 0 ? message : nil
     }
     
+    // Ensures voice over does not read "selected" after user triggers action on cell.
+    override public var accessibilityTraits: UIAccessibilityTraits {
+        get {
+            return (accessoryView != nil) ? .button : .none
+        }
+        set {}
+    }
+    
     func updateAccessibilityLabel() {
 
         let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        accessibilityTraits = (accessoryView != nil) ? .button : .none
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = getAccessibilityMessage()
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift
index 474907dd..5926951f 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift
@@ -73,8 +73,8 @@ open class ThreeHeadlineBodyLink: View {
         bottomAnchor.constraint(equalTo: link.bottomAnchor).isActive = true
         
         isAccessibilityElement = true
-        accessibilityTraits = link.accessibilityTraits
         accessibilityHint = link.accessibilityHint
+        accessibilityTraits = link.accessibilityTraits
         updateAccessibilityLabel()
     }
 
diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift
index caaeec85..300150e8 100644
--- a/MVMCoreUI/BaseClasses/TableViewCell.swift
+++ b/MVMCoreUI/BaseClasses/TableViewCell.swift
@@ -205,8 +205,8 @@ import UIKit
         let caret = CaretView(lineWidth: 1)
         caret.translatesAutoresizingMaskIntoConstraints = true
         caret.isAccessibilityElement = true
-        caret.accessibilityTraits = .button
         caret.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
+        caret.accessibilityTraits = .button
         caret.size = .small(.vertical)
         if let size = caret.size?.dimensions() {
             caret.frame = CGRect(origin: CGPoint.zero, size: size)

From 5d13d4d3920f77eb3b44d776da3cba386edb3f75 Mon Sep 17 00:00:00 2001
From: Subhankar Acharya <subhankar.acharya@verizon.com>
Date: Tue, 16 Jun 2020 21:30:06 +0530
Subject: [PATCH 23/33] This fixes squishing issue in iPhone 11

---
 .../ListLeftVariableNumberedListAllTextAndLinks.swift     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
index 5924b3d7..78819960 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift
@@ -37,6 +37,8 @@ import Foundation
     //--------------------------------------------------
     override open func setupView() {
         super.setupView()
+        leftLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
         leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
         addMolecule(stack)
         stack.restack()
@@ -66,12 +68,6 @@ import Foundation
         leftLabel.setFontStyle(.Title2XLarge)
     }
     
-    open override func layoutSubviews() {
-        super.layoutSubviews()
-        // This fixes a defect body text where it doesn't layout correctly.
-        eyebrowHeadlineBodyLink.body.preferredMaxLayoutWidth = eyebrowHeadlineBodyLink.frame.width
-    }
-    
     //--------------------------------------------------
     // MARK: - Accessibility
     //--------------------------------------------------

From 7b85475ba8d3e68afe1c4aed81319999f0257acb Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 16 Jun 2020 13:34:37 -0400
Subject: [PATCH 24/33] Move hiding the line in nav bar for tab bar, to the tab
 bar.

---
 .../Atomic/Molecules/NavigationBar/NavigationItemModel.swift   | 2 +-
 MVMCoreUI/BaseControllers/ViewController.swift                 | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index bf926878..2877b250 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -51,7 +51,7 @@ public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProt
         hidden = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidden) ?? false
         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)
+        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) ?? LineModel(type: .standard)
         alwaysShowBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .alwaysShowBackButton) ?? false
         if let backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol) = try typeContainer.decodeModelIfPresent(codingKey: .backButton) {
             self.backButton = backButton
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 395587ec..5e66109d 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -163,9 +163,6 @@ import UIKit
     open func createDefaultLegacyNavigationModel() -> NavigationItemModel {
         let navigationModel = NavigationItemModel()
         navigationModel.title = pageModel?.screenHeading
-        if /*(self as? MVMCoreUITabBarPageControlViewController) != nil ||*/ manager != nil || loadObject?.requestParameters?.tabWasPressed ?? false == true {
-            navigationModel.line = LineModel(type: .none)
-        }
         return navigationModel
     }
 

From e8b2938aa2c6752ef3ff46f9cf950dc1139331a9 Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Wed, 17 Jun 2020 01:27:03 +0530
Subject: [PATCH 25/33] back button image name fix

---
 .../Atomic/Molecules/NavigationBar/NavigationItemModel.swift    | 2 +-
 .../SplitViewController/MVMCoreUISplitViewController.m          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index bf926878..f957f97e 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -19,7 +19,7 @@ public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProt
     public var tintColor: Color
     public var line: LineModel?
     public var alwaysShowBackButton = false
-    public var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? = NavigationImageButtonModel(with: "back", action: ActionBackModel())
+    public var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? = NavigationImageButtonModel(with: "nav_back", action: ActionBackModel())
     public var additionalLeftButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
     public var additionalRightButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
     
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index fe8036d2..ac5d8912 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -146,7 +146,7 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (nullable UIImage *)imageForBackButton {
-    return [MVMCoreUIUtility imageNamed:@"back"];
+    return [MVMCoreUIUtility imageNamed:@"nav_back"];
 }
 
 #pragma mark - Button Presses

From 2e49391e9fa99a04dad466949e8f7c92be1fd700 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 17 Jun 2020 10:28:00 -0400
Subject: [PATCH 26/33] image registry

---
 .../Atomic/Molecules/HorizontalCombinationViews/TabBar.swift  | 2 +-
 .../NavigationBar/Buttons/NavigationImageButtonModel.swift    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
index 94e53790..1068f350 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
@@ -56,7 +56,7 @@ import Foundation
         // Add buttons
         var tabs: [UITabBarItem] = []
         for (index, tab) in model.tabs.enumerated() {
-            let tabBarItem = UITabBarItem(title: tab.title, image: UIImage(named: tab.image, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil), tag: index)
+            let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index)
             tabs.append(tabBarItem)
         }
         setItems(tabs, animated: false)
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
index dc208949..4c021d5f 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
@@ -38,7 +38,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
     
     /// Convenience function that creates a BarButtonItem for the model.
     public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem {
-        let imageName = UIImage(named: image, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
-        return ImageBarButtonItem.create(with: imageName, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+        let uiImage = MVMCoreCache.shared()?.getImageFromRegisteredBundles(image)
+        return ImageBarButtonItem.create(with: uiImage, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
     }
 }

From 91e3df6a5d8b7101385e7f9d53c32b96d4beebfd Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Wed, 17 Jun 2020 21:04:24 +0530
Subject: [PATCH 27/33] moved nav_back and nav_close images to CoreUI

---
 .../Media.xcassets/back.imageset/back.png         | Bin 242 -> 0 bytes
 .../Media.xcassets/back.imageset/back@2x.png      | Bin 414 -> 0 bytes
 .../Media.xcassets/back.imageset/back@3x.png      | Bin 588 -> 0 bytes
 .../closeXBlack.imageset/closeXBlack.png          | Bin 215 -> 0 bytes
 .../closeXBlack.imageset/closeXBlack@2x.png       | Bin 374 -> 0 bytes
 .../closeXBlack.imageset/closeXBlack@3x.png       | Bin 535 -> 0 bytes
 .../Contents.json                                 |   6 +++---
 .../Media.xcassets/nav_back.imageset/nav_back.png | Bin 0 -> 183 bytes
 .../nav_back.imageset/nav_back@2x.png             | Bin 0 -> 335 bytes
 .../nav_back.imageset/nav_back@3x.png             | Bin 0 -> 488 bytes
 .../Contents.json                                 |   6 +++---
 .../nav_close.imageset/nav_close.png              | Bin 0 -> 268 bytes
 .../nav_close.imageset/nav_close@2x.png           | Bin 0 -> 488 bytes
 .../nav_close.imageset/nav_close@3x.png           | Bin 0 -> 738 bytes
 .../MVMCoreUICommonViewsUtility+Extension.swift   |   2 +-
 15 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png
 rename MVMCoreUI/SupportingFiles/Media.xcassets/{back.imageset => nav_back.imageset}/Contents.json (70%)
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
 rename MVMCoreUI/SupportingFiles/Media.xcassets/{closeXBlack.imageset => nav_close.imageset}/Contents.json (69%)
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back.png
deleted file mode 100644
index 3d2734b6d82d8bedda73e882689e9b569807b165..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^AhsX}8v_I5WEI|GAcwIy$lZxy-8q?;K+YOZ7sn6{
z(c}aNCPR;$wu}@$p=!mBvn-+l4wD=Vb~^Z&vB>u}>l|b-;#(u9(siiurXt^zAFPv(
zvV}3QMsD<6(9zg)t6Rq@f?>%o<xOG|vzbpsa6VSJtdO4LBG#~RW@FD>13n|(&x)HQ
zxTKdbh^Q%SKg`S-$yzF+b10qlgw+Jo{|ymR9q|kw{T0+WZZv9bWBM4SpeEz$;HndF
oRKZu_EDNJX!gPj0J`Yufsrq8I%G*8P0Nu^t>FVdQ&MBb@018z}k^lez

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@2x.png
deleted file mode 100644
index 1d64be8bc2b69fb7abcf91510f075c1e989d85fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000yK001Hg1^@s7D6PpW00001b5ch_0Itp)
z=>Px$SV=@dR7ef&l+8*5K@fyjy{Hj?F^C9>BA5r%=g{ZLK~NDC1VIo4QGz1+7Fyqi
zp2KD~JxU)0EvR%)Pfg8k&t$7AgL$i^#0vM8SUj>M#Q|CUlS(O>N!d8Tzi%}L6YEAc
zn~T@EVz&0#tp1>27FU)u<3w{zFtX&^k)G6#I@_|;1bxjnyIU_Y!Jx&Uas{^VP05)J
zO5&qLw<SW;AZAf9&ZXqB;xLreiD!rC{cnqS`vZ~7xx~Q3o&<<jJR$QtBH|4O9=0Sv
zOmu-GVs>z`Dh1+QS1AEqKulL$EJ!iustN@Bdk@97??ZvbSb`Dvnpfa%w|*})Hx>Uz
zQ`=Kd{=OdZSo`9K$Q8H{7sU`@{3>F6DK3j4=*i_-#P~*B6GN~qmj@B!J8@GCL02vq
zV$23?6oPfR&;pE~#GV)e4vRy>_(kL}L(q}Ssfh7$h-1#=3r_P?)1&fRssI2007*qo
IM6N<$g6C+k%K!iX

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/back@3x.png
deleted file mode 100644
index 147e2c6ad7dedcd7b68ee3841838cf4504b13205..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq0015U001)x1^@s7_XUXD00001b5ch_0Itp)
z=>Px%21!IgR9Fe^SZOOoQ51cKe;|<z5gDS0D58u>k|d@427gn&C?Av|G9>f(%tNeI
zXTPpGcVFl9I>g<zdi$Kc*IxVW_wGCQzDy>6_FyY@WZPV}ZRYkqavq%cg=95}6MY?u
zF23b|5sEV017yDfRnanW{uKgUalz>RHWo9{4Xa;d-OXfHv7fcY7+CnJfau1~_%|g;
zFHWyZPT3}zp9x1|{aoS-{zVes>l?sflyl*0Pav{Loo@m1c>S<Q8yCKI1|o~}`4%8=
zA7GIQE_`hrL>8I%E$}nE637nwNR!C-`|e6kiOR&%;V8o?L`<&H4JA(v%_7S0?UtIQ
z1Sd^_JtapCjhF(5YL*i0Hw8|W95vK!3S6pLO0eA&xK(o0P_rp;uVyL1dQ*T$k(X72
z#qYt37aODsQ-CL`mz9Dw>c#vQB>oi2T^JvRyiO^XNks+aWOKS_bP;22D(E_~#Qb!m
zi6e4NNJr{AvBdmhWUK)El@Tl^vhtX~hZK1dWCOgL;&~R#rlG`>SKj>&{F-3u5E=&_
z0cqd>eghE92BCBZNCU_4TY{-Ws28{aq=9qz9Y8Sagwh2d4P3+T38oIAR^SAX2D0!6
zfMC`LB|Zg61H8={3#JaCT3{ED2A<(h0l};iN}GT*z(0EDf~iBO3|Ir$0LRbEGN={U
a)II@r8otkpGSzGV0000<MNUMnLSTX#8vqLc

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack.png
deleted file mode 100644
index 5f31bd2848e43db0f21a371def0f620059cf46a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}6FprVLo5W>
zPH_}!P~dQ#+ZQ1I`d@j*%{a|KqaQ1hjrlnK*Uk`Y`%vfJXS{I3l$e)ug!PUH>^Amp
zwVo?zJlRm%#@8kMHP@$WvA30tuLyHr4`JRCrRt#OIFtEE-p0n?{${t6W81ec)cCxR
zQ)<Q41)59&?~`vSmzb_|=rP%v=6oRcSMm$ah;KbpzAurzU08pEBa~H-=i86sVxZ#~
NJYD@<);T3K0RW5fP%Que

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@2x.png
deleted file mode 100644
index d966cb74c30478272cda60330a1d8964921f7f37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px$FiAu~R9Fekm|+gWAPj{UPr`q_|9SZBCA3vp7&7+yC~Qs0q_ppQu(%~#mJ3G^
zZ;uoFDO1^-2r`Q@o-$^dQkF8Kj38r;yZq9H*Y7&RR5Fv8>R}UQ!AMgu3ohJj#WpcB
z%nb%Vv^L$?FxRcwEs&XW)AA7V(8%`oeJ-(&1a~vZ86(W}Bp!6N04%i-e6I)rAvJsY
zRK5jltx+(vsRpj)P(7Er(g6EUbTN}ea#QK8tvNbwbms*d^V8AWb?PlE&FH+An{tjV
zaBFRdIRuE*xR|qmEVYz52Eg<{=6ZyCdaLF<1U)o9=G=rtty`;GpmN@{Cf!&uQKrn=
z=7y38%wYyx2tbcY4q2D`*brn(QHH*;)%~nUClv)4N~k9OK8ch?1Ln#M19W{P-_;Ag
UXN9MmJpcdz07*qoM6N<$g7AT$p8x;=

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/closeXBlack@3x.png
deleted file mode 100644
index 598475659e712adada27405d4a675351fa7a3a92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px$(Md!>RA>e5nq5xAFc5?*o_OZsy$-kFNZ_gDDr(m0{>+#dYRPJecW1tF3{p@o
zm)BT(2i_b0wat%(Vt^IQU^fRAKHL0m^Q+Aj!hsR2U<SJx4yjSl=h?$;Lv?0k*bS@j
ztl`3};fCGz=r5!h(~bH}x8Hl5qJH%789G&G3`b+42@&ojorNx#2q|Nb2|Gf{z2yc*
z$Z4L_j9SQ<Ubj7+VK~FXI3U{H{IyU$sRBTu*?B{sOc174D8#6k0mRT4@s+Muz$(2Z
zXm4`{Fw^7Zq1Ht}Behh>te6MbQ<L?V_8oyAtx2I+;-dhiheQ@!RmTdKe)6rtu=_{h
zLXYzqsJBehfA1OHt$rNkcTI5vtWXHD^dFB=C|o~UQ*1Cz(*y3Qp#d?3BEXSa23uMq
z1Dfec17;d4fR)}1tGkB*#?WvBdkUFAOf3)lutou*&>RM^7L))=Z7a+D+6?0v9```_
zGShIH*EFNeR?0o)2AeRCUuE7h;l~6AKhqiLf(P)=mS`+Ap=ZQ_^)gdgAOIUJO|zvN
zqlAU}Fk`r(09S1dv0j^7|3^#sjh8BEqTdRK47>4XU+Y6sghOiV#wr7>U^d@XTqVSd
Z^9Mh_uZWnsYPA3W002ovPDHLkV1mNA@q_>X

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
similarity index 70%
rename from MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json
rename to MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
index 3bad3d0c..65a64dfd 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/back.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "back.png",
+      "filename" : "nav_back.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "back@2x.png",
+      "filename" : "nav_back@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "back@3x.png",
+      "filename" : "nav_back@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..2592ddda043233e967fa1a81123d0ff7f42fe64c
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIjKx9jP7LeL$-D$|3O!vMLp*qs
z6BJ}OOj_4!A}izY)Vg6uw@L1i)oqa<_*bYlR{)tZTN@H0df6^!2ng~pE)p?e2>r|c
z=&8#}wP3-sleN#pE*3lJ)Ra<X^1_49Xhz$`1<kE2%))bAXMAK{p~BEn&bU!1@#&P6
d3OnzzGFavr%)Fgy_y=e?gQu&X%Q~loCIJ5VKC}P;

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..077a411db8b12fc37f410371de6d0047b9b8c310
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-#^NA%Cx&(BWL^T<oSrU@AsMW1
zZyEX>aS&-vd?0YePIyjF-{YThA|Eo3dToi`V7$3%+CLT7MbFch&so0wqA%y3s^34C
z>6_J9+KA4#D4S^zU-SRd!@4<#3JYT&o&GG{7qmk+jZ;x4)JK0Asg&Hh&T?<rr3KM{
za+9VBoVfd?XuD^*oXF>{#r3-X^t-YRPje({x6V$QC3q-|%lxQ`a?4tgysk_)j%dw0
zBA0svwgv6bTqdcQv$P=C$JptH*TZEq(pol5J>+Y67Oe4+;%v)L9PLJWUD<_S7E1lo
juj)wlyPo>*>py1ZhF!A@x`h`2Lx{oC)z4*}Q$iB}#6*De

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2ac8c73bba31fb9e6054699464c39704db9ccb0
GIT binary patch
literal 488
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp#^NA%Cx&(BWL^T<i#%N%Ln;{G
z-f_%gaujJvG!*}!6Q`h8yin#SGmFiFZk9W$=Utswn1^1P6#9$bB<O2Z%g;AckKBCw
z!#TmUG5PL?(^=+!&-~qY)pdK+^r+wI_Y$UNvt22_`=Pe>3RBMG%i${+%kJISUGj9n
zKCh=+w)EVw31E7p6yWDpwSeV_>w-BwUmQ3)x*aSfUp5K}h&L7)U1C;M&|`X<vV`5s
zA%^ADNe})h4LdldOr9vG!B{A$p{{I8t^xl7enw^giNEsxdihOn9meuacG=&$0>l~C
z%s#@l;l$<khSJG57{n@n32ev{l0Km1FVA$%H;Fmo$xG)0yF7Ckx@~GXBFsB^6DBU_
zXMC-;kx}Q<7sZ6TDrOC?^XyoFh8%0WTR-!Z`8w&6hTH{9v>NALYF&MfVfLRVjLbPf
z2}RcGJR3Y4PrjXFa6pY!ZF}({hS?%B?wsTNt!yxFeyYOPmX9fB%%-mxj~V}OJJB3I
iPwgi|$H#iXAB=b3t_^BYk7@!&9fPN<pUXO@geCyx8O_%K

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
similarity index 69%
rename from MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json
rename to MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
index d7771f8a..d328ed8e 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack.png",
+      "filename" : "nav_close.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack@2x.png",
+      "filename" : "nav_close@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "closeXBlack@3x.png",
+      "filename" : "nav_close@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..e04a9996db92a8ca047dc3a8a2148381f2813b1d
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px##z{m$R7efImQfDFAPhs>kKO-gC+Ssope<Pk%7QFAQ#vFBB+fImLSoy_cKeLo
z!{qwpuzqiLaGrCgkq4gEyNn<YCd|CjD2ED&n_MpolVQ28T2R%`{i%hjZi4fK0a!ls
z;2MEY9D-OP0(TR~HLES<2l!!Cofr3O6MlkW;G?hG+vO)220mW$PohEmJSZMD(wu=<
zo|>otRks*c3#<B{FPdy53zxH>0a{N50Gz{+0~47bt{2|lUMut2BJNa`y}2*yO<h<8
SR|Am%0000<MNUMnLSTaQo@_n<

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8876428461bc5f70c2cc8455a3eed45bdf4e50a
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px$qDe$SRA>e5noADCFbqTyT!9VuUvMRE12MvamL&Ky6QvcAs+Pu{d6U4RsE5N&
z$GPM>Z6KR43Tt&-%H3NzuH~3HjIar#unO~HNIIFgzm8eMXb9yL=Ecse3#4$iFlI(`
zVF@{UxY^td0}_Rq!i|JbX_mAAAQX%NCKLz-_l64^LeV^F!j({TFS<bqHNxY$c1$Ct
zc4gx^t2R7@CPNw{wUp0wMgSl*T+prJ3`nN8#gn=p0gCjbAg#?FFi)-3A6jPtwA4VM
zqGCPJ-dxm=+SdY>r%io4o$=|jx+t|Un+u`IT48Aa102=)fBs&9)^6z6i?%D@DDgYB
z5CXobAA2i=-0#iBmyOVA0kzZ+(Cm^PKu@im08kkLi}V0c+Y%X|OmCYgFoOU=XavyT
zEl2>Q)|=39#V}@QcB3#2nc9m`BaG-Cbc2s2qj}MUKj7Dwa8J14nz-{B<_#0-!2X&_
zGo%H65jy6>Ea656oVV1?<Zkd1CF;#==E4L_w$;SAn^!nwwRZ7Rjc&W_jBMfTLl_q?
e)65QR=6e7_?Qs^#H2Pft0000<MNUMnLSTZ-BG+~R

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2e9d7df21b6766591a86d3f5cb25ddb068e4c6f
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00001b5ch_0Itp)
z=>Px%oJmAMRCodHoLg?fFc3xg>}NO9f0o{5l@+v}(m_#*<MH^;BiNRLfz0FH6DJZ8
z%H^`gBH&5jqcnT-Y?!DQ`6mCOaV=4|vVE3qHelqJe3O6Ta5xy$cZs5HCSVMTy&nRj
zrAGlA%<~Mu_Mq51@pyVl))FZ3m4T^!s}l>*Gmc@u!v#)44dxS8C@DC&KX}0;;LLoP
z6%GPt?#H}=6F4^?ZjFq<x$Adt2m%+TJFKx1T)5tF0YY$Tbfytf0hdl+IzfNnvg-Q1
z-$g&N`B(aOj`;DN78IWWSp;U$!Cb0yw9x4ORWP+3QG%oT);Ng2_ZIHmPYgmD=w-mG
zkJPt1&f17|eYJ6IqLm@5x>}#GJhU-%J(y8cA(TN>9h5J#I-^EM^UaJ|71kQo=2`i0
ztJ`b5H{Q*NS0gC^X`Gktus$si??qXryBT4ixbYFNuM)Jq-NWxAZu_v_@c9TB1LApV
zP<*5$z!oT`Rc5+I)lNP7p7yU%2&|PQTm}+Q>zdVAQMFTY%4^rriXtF%jiQ-X)pni=
zSPK;Gry-5IN59}}FM!_omqDgAuFX3wxKYES`KJMgGK#8`7983jx?UP^R>rLAhJmv-
zWL@74oR<-=K4##&4S4s1fr}Cz)mIHJT5xoKF}N&3v*@UT%O)_Jo(H(B!qVwVC+Kkq
z?{CuROCw|lX#X)>XSjepk;dmRy<v?TKw7)qb-Oog5$N3Srr)hmCxG5?b06jndL0kO
zoB1&-JZN|{9qtQWaMU3<ALb8M2y75tZrJB=0kk9IdTPJwL}NqN<yF4d^Rxc{x1##|
zEINYMvTYwYHq)Ol_A87y5Rb#bz-9u)Kp2<^6erOsNr^KK^8NJDbu+?Po;?Ws01pmJ
UA<diB8UO$Q07*qoM6N<$g4;A%C;$Ke

literal 0
HcmV?d00001

diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
index cf1603bb..d1173250 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
@@ -13,7 +13,7 @@ public extension MVMCoreUICommonViewsUtility {
     /// Add the close button (x) to the top right of the view. TODO: update this logic.
     @objc static func addCloseButton(to view: UIView, action: @escaping ButtonAction, centeredVertically: Bool = false) -> Button {
         let button = Button()
-        if let image = MVMCoreUIUtility.imageNamed("closeXBlack")?.withRenderingMode(.alwaysTemplate) {
+        if let image = MVMCoreUIUtility.imageNamed("nav_close")?.withRenderingMode(.alwaysTemplate) {
             button.setImage(image, for: .normal)
         }
         button.tintColor = .black

From 304a5f60217908953f0aa0558db3cce15aed8ec1 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 17 Jun 2020 14:01:44 -0400
Subject: [PATCH 28/33] split color change

---
 .../SplitViewController/MVMCoreUISplitViewController.m          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index ac5d8912..b6d4f812 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -918,7 +918,7 @@ CGFloat const PanelAnimationDuration = 0.2;
     self.extendedDrawers =  MFExtendedDrawerLeft | MFExtendedDrawerRight;
     self.prioritizedExtendedPanel = MFExtendedDrawerLeft;
     
-    self.view.backgroundColor = [UIColor blackColor];
+    self.view.backgroundColor = [UIColor whiteColor];
 }
 
 - (void)viewDidLayoutSubviews {

From 0cf5d641e97c31d2621eb4de2b319fedb3ca3a77 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 17 Jun 2020 22:17:10 -0400
Subject: [PATCH 29/33] Wishlist update

---
 .../SplitViewController/MVMCoreUISplitViewController.m           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index b6d4f812..d5124769 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -1069,6 +1069,7 @@ CGFloat const PanelAnimationDuration = 0.2;
     if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) {
         [((UIBarButtonItem <MVMCoreUIPanelButtonProtocol>*)self.rightPanelButton) setIconColor:color];
     }
+    [self.backButton setTintColor:color];
 }
 
 @end

From 728a3ca62284117d36b519f1b37638c93326e89a Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 17 Jun 2020 22:23:40 -0400
Subject: [PATCH 30/33] order fix

---
 .../SplitViewController/MVMCoreUISplitViewController.m      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index d5124769..82594e53 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -237,12 +237,12 @@ CGFloat const PanelAnimationDuration = 0.2;
 - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
     NSMutableArray *leftBarButtonItems = [NSMutableArray array];
     NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController];
-    if (extraButtons) {
-        [leftBarButtonItems addObjectsFromArray:extraButtons];
-    }
     if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) {
         [leftBarButtonItems addObject:self.leftPanelButton];
     }
+    if (extraButtons) {
+        [leftBarButtonItems addObjectsFromArray:extraButtons];
+    }
     [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations];
 }
 

From 69712928fc521acdea4489b6e6079730c10e271d Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 18 Jun 2020 15:46:52 -0400
Subject: [PATCH 31/33] fix for double tracking Change the way the navigation
 bar is updated.

---
 MVMCoreUI.xcodeproj/project.pbxproj           |   4 +
 .../BaseControllers/ViewController.swift      |  53 +++-----
 .../Containers/NavigationController.swift     |   9 +-
 .../MVMCoreUIDetailViewProtocol.h             |   3 +
 ...MCoreUISplitViewController+Extension.swift | 122 ++++++++++++++++++
 .../MVMCoreUISplitViewController.h            |  10 +-
 .../MVMCoreUISplitViewController.m            |  62 ++++++---
 7 files changed, 201 insertions(+), 62 deletions(-)
 create mode 100644 MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 114dd245..bcd50510 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -323,6 +323,7 @@
 		D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */; };
 		D27CD4102339057800C1DC07 /* EyebrowHeadlineBodyLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27CD40F2339057800C1DC07 /* EyebrowHeadlineBodyLink.swift */; };
 		D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */; };
+		D2874024249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2874023249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift */; };
 		D28764AA2458980300CB882D /* ThreeLayerFillMiddleTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764A92458980300CB882D /* ThreeLayerFillMiddleTemplate.swift */; };
 		D28764AC245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */; };
 		D28764F9245A327200CB882D /* TwoLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764F8245A327200CB882D /* TwoLinkView.swift */; };
@@ -769,6 +770,7 @@
 		D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsTableViewCell.swift; sourceTree = "<group>"; };
 		D27CD40F2339057800C1DC07 /* EyebrowHeadlineBodyLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EyebrowHeadlineBodyLink.swift; sourceTree = "<group>"; };
 		D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFTransparentGIFView.swift; sourceTree = "<group>"; };
+		D2874023249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MVMCoreUISplitViewController+Extension.swift"; sourceTree = "<group>"; };
 		D28764A92458980300CB882D /* ThreeLayerFillMiddleTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerFillMiddleTemplate.swift; sourceTree = "<group>"; };
 		D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerFillMiddleTemplateModel.swift; sourceTree = "<group>"; };
 		D28764F8245A327200CB882D /* TwoLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoLinkView.swift; sourceTree = "<group>"; };
@@ -1813,6 +1815,7 @@
 				D29DF15321E69760003B2FB9 /* MVMCoreUIPanelButtonProtocol.h */,
 				D29DF11A21E684A9003B2FB9 /* MVMCoreUISplitViewController.h */,
 				D29DF11B21E684A9003B2FB9 /* MVMCoreUISplitViewController.m */,
+				D2874023249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift */,
 			);
 			path = SplitViewController;
 			sourceTree = "<group>";
@@ -2261,6 +2264,7 @@
 				942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */,
 				8D8067D32444473A00203BE8 /* ListRightVariablePriceChangeAllTextAndLinks.swift in Sources */,
 				8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */,
+				D2874024249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift in Sources */,
 				01F2A03223A4498200D954D8 /* CaretLinkModel.swift in Sources */,
 				0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */,
 				011B58F023A2AA980085F53C /* ListItemModelProtocol.swift in Sources */,
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 5e66109d..5ff6c893 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -196,18 +196,8 @@ import UIKit
         // We additionally want our left items
         navigationItem.leftItemsSupplementBackButton = true
         
-        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)
+        // Utilize helper function to set the split view and navigation item state.
+        MVMCoreUISplitViewController.setSplitViewController(for: viewController, navigationController: navigationController, navigationItemModel: navigationItemModel, leftPanelAccessible: isMasterInitiallyAccessible(), rightPanelAccessible: isSupportInitiallyAccessible(), progress: bottomProgress())
     }
     
     // Eventually will be moved to server
@@ -249,12 +239,10 @@ import UIKit
     }
 
     // Eventually will be moved to Model
-    open func showBottomProgressBar() {
-        if MVMCoreUISplitViewController.main()?.getCurrentVisibleController() == self,
-            let progressString = loadObject?.pageJSON?.optionalStringForKey(KeyProgressPercent),
-            let progress = Float(progressString) {
-            MVMCoreUISplitViewController.main()?.setBottomProgressBarProgress(progress / Float(100))
-        }
+    open func bottomProgress() -> Float? {
+        guard let progressString = loadObject?.pageJSON?.optionalStringForKey(KeyProgressPercent),
+            let progress = Float(progressString) else { return nil }
+        return (progress / Float(100))
     }
     
     // MARK: - TabBar
@@ -318,24 +306,23 @@ import UIKit
         super.viewDidLayoutSubviews()
     }
     
-    open override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
+    open func pageShown() {
+        // Update the navigation bar ui when view is appearing.
+        setNavigationController()
         
-        // Update the navigation bar ui when view is appearing. Can remove check in the future, see viewControllerReady
-        if manager == nil {
-            setNavigationController()
-        }
+        // Update tab if needed.
+        updateTabBar()
+        
+        // Track.
+        MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
+        MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
     }
     
     open override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
-        // Update tab if needed.
-        updateTabBar()
-        
         if manager == nil {
-            MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
-            MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
+            pageShown()
         }
         
         executeBehaviors { (behavior: PageVisibilityBehavior) in
@@ -372,13 +359,7 @@ import UIKit
     
     // MARK: - MVMCoreViewManagerViewControllerProtocol
     open func viewControllerReady(inManager manager: UIViewController & MVMCoreViewManagerProtocol) {
-        // TODO: This check and set aren't technically needed anymore. The one in viewwillappear should be enough. However, there is a timing issue with the manager where the screen lays out before the menu shows, so the screen grows off the screen. Can fix in the future.
-        if let _ = self.view {
-            setNavigationController()
-        }
-        // Janky way to track current page.
-        MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
-        MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
+        pageShown()
     }
     
     // MARK: - MVMCoreLoadDelegateProtocol
diff --git a/MVMCoreUI/Containers/NavigationController.swift b/MVMCoreUI/Containers/NavigationController.swift
index 0d4d0a56..12d70634 100644
--- a/MVMCoreUI/Containers/NavigationController.swift
+++ b/MVMCoreUI/Containers/NavigationController.swift
@@ -67,8 +67,8 @@ import UIKit
         viewController.navigationItem.rightBarButtonItems = rightItems.count > 0 ? rightItems : nil
     }
     
-    /// Convenience function for setting navigation bar with model.
-    public static func set(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
+    /// Convenience function for setting the navigation bar ui, except for the buttons.
+    public static func setNavigationUI(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
         viewController.navigationItem.title = navigationItemModel.title
         viewController.navigationItem.accessibilityLabel = navigationItemModel.title
         viewController.navigationItem.hidesBackButton = (navigationItemModel.backButton != nil)
@@ -86,8 +86,11 @@ import UIKit
         if let navigationController = navigationController as? NavigationController {
             navigationController.separatorView?.isHidden = navigationItemModel.line?.type ?? .standard == .none
         }
+    }
     
-        // Sets up the navigation buttons.
+    /// Convenience function for setting navigation bar with model.
+    public static func set(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
+        setNavigationUI(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
         setNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
     }
     
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
index 377508c7..2ec18da9 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
@@ -42,6 +42,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (UIStatusBarStyle)defaultStatusBarStyle;
 - (nullable UIColor *)defaultStatusBarBackgroundColor;
 
+/// Called when the split view did reset. If this function found, the splitview assumes it is handling the split view state and does not do anything. If you have navigation item buttons, override this function and handle the panels manually.
+- (void)splitViewDidReset;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
new file mode 100644
index 00000000..ed4f931c
--- /dev/null
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -0,0 +1,122 @@
+//
+//  MVMCoreUISplitViewController+Extension.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 6/18/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public extension MVMCoreUISplitViewController {
+    
+    /// Convenience function. Sets the navigation and split view properties for the view controller.
+    static func setSplitViewController(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool, rightPanelAccessible: Bool, progress: Float? = nil) {
+        guard let splitView = MVMCoreUISplitViewController.main(),
+            navigationController == splitView.navigationController,
+            navigationController.topViewController == viewController else {
+                NavigationController.set(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+                return
+        }
+        splitView.set(for: viewController, navigationController: navigationController, navigationItemModel: navigationItemModel, leftPanelAccessible: leftPanelAccessible, rightPanelAccessible: rightPanelAccessible, progress: progress)
+    }
+        
+    /// Sets the navigation item for the view controller based on the model and splitview controller
+    func set(for viewController: UIViewController, navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, leftPanelAccessible: Bool, rightPanelAccessible: Bool, progress: Float? = nil) {
+        
+        // Setup the panels.
+        MVMCoreUISession.sharedGlobal()?.splitViewController?.setupPanels()
+
+        NavigationController.setNavigationUI(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+        
+        MVMCoreUISplitViewController.main()?.setLeftPanelIsAccessible(leftPanelAccessible, for: viewController, updateNavigationButtons: false)
+        MVMCoreUISplitViewController.main()?.setRightPanelIsAccessible(rightPanelAccessible, for: viewController, updateNavigationButtons: false)
+        
+        setLeftNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+        setRightNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+        
+        MVMCoreUISession.sharedGlobal()?.splitViewController?.setNavigationIconColor(navigationItemModel.tintColor.uiColor)
+        
+        setBottomProgressBarProgress(progress ?? 0)
+    }
+    
+    /// Sets the left navigation items for the view controller based on model and splitview.
+    func setLeftNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
+        var leftItems: [UIBarButtonItem] = []
+        let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
+
+        // Add back button first.
+        if let backButtonModel = navigationItemModel?.backButton {
+            if navigationController.viewControllers.count > 1 || navigationItemModel!.alwaysShowBackButton {
+                leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+            }
+        } else if let backButton = backButton,
+            navigationController.viewControllers.count > 1 {
+            leftItems.append(backButton)
+        }
+        
+        // Add the panel button after the back button.
+        if let panelButton = leftPanelButton,
+            leftPanelIsAccessible,
+            !leftPanelStaysExtended() {
+            leftItems.append(panelButton)
+        }
+        
+        // Add other model buttons
+        if let leftItemModels = navigationItemModel?.additionalLeftButtons {
+            for item in leftItemModels {
+                leftItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+            }
+        }
+        
+        // Add any buttons added by the splitview.
+        if let additionalLeftButtons = additionalLeftButtons(for: viewController) {
+            leftItems.append(contentsOf: additionalLeftButtons)
+        }
+        
+        viewController.navigationItem.setLeftBarButtonItems(leftItems.count > 0 ? leftItems : nil, animated: !DisableAnimations.boolValue)
+    }
+    
+    /// Sets the right navigation items for the view controller based on model and splitview.
+    func setRightNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
+        let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
+        var rightItems: [UIBarButtonItem] = []
+        
+        // Add the panel button first.
+        if let panelButton = rightPanelButton,
+            rightPanelIsAccessible,
+            !rightPanelStaysExtended() {
+            rightItems.append(panelButton)
+        }
+        
+        // Add other model buttons
+        if let rightItemModels = navigationItemModel?.additionalRightButtons {
+            for item in rightItemModels {
+                rightItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
+            }
+        }
+        
+        // Add any buttons added by the splitview.
+        if let additionalRightButtons = additionalRightButtons(for: viewController) {
+            rightItems.append(contentsOf: additionalRightButtons)
+        }
+        
+        viewController.navigationItem.setRightBarButtonItems(rightItems.count > 0 ? rightItems : nil, animated: !DisableAnimations.boolValue)
+    }
+    
+    // MARK: - Legacy Functions
+    /// Convenience setter for legacy files. Sets the navigation item for the view controller based on the json and splitview controller
+    @objc static func setSplitViewController(for viewController: UIViewController, navigationController: UINavigationController, navigationJSON: [String: Any], leftPanelAccessible: Bool, rightPanelAccessible: Bool, progress: NSNumber?) throws {
+        guard let navigationItemModel = try MoleculeObjectMapping.shared()?.getMoleculeModelForJSON(navigationJSON) as? (MoleculeModelProtocol & NavigationItemModelProtocol) else {
+            throw ModelRegistry.Error.decoderOther(message: "Model not a bar model")
+        }
+        guard let splitView = MVMCoreUISplitViewController.main(),
+            navigationController == splitView.navigationController,
+            navigationController.topViewController == viewController else {
+                NavigationController.set(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+                return
+        }
+        let progress = progress?.floatValue
+        splitView.set(for: viewController, navigationController: navigationController, navigationItemModel: navigationItemModel, leftPanelAccessible: leftPanelAccessible, rightPanelAccessible: rightPanelAccessible, progress: progress)
+    }
+}
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
index 4d6b2cff..c48c9e8c 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
@@ -67,10 +67,10 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 #pragma mark - Panel Functions
 
 // Sets if the left panel accessible for the view controller. Will show or hide the button.
-- (void)setLeftPanelIsAccessible:(BOOL)leftPanelIsAccessible forViewController:(nonnull UIViewController *)viewController;
+- (void)setLeftPanelIsAccessible:(BOOL)leftPanelIsAccessible forViewController:(nonnull UIViewController *)viewController updateNavigationButtons:(BOOL)updateNavigationButtons;
 
 // Sets if the right panel accessible for the view controller. Will show or hide the button.
-- (void)setRightPanelIsAccessible:(BOOL)rightPanelIsAccessible forViewController:(nonnull UIViewController *)viewController;
+- (void)setRightPanelIsAccessible:(BOOL)rightPanelIsAccessible forViewController:(nonnull UIViewController *)viewController updateNavigationButtons:(BOOL)updateNavigationButtons;
 
 - (void)hideLeftPanelIfNeededAnimated:(BOOL)animated;
 - (void)showLeftPanelAnimated:(BOOL)animated;
@@ -94,6 +94,12 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 /// Updates the panels that are used.
 - (void)setupPanels;
 
+/// Returns if the left panel is staying extended (usually do to screen size threshold)
+- (BOOL)leftPanelStaysExtended;
+
+/// Returns if the right panel is staying extended (usually do to screen size threshold)
+- (BOOL)rightPanelStaysExtended;
+
 #pragma mark - Bottom Progress Bar
 
 - (void)setBottomProgressBarProgress:(float)progress;
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 82594e53..03025617 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -110,11 +110,11 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (nullable NSArray <UIBarButtonItem *>*)additionalLeftButtonsForViewController:(nonnull UIViewController *)viewController {
-    return viewController.navigationItem.leftBarButtonItems;
+    return nil;
 }
 
 - (nullable NSArray <UIBarButtonItem *>*)additionalRightButtonsForViewController:(nonnull UIViewController *)viewController {
-    return viewController.navigationItem.rightBarButtonItems;
+    return nil;
 }
 
 - (CGFloat)leftPanelExtendedWidth {
@@ -234,19 +234,27 @@ CGFloat const PanelAnimationDuration = 0.2;
     }
 }
 
+- (BOOL)leftPanelStaysExtended {
+    MFNumberOfDrawers numberOfDrawers = [self numberOfDrawersShouldShow:self.transitionWidth];
+    return [self shouldExtendLeftPanel:numberOfDrawers] && (numberOfDrawers != MFOneDrawer || self.explictlyShowingPanel != self.rightPanel);
+}
+
 - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
     NSMutableArray *leftBarButtonItems = [NSMutableArray array];
-    NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController];
-    if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) {
+    if ([viewController.navigationController.viewControllers count] > 1) {
+        [leftBarButtonItems addObject:self.backButton];
+    }
+    if ((accessible && !extended) && self.leftPanelButton) {
         [leftBarButtonItems addObject:self.leftPanelButton];
     }
+    NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController];
     if (extraButtons) {
         [leftBarButtonItems addObjectsFromArray:extraButtons];
     }
     [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations];
 }
 
-- (void)setLeftPanelIsAccessible:(BOOL)leftPanelIsAccessible forViewController:(UIViewController *)viewController {
+- (void)setLeftPanelIsAccessible:(BOOL)leftPanelIsAccessible forViewController:(UIViewController *)viewController updateNavigationButtons:(BOOL)updateNavigationButtons {
     if ([self.leftPanel respondsToSelector:@selector(panelAvailable)]) {
         self.leftPanelIsAccessible = leftPanelIsAccessible && [self.leftPanel panelAvailable];
     } else {
@@ -262,8 +270,7 @@ CGFloat const PanelAnimationDuration = 0.2;
         } else {
 
             // Determine if we should show the panel (extended based on width or from explicit action).
-            MFNumberOfDrawers numberOfDrawers = [self numberOfDrawersShouldShow:self.transitionWidth];
-            extended = [self shouldExtendLeftPanel:numberOfDrawers] && (numberOfDrawers != MFOneDrawer || self.explictlyShowingPanel != self.rightPanel);
+            extended = [self leftPanelStaysExtended];
             if (extended || self.explictlyShowingPanel == self.leftPanel) {
                 [self showLeftPanelAnimated:NO explict:NO];
             }
@@ -272,7 +279,9 @@ CGFloat const PanelAnimationDuration = 0.2;
                 [self.leftPanel resetIconToDefault];
             }
         }
-        [self setLeftNavigationItemForViewController:viewController accessible:self.leftPanelIsAccessible extended:extended];
+        if (updateNavigationButtons) {
+            [self setLeftNavigationItemForViewController:viewController accessible:self.leftPanelIsAccessible extended:extended];
+        }
     }];
 }
 
@@ -407,10 +416,10 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 - (void)setRightNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
     NSMutableArray *navigationItems = [[NSMutableArray alloc] init];
-    NSArray *extraButtons = [self additionalRightButtonsForViewController:viewController];
-    if ((accessible && !extended) && self.rightPanelButton && ![extraButtons containsObject:self.rightPanelButton]) {
+    if ((accessible && !extended) && self.rightPanelButton) {
         [navigationItems addObject:self.rightPanelButton];
     }
+    NSArray *extraButtons = [self additionalRightButtonsForViewController:viewController];
     if (extraButtons) {
         [navigationItems addObjectsFromArray:extraButtons];
     }
@@ -440,7 +449,12 @@ CGFloat const PanelAnimationDuration = 0.2;
     }
 }
 
-- (void)setRightPanelIsAccessible:(BOOL)rightPanelIsAccessible forViewController:(UIViewController *)viewController {
+- (BOOL)rightPanelStaysExtended {
+    MFNumberOfDrawers numberOfDrawers = [self numberOfDrawersShouldShow:self.transitionWidth];
+    return [self shouldExtendRightPanel:numberOfDrawers] && (numberOfDrawers != MFOneDrawer || self.explictlyShowingPanel != self.leftPanel);
+}
+
+- (void)setRightPanelIsAccessible:(BOOL)rightPanelIsAccessible forViewController:(UIViewController *)viewController updateNavigationButtons:(BOOL)updateNavigationButtons {
     
     if ([self.rightPanel respondsToSelector:@selector(panelAvailable)]) {
         self.rightPanelIsAccessible = rightPanelIsAccessible && [self.rightPanel panelAvailable];
@@ -458,8 +472,7 @@ CGFloat const PanelAnimationDuration = 0.2;
         } else {
             
             // Determine if we should show the right panel (extended based on width or from explicit action).
-            MFNumberOfDrawers numberOfDrawers = [self numberOfDrawersShouldShow:self.transitionWidth];
-            extended = [self shouldExtendRightPanel:numberOfDrawers] && (numberOfDrawers != MFOneDrawer || self.explictlyShowingPanel != self.leftPanel);
+            extended = [self rightPanelStaysExtended];
             if (extended || self.explictlyShowingPanel == self.rightPanel) {
                 [self showRightPanelAnimated:NO explict:NO];
             }
@@ -468,7 +481,10 @@ CGFloat const PanelAnimationDuration = 0.2;
                 [self.rightPanel resetIconToDefault];
             }
         }
-        [self setRightNavigationItemForViewController:viewController accessible:rightPanelIsAccessible extended:extended];
+        
+        if (updateNavigationButtons) {
+            [self setRightNavigationItemForViewController:viewController accessible:rightPanelIsAccessible extended:extended];
+        }
     }];
 }
 
@@ -958,11 +974,11 @@ CGFloat const PanelAnimationDuration = 0.2;
     self.transitionWidth = @(size.width);
     
     void (^animate)(id<UIViewControllerTransitionCoordinatorContext>) = nil;
-    if (self.leftPanelIsAccessible || self.rightPanelIsAccessible) {
+//    if (self.leftPanelIsAccessible || self.rightPanelIsAccessible) {
         animate = ^(id<UIViewControllerTransitionCoordinatorContext> context) {
             [self resetDrawers];
         };
-    }
+//    }
     
     [coordinator animateAlongsideTransition:animate completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
         self.transitionWidth = nil;
@@ -974,11 +990,15 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (void)resetDrawers {
-    [self setLeftPanelIsAccessible:self.leftPanelIsAccessible forViewController:self.navigationItemViewController];
-    [self setRightPanelIsAccessible:self.rightPanelIsAccessible forViewController:self.navigationItemViewController];
-    
-    [self.view setNeedsLayout];
-    [self.view layoutIfNeeded];
+    if ([self.navigationItemViewController respondsToSelector:@selector(splitViewDidReset)]) {
+        [((UIViewController<MVMCoreUIDetailViewProtocol> *)self.navigationItemViewController) splitViewDidReset];
+    } else {
+        [self setLeftPanelIsAccessible:self.leftPanelIsAccessible forViewController:self.navigationItemViewController updateNavigationButtons:YES];
+        [self setRightPanelIsAccessible:self.rightPanelIsAccessible forViewController:self.navigationItemViewController updateNavigationButtons:YES];
+        
+        [self.view setNeedsLayout];
+        [self.view layoutIfNeeded];
+    }
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

From a5641738620793bc19429b8082efd2d33c575ab0 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 18 Jun 2020 16:34:33 -0400
Subject: [PATCH 32/33] tab bar fixes

---
 MVMCoreUI/BaseControllers/ViewController.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 5ff6c893..3a7bc962 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-@objc open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MoleculeDelegateProtocol, FormHolderProtocol, MVMCoreActionDelegateProtocol, MVMCoreLoadDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, ObservingTextFieldDelegate {
+@objc open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MoleculeDelegateProtocol, FormHolderProtocol, MVMCoreActionDelegateProtocol, MVMCoreLoadDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, ObservingTextFieldDelegate, MVMCoreUIDetailViewProtocol {
     @objc public var pageType: String?
     @objc public var loadObject: MVMCoreLoadObject?
     public var pageModel: MVMControllerModelProtocol?
@@ -421,6 +421,13 @@ import UIKit
     open func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], indexPath: IndexPath, animation: UITableView.RowAnimation) {}
     open func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], animation: UITableView.RowAnimation) {}
     
+    // MARK: - MVMCoreUIDetailViewProtocol
+    
+    // Reset the navigation state.
+    public func splitViewDidReset() {
+        setNavigationController()
+    }
+    
     // MARK: - UITextFieldDelegate (Check if this is still needed)
     // To Remove TextFields Bug: Keyboard is not dismissing after reaching textfield max length limit
     open func textFieldShouldReturn(_ textField: UITextField) -> Bool {

From fde6e7ed9b22b20fd68c90ea4ab0429c894320a3 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 18 Jun 2020 16:45:23 -0400
Subject: [PATCH 33/33] remove comments

---
 .../SplitViewController/MVMCoreUISplitViewController.m        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 03025617..2a98a418 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -974,11 +974,11 @@ CGFloat const PanelAnimationDuration = 0.2;
     self.transitionWidth = @(size.width);
     
     void (^animate)(id<UIViewControllerTransitionCoordinatorContext>) = nil;
-//    if (self.leftPanelIsAccessible || self.rightPanelIsAccessible) {
+    if (self.leftPanelIsAccessible || self.rightPanelIsAccessible) {
         animate = ^(id<UIViewControllerTransitionCoordinatorContext> context) {
             [self resetDrawers];
         };
-//    }
+    }
     
     [coordinator animateAlongsideTransition:animate completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
         self.transitionWidth = nil;