From 483454d0943e6fc54b8a1b58bc42457720437b34 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Mon, 11 Mar 2024 11:52:37 -0400
Subject: [PATCH 1/4] Digital PCT265 story ONEAPP-4818 - Updating atomic
 headers to utilize vds title lockup

---
 .../Headers/H1/HeadersH1Button.swift          | 14 +--
 .../Headers/H1/HeadersH1ButtonModel.swift     | 29 +++---
 .../H1/HeadersH1NoButtonsBodyText.swift       | 14 +--
 .../H1/HeadersH1NoButtonsBodyTextModel.swift  | 89 ++++++++++++++-----
 .../Headers/H2/HeadersH2Buttons.swift         | 14 +--
 .../Headers/H2/HeadersH2ButtonsModel.swift    | 25 +++---
 .../Headers/H2/HeadersH2CaretLink.swift       | 14 +--
 .../Headers/H2/HeadersH2CaretLinkModel.swift  | 25 +++---
 .../Headers/H2/HeadersH2Link.swift            | 14 +--
 .../Headers/H2/HeadersH2LinkModel.swift       | 25 +++---
 .../H2/HeadersH2NoButtonsBodyText.swift       | 14 +--
 .../H2/HeadersH2NoButtonsBodyTextModel.swift  | 25 +++---
 .../Headers/H2/HeadersH2TinyButton.swift      | 14 +--
 .../Headers/H2/HeadersH2TinyButtonModel.swift | 25 +++---
 .../HeadlineBodyModel.swift                   | 25 +++++-
 15 files changed, 211 insertions(+), 155 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift
index e4ede5e8..e4708b51 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift
@@ -8,14 +8,14 @@
 
 import Foundation
 
-@objcMembers open class HeadersH1Button: HeaderView {
+open class HeadersH1Button: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     public let buttons = TwoButtonView()
     public lazy var stack: Stack<StackModel> = {
-        Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen)
+        Stack<StackModel>.createStack(with: [titleLockup, buttons], spacing: Padding.Eighteen)
       }()
     
     //-------------------------------------------------------
@@ -23,7 +23,6 @@ import Foundation
     //-------------------------------------------------------
     open override func setupView() {
         super.setupView()
-        headlineBody.styleLandingPageHeader()
         addMolecule(stack)
         stack.restack()
     }
@@ -35,14 +34,9 @@ import Foundation
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? HeadersH1ButtonModel else { return }
         
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
         buttons.set(with: model.buttons, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { 121 }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.styleLandingPageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift
index 9ed584a9..0cf8410f 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift
@@ -13,15 +13,16 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "headerH1Btn"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
     public var buttons: TwoButtonViewModel
-    
+    private var helper = DeprecatedHeadlineBodyHelper()
+
     public var children: [MoleculeModelProtocol] {
-        [headlineBody, buttons]
+        [titleLockup, buttons]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
         || replaceChildMolecule(at: &buttons, with: molecule)
     }
     
@@ -29,8 +30,8 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel, buttons: TwoButtonViewModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel, buttons: TwoButtonViewModel) {
+        self.titleLockup = titleLockup
         self.buttons = buttons
         super.init()
     }
@@ -40,10 +41,13 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
     //--------------------------------------------------
 
     public override func setDefaults() {
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
-        }
         super.setDefaults()
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitle2XLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
+        }
     }
     
     //--------------------------------------------------
@@ -52,7 +56,7 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
     
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
         case buttons
     }
     
@@ -61,7 +65,7 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
     //--------------------------------------------------
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         buttons = try typeContainer.decode(TwoButtonViewModel.self, forKey: .buttons)
         try super.init(from: decoder)
     }
@@ -70,7 +74,8 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(buttons, forKey: .buttons)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyText.swift
index e751815e..68e31680 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyText.swift
@@ -8,20 +8,19 @@
 
 import Foundation
 
-@objcMembers open class HeadersH1NoButtonsBodyText: HeaderView {
+open class HeadersH1NoButtonsBodyText: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
     
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     
     //-------------------------------------------------------
     // MARK: - View Lifecycle
     //-------------------------------------------------------
     open override func setupView() {
         super.setupView()
-        headlineBody.styleLandingPageHeader()
-        addMolecule(headlineBody)
+        addMolecule(titleLockup)
     }
     
     //----------------------------------------------------
@@ -31,13 +30,8 @@ import Foundation
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? HeadersH1NoButtonsBodyTextModel else { return }
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { 121 }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.styleLandingPageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
index 9f3e6133..7450c9aa 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
@@ -6,50 +6,48 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-
-
 public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol, ParentMoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
     
     public static var identifier: String = "headerH1"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody]
+        [titleLockup]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
+    }
+    
+    public override func setDefaults() {
+        super.setDefaults()
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitle2XLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
+        }
     }
     
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel) {
+        self.titleLockup = titleLockup
         super.init()
     }
     
-    //--------------------------------------------------
-    // MARK: - Subclass
-    //--------------------------------------------------
-
-    public override func setDefaults() {
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
-        }
-        super.setDefaults()
-    }
-    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
     }
     
     //--------------------------------------------------
@@ -57,7 +55,7 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     //--------------------------------------------------
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         try super.init(from: decoder)
     }
     
@@ -65,6 +63,55 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
+    }
+}
+
+public struct DeprecatedHeadlineBodyHelper {
+    var headlineBody: HeadlineBodyModel?
+    
+    private enum DeprecatedCodingKeys: String, CodingKey {
+        case headlineBody
+    }
+    
+    public mutating func deprecatedCreate(from decoder: Decoder) throws -> TitleLockupModel? {
+        let typeContainer = try decoder.container(keyedBy: DeprecatedCodingKeys.self)
+        headlineBody = try typeContainer.decodeIfPresent(HeadlineBodyModel.self, forKey: .headlineBody)
+        guard let headlineBody = headlineBody else { return nil }
+        return try createTitleLockupModel(headlineBody: headlineBody)
+    }
+    
+    public func deprecatedEncode(to encoder: Encoder) throws -> Bool {
+        guard let headlineBody = headlineBody else { return false }
+        var container = encoder.container(keyedBy: DeprecatedCodingKeys.self)
+        try container.encode(headlineBody, forKey: DeprecatedCodingKeys.headlineBody)
+        return true
+    }
+    
+    public func createTitleLockupModel(defaultStyle: HeadlineBodyModel.Style = .header, headlineBody: HeadlineBodyModel) throws -> TitleLockupModel {
+        guard let headline = headlineBody.headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
+        var body = headlineBody.body
+        switch headlineBody.style ?? defaultStyle {
+        case .landingHeader:
+            headline.fontStyle = Styler.Font.RegularTitle2XLarge
+            body?.fontStyle = Styler.Font.RegularTitleMedium
+        case .itemHeader:
+            headline.fontStyle = Styler.Font.BoldTitleLarge
+            body?.fontStyle = Styler.Font.RegularBodyLarge
+        default:
+            headline.fontStyle = Styler.Font.RegularTitleXLarge
+            body?.fontStyle = Styler.Font.RegularTitleMedium
+        }
+        let model = try TitleLockupModel(title: headline, subTitle: body)
+        model.id = headlineBody.id
+        return model
+    }
+    
+    public func createHeadlineBodyModel(titleLockup: TitleLockupModel) -> HeadlineBodyModel {
+        var headlineBody = HeadlineBodyModel(headline: titleLockup.title)
+        headlineBody.body = titleLockup.subTitle
+        headlineBody.id = titleLockup.id
+        return headlineBody
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift
index 8604a56b..119cc551 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift
@@ -9,15 +9,15 @@
 import Foundation
 
 
-@objcMembers open class HeadersH2Buttons: HeaderView {
+open class HeadersH2Buttons: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
     
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     public let buttons = TwoButtonView()
     public lazy var stack: Stack<StackModel> = {
-        return Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3)
+        return Stack<StackModel>.createStack(with: [titleLockup, buttons], spacing: PaddingDefaultVerticalSpacing3)
       }()
     
     //-------------------------------------------------------
@@ -26,7 +26,6 @@ import Foundation
     
     open override func setupView() {
         super.setupView()
-        headlineBody.stylePageHeader()
         addMolecule(stack)
         stack.restack()
     }
@@ -40,16 +39,11 @@ import Foundation
         
         guard let model = model as? HeadersH2ButtonsModel else { return }
         
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
         buttons.set(with: model.buttons, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 121
     }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.stylePageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
index 8a5a3e64..3b4d0b7e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
@@ -15,15 +15,16 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     //--------------------------------------------------
     
     public static var identifier: String = "headerH2Btns"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
     public var buttons: TwoButtonViewModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody, buttons]
+        [titleLockup, buttons]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
         || replaceChildMolecule(at: &buttons, with: molecule)
     }
     
@@ -31,8 +32,8 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel, buttons: TwoButtonViewModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel, buttons: TwoButtonViewModel) {
+        self.titleLockup = titleLockup
         self.buttons = buttons
         super.init()
     }
@@ -48,8 +49,11 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
         if bottomPadding == nil {
             bottomPadding = Padding.Component.VerticalMarginSpacing
         }
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
         super.setDefaults()
     }
@@ -60,7 +64,7 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
         case buttons
     }
     
@@ -70,7 +74,7 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
         buttons = try typeContainer.decode(TwoButtonViewModel.self, forKey: .buttons)
         try super.init(from: decoder)
     }
@@ -79,7 +83,8 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(buttons, forKey: .buttons)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift
index c641ac97..21bd02ab 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift
@@ -7,14 +7,14 @@
 //
 
 import Foundation
-@objcMembers open class HeadersH2CaretLink: HeaderView {
+open class HeadersH2CaretLink: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     public let caretLink = CaretLink()
     public lazy var stack: Stack<StackModel> = {
-        return Stack<StackModel>.createStack(with: [headlineBody, caretLink])
+        return Stack<StackModel>.createStack(with: [titleLockup, caretLink])
       }()
     
     //-------------------------------------------------------
@@ -22,7 +22,6 @@ import Foundation
     //-------------------------------------------------------
     open override func setupView() {
         super.setupView()
-        headlineBody.stylePageHeader()
         addMolecule(stack)
         stack.restack()
     }
@@ -33,16 +32,11 @@ import Foundation
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? HeadersH2CaretLinkModel else { return }
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
         caretLink.set(with: model.caretLink, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 121
     }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.stylePageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift
index c50fb736..4f7129da 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift
@@ -12,23 +12,24 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "headerH2CrtBtn"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
     public var caretLink: CaretLinkModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody, caretLink]
+        [titleLockup, caretLink]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
         || replaceChildMolecule(at: &caretLink, with: molecule)
     }
     
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
-    public init(headlineBody: HeadlineBodyModel, caretLink: CaretLinkModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel, caretLink: CaretLinkModel) {
+        self.titleLockup = titleLockup
         self.caretLink = caretLink
         super.init()
     }
@@ -43,8 +44,11 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
         if bottomPadding == nil {
             bottomPadding = Padding.Component.VerticalMarginSpacing
         }
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
         super.setDefaults()
     }
@@ -54,7 +58,7 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
         case caretLink
     }
     
@@ -63,7 +67,7 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     //--------------------------------------------------
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
         caretLink = try typeContainer.decode(CaretLinkModel.self, forKey: .caretLink)
         try super.init(from: decoder)
     }
@@ -72,7 +76,8 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(caretLink, forKey: .caretLink)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift
index e90a51f2..24ad40b5 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift
@@ -8,14 +8,14 @@
 
 import Foundation
 
-@objcMembers open class HeadersH2Link: HeaderView {
+open class HeadersH2Link: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     public let link = Link()
     public lazy var stack: Stack<StackModel> = {
-        return Stack<StackModel>.createStack(with: [headlineBody, link])
+        return Stack<StackModel>.createStack(with: [titleLockup, link])
       }()
     
     //-------------------------------------------------------
@@ -23,7 +23,6 @@ import Foundation
     //-------------------------------------------------------
     open override func setupView() {
         super.setupView()
-        headlineBody.stylePageHeader()
         addMolecule(stack)
         stack.restack()
     }
@@ -34,16 +33,11 @@ import Foundation
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? HeadersH2LinkModel else { return }
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
         link.set(with: model.link, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 121
     }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.stylePageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift
index ced6b47a..1ec6590d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift
@@ -14,15 +14,16 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
     //--------------------------------------------------
     
     public static var identifier: String = "headerH2Link"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
     public var link: LinkModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody, link]
+        [titleLockup, link]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
         || replaceChildMolecule(at: &link, with: molecule)
     }
     
@@ -30,8 +31,8 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel, link: LinkModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel, link: LinkModel) {
+        self.titleLockup = titleLockup
         self.link = link
         super.init()
     }
@@ -47,8 +48,11 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
         if bottomPadding == nil {
             bottomPadding = Padding.Component.VerticalMarginSpacing
         }
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
         super.setDefaults()
     }
@@ -59,7 +63,7 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
     
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
         case link
     }
     
@@ -69,7 +73,7 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
         link = try typeContainer.decode(LinkModel.self, forKey: .link)
         try super.init(from: decoder)
     }
@@ -78,7 +82,8 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(link, forKey: .link)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyText.swift
index ca394b05..7cd68ce7 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyText.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyText.swift
@@ -9,12 +9,12 @@
 import Foundation
 
 
-@objcMembers open class HeadersH2NoButtonsBodyText: HeaderView {
+open class HeadersH2NoButtonsBodyText: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
     
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     
     //-------------------------------------------------------
     // MARK: - View Lifecycle
@@ -22,8 +22,7 @@ import Foundation
     
     open override func setupView() {
         super.setupView()
-        headlineBody.stylePageHeader()
-        addMolecule(headlineBody)
+        addMolecule(titleLockup)
     }
     
     //----------------------------------------------------
@@ -34,15 +33,10 @@ import Foundation
         
         guard let model = model as? HeadersH2NoButtonsBodyTextModel else { return }
         
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 121
     }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.stylePageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
index 774102da..671e5c0b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
@@ -15,22 +15,23 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     //--------------------------------------------------
     
     public static var identifier: String = "headerH2"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody]
+        [titleLockup]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
     }
     
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel) {
+        self.titleLockup = titleLockup
         super.init()
     }
 
@@ -41,8 +42,11 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
         if bottomPadding == nil {
             bottomPadding = Padding.Component.VerticalMarginSpacing
         }
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
         super.setDefaults()
     }
@@ -53,7 +57,7 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
     }
     
     //--------------------------------------------------
@@ -62,7 +66,7 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         try super.init(from: decoder)
     }
     
@@ -70,6 +74,7 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift
index 77a44761..10632aae 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift
@@ -9,15 +9,15 @@
 import Foundation
 
 
-@objcMembers open class HeadersH2TinyButton: HeaderView {
+open class HeadersH2TinyButton: HeaderView {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
     
-    public let headlineBody = HeadlineBody()
+    public let titleLockup = TitleLockup()
     public let button = PillButton()
     public lazy var stack: Stack<StackModel> = {
-        return Stack<StackModel>.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)),
+        return Stack<StackModel>.createStack(with: [(view: titleLockup, model: StackItemModel(horizontalAlignment: .fill)),
                                                     (view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))],
                                              axis: .vertical)
       }()
@@ -34,7 +34,6 @@ import Foundation
     
     open override func setupView() {
         super.setupView()
-        headlineBody.stylePageHeader()
         addMolecule(stack)
         stack.restack()
     }
@@ -48,16 +47,11 @@ import Foundation
         
         guard let model = model as? HeadersH2TinyButtonModel else { return }
         
-        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        titleLockup.set(with: model.titleLockup, delegateObject, additionalData)
         button.set(with: model.button, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 121
     }
-    
-    open override func reset() {
-        super.reset()
-        headlineBody.stylePageHeader()
-    }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
index 2a91c860..91a1c472 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
@@ -15,15 +15,16 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     //--------------------------------------------------
     
     public static var identifier: String = "headerH2BtnTny"
-    public var headlineBody: HeadlineBodyModel
+    public var titleLockup: TitleLockupModel
     public var button: ButtonModel
+    private var helper = DeprecatedHeadlineBodyHelper()
     
     public var children: [MoleculeModelProtocol] {
-        [headlineBody, button]
+        [titleLockup, button]
     }
     
     public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool  {
-        return try replaceChildMolecule(at: &headlineBody, with: molecule)
+        return try replaceChildMolecule(at: &titleLockup, with: molecule)
         || replaceChildMolecule(at: &button, with: molecule)
     }
     
@@ -31,8 +32,8 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(headlineBody: HeadlineBodyModel, button: ButtonModel) {
-        self.headlineBody = headlineBody
+    public init(titleLockup: TitleLockupModel, button: ButtonModel) {
+        self.titleLockup = titleLockup
         self.button = button
         super.init()
     }
@@ -48,8 +49,11 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
         if bottomPadding == nil {
             bottomPadding = Padding.Component.VerticalMarginSpacing
         }
-        if headlineBody.headline?.accessibilityTraits == nil {
-            headlineBody.headline?.accessibilityTraits = .header
+        if titleLockup.title.fontStyle == nil {
+            titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
+        }
+        if titleLockup.subTitle?.fontStyle == nil {
+            titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
         super.setDefaults()
         button.style = .secondary
@@ -62,7 +66,7 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     
     private enum CodingKeys: String, CodingKey {
         case moleculeName
-        case headlineBody
+        case titleLockup
         case button
     }
     
@@ -72,7 +76,7 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
         button = try typeContainer.decode(ButtonModel.self, forKey: .button)
         try super.init(from: decoder)
     }
@@ -81,7 +85,8 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(button, forKey: .button)
+        guard try !helper.deprecatedEncode(to: encoder) else { return }
+        try container.encode(titleLockup, forKey: .titleLockup)
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
index 76e26f77..093528d1 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2019 Suresh, Kamlesh. All rights reserved.
 //
 
-
-@objcMembers open class HeadlineBodyModel: ParentMoleculeModelProtocol {
+import MVMCore
+open class HeadlineBodyModel: ParentMoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -90,3 +90,24 @@
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
     }
 }
+
+public extension HeadlineBodyModel {
+    func createHeaderTitleLockupModel(defaultStyle: Style = .header) throws -> TitleLockupModel {
+        guard let headline = headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
+        var body = self.body
+        switch style ?? defaultStyle {
+        case .landingHeader:
+            headline.fontStyle = Styler.Font.RegularTitle2XLarge
+            body?.fontStyle = Styler.Font.RegularTitleMedium
+        case .itemHeader:
+            headline.fontStyle = Styler.Font.BoldTitleLarge
+            body?.fontStyle = Styler.Font.RegularBodyLarge
+        default:
+            headline.fontStyle = Styler.Font.RegularTitleXLarge
+            body?.fontStyle = Styler.Font.RegularTitleMedium
+        }
+        let model = try TitleLockupModel(title: headline, subTitle: body)
+        model.id = id
+        return model
+    }
+}

From 5c414a0e40aaeb4def308495ec7a188a9dba24df Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 12 Mar 2024 13:47:48 -0400
Subject: [PATCH 2/4] Digital PCT265 story ONEAPP-6389 - Button group size
 updates, title lockup like views font updates, label font updates

---
 .../Atomic/Atoms/Buttons/ButtonGroup.swift    | 17 +++++++++++++-
 .../Molecules/HeadersAndFooters/Header.swift  |  2 +-
 .../HeadersAndFooters/HeaderModel.swift       | 10 ++++-----
 .../EyebrowHeadlineBodyLink.swift             |  4 ++--
 .../HeadlineBody.swift                        | 10 ++++-----
 .../Protocols/VDSMoleculeViewProtocol.swift   |  2 ++
 .../Templates/MoleculeListTemplate.swift      | 22 +++++++++++++++++++
 7 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift
index f864e72f..d71d40be 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift
@@ -9,17 +9,23 @@
 import Foundation
 import UIKit
 import VDS
+import Combine
 
-@objcMembers open class ButtonGroup: VDS.ButtonGroup, VDSMoleculeViewProtocol {
+open class ButtonGroup: VDS.ButtonGroup, VDSMoleculeViewProtocol {
     
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    public var model: MoleculeModelProtocol?
     open var viewModel: ButtonGroupModel!
     open var delegateObject: MVMCoreUIDelegateObject?
     open var additionalData: [AnyHashable : Any]?
     open var previousModel: ButtonGroupModel?
     
+    /// For notifying the delegate of layout updates.
+    private var contentSizeObservation: Cancellable?
+    private var previousSize: CGSize?
+
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
@@ -74,6 +80,15 @@ import VDS
             // force redraw
             setNeedsUpdate()
         }
+        
+        // Notify the delegate of a size change.
+        previousSize = bounds.size
+        contentSizeObservation = contentSizePublisher.sink { [weak self] size in
+            guard let self = self,
+                  !MVMCoreGetterUtility.fequal(a: Float(size.height), b: Float(self.previousSize?.height ?? Self.estimatedHeight(with: self.viewModel, self.delegateObject) ?? VDS.Button.Size.large.height)) else { return }
+            self.previousSize = size
+            self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+        }
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
index d1c7cf48..09a5451a 100644
--- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
+++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
@@ -31,7 +31,7 @@ open class HeaderView: Container {
         (molecule as? MVMCoreViewProtocol)?.updateView(size)
     }
     
-    public override func setupView() {
+    open override func setupView() {
         super.setupView()
         line.setStyle(.none)
         addSubview(line)
diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/HeaderModel.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/HeaderModel.swift
index df1045c2..fc63cbb7 100644
--- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/HeaderModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/HeaderModel.swift
@@ -7,9 +7,9 @@
 //
 
 
-@objcMembers public class HeaderModel: ContainerModel {
-    public var backgroundColor: Color?
-    public var line: LineModel?
+open class HeaderModel: ContainerModel {
+    open var backgroundColor: Color?
+    open var line: LineModel?
     
     private enum CodingKeys: String, CodingKey {
         case line
@@ -17,7 +17,7 @@
     }
     
     /// Defaults to set
-    public override func setDefaults() {
+    open override func setDefaults() {
         if useHorizontalMargins == nil {
             useHorizontalMargins = true
         }
@@ -43,7 +43,7 @@
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
     }
     
-    public override func encode(to encoder: Encoder) throws {
+    open override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(line, forKey: .line)
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index da5e959e..3bc61b40 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -14,7 +14,7 @@
     
     public let stack = Stack<StackModel>(frame: .zero)
     public let eyebrow = Label(fontStyle: .RegularMicro)
-    public let headline = Label(fontStyle: .BoldBodySmall)
+    public let headline = Label(fontStyle: .RegularTitleSmall)
     public let body = Label(fontStyle: .RegularBodySmall, true)
     public let link = Link()
     
@@ -58,7 +58,7 @@
         super.reset()
         stack.reset()
         eyebrow.setFontStyle(.RegularMicro)
-        headline.setFontStyle(.BoldBodySmall)
+        headline.setFontStyle(.RegularTitleSmall)
         body.setFontStyle(.RegularBodySmall)
     }
     
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
index 96e94640..a5bb8b49 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
@@ -60,9 +60,9 @@ open class HeadlineBody: View {
     }
     
     public func stylePageHeader() {
-        headlineLabel.setFontStyle(.RegularTitleLarge)
-        messageLabel.setFontStyle(.RegularBodyLarge)
-        spaceBetweenLabelsConstant = Padding.Two
+        headlineLabel.setFontStyle(.RegularTitleXLarge)
+        messageLabel.setFontStyle(.RegularTitleMedium)
+        spaceBetweenLabelsConstant = Padding.Four
     }
     
     public func styleListItem() {
@@ -72,8 +72,8 @@ open class HeadlineBody: View {
     }
     
     public func styleListItemDivider() {
-        headlineLabel.setFontStyle(.BoldTitleSmall)
-        messageLabel.setFontStyle(.RegularBodySmall)
+        headlineLabel.setFontStyle(.BoldTitleLarge)
+        messageLabel.setFontStyle(.RegularBodyLarge)
         spaceBetweenLabelsConstant = Padding.Two
     }
     
diff --git a/MVMCoreUI/Atomic/Protocols/VDSMoleculeViewProtocol.swift b/MVMCoreUI/Atomic/Protocols/VDSMoleculeViewProtocol.swift
index fcbd07d1..1bcc78c6 100644
--- a/MVMCoreUI/Atomic/Protocols/VDSMoleculeViewProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/VDSMoleculeViewProtocol.swift
@@ -21,7 +21,9 @@ public protocol VDSMoleculeViewProtocol: MoleculeViewProtocol, MVMCoreViewProtoc
 }
 
 extension VDSMoleculeViewProtocol {
+
     public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        self.model = model
         guard let castedModel = model as? ViewModel else { return }
         self.delegateObject = delegateObject
         self.additionalData = additionalData
diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
index c00e5181..68fe7343 100644
--- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
@@ -198,7 +198,29 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     
     open override func moleculeLayoutUpdated(_ molecule: MoleculeViewProtocol) {
         guard let tableView = tableView else { return }
+        let id = molecule.model?.id
 
+        // Check for header
+        var inHeaderOrFooter = false
+        if let _ = templateModel?.header?.findFirstMolecule(by: { compareModel in id == compareModel.id }) {
+            showHeader(nil)
+            inHeaderOrFooter = true
+        }
+        
+        // Check for footer
+        if let _ = templateModel?.footer?.findFirstMolecule(by: { compareModel in id == compareModel.id }) {
+            showFooter(nil)
+            inHeaderOrFooter = true
+        }
+        
+        // If the view is in a header or footer, need to update the constraints.
+        if inHeaderOrFooter {
+            view.setNeedsUpdateConstraints()
+            view.updateConstraintsIfNeeded()
+            return
+        }
+
+        // If the view is in a cell, refresh the table ui.
         let point = molecule.convert(molecule.bounds.origin, to: tableView)
         if let indexPath = tableView.indexPathForRow(at: point), tableView.indexPathsForVisibleRows?.contains(indexPath) ?? false {
             refreshTable()

From 25c8c139a06ae111f99ecd61de62817082e1358a Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 12 Mar 2024 15:41:49 -0400
Subject: [PATCH 3/4] Digital PCT265 story ONEAPP-6389 - update header H2

---
 MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift b/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
index 2d24c5a1..7f674755 100644
--- a/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
+++ b/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
@@ -21,7 +21,7 @@ extension Styler.Font {
         case .TitleXLarge: actualFont = .RegularTitleXLarge
         case .H1: actualFont = .RegularTitle2XLarge
         case .H32: actualFont = .RegularTitleXLarge
-        case .H2: actualFont = .RegularTitleLarge
+        case .H2: actualFont = .RegularTitleXLarge
         case .B20: actualFont = .RegularBodyLarge
         case .H3: actualFont = .BoldTitleMedium
         case .B1: actualFont = .BoldBodySmall

From 47178a33d3f1e9aa453a26d086fcc3267e9aff06 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 12 Mar 2024 15:48:03 -0400
Subject: [PATCH 4/4] Digital PCT265 story ONEAPP-6389 - Update font style for
 item headers.

---
 MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift b/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
index 7f674755..b8f4c74a 100644
--- a/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
+++ b/MVMCoreUI/Atomic/Extensions/VDS-TextStyle.swift
@@ -24,7 +24,7 @@ extension Styler.Font {
         case .H2: actualFont = .RegularTitleXLarge
         case .B20: actualFont = .RegularBodyLarge
         case .H3: actualFont = .BoldTitleMedium
-        case .B1: actualFont = .BoldBodySmall
+        case .B1: actualFont = .RegularTitleSmall
         case .B2: actualFont = .RegularBodySmall
         case .B3: actualFont = .RegularMicro
         default: break