MVMCoreUI/Atomic/Atoms/Views/Badge.swift

@@ -31,10 +31,9 @@ open class Badge: VDS.Badge, VDSMoleculeViewProtocol {
             self.accessibilityIdentifier = accessibilityIdentifier
         }
         text = viewModel.text
-        textColor = viewModel.textColorStyle
         maxWidth = viewModel.maxWidth
         numberOfLines = viewModel.numberOfLines
-        fillColor = viewModel.fillColorStyle
+        fillColor = viewModel.fillColor
         surface = viewModel.surface
     }
     

MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift

@@ -22,18 +22,14 @@ open class BadgeModel: MoleculeModelProtocol {
     // MARK: - VDS Properties
     //--------------------------------------------------
     public var text: String = ""
-    public var textColorStyle: Badge.TextColor? = nil
     public var accessibilityText: String?
     public var maxWidth: CGFloat?
     public var numberOfLines: Int = 1
-    public var fillColorStyle = Badge.FillColor.red
+    public var fillColor = Badge.FillColor.red
     public var surface: Surface = .light
     
     private enum CodingKeys: String, CodingKey {
-        case id, accessibilityIdentifier, accessibilityText
-        case surface, numberOfLines, maxWidth
-        case text, textColor
-        case fillColor, fillColorStyle
+        case id, accessibilityIdentifier, text, accessibilityText, fillColor, surface, numberOfLines, maxWidth
     }
         
     required public convenience init(from decoder: Decoder) throws {
@@ -43,19 +39,7 @@ open class BadgeModel: MoleculeModelProtocol {
         accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         text = try container.decode(String.self, forKey: .text)
         accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
-
-        //look for a textColor
-        if let textColor = try container.decodeIfPresent(Color.self, forKey: .textColor) {
-            textColorStyle = .custom(textColor.uiColor)
-        }
-        
-        //look for a style
-        fillColorStyle = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColorStyle) ?? .red
-        
-        //look for a color and set the style
-        if let fillColor = try container.decodeIfPresent(Color.self, forKey: .fillColor) {
-            fillColorStyle = .custom(fillColor.uiColor)
-        }
+        fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColor) ?? .red
         surface = try container.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
         numberOfLines = try container.decodeIfPresent(Int.self, forKey: .numberOfLines) ?? 1
         maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: .maxWidth)
@@ -67,23 +51,16 @@ open class BadgeModel: MoleculeModelProtocol {
         try container.encode(text, forKey: .text)
         try container.encode(accessibilityText, forKey: .accessibilityText)
         try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
+        try container.encode(fillColor, forKey: .fillColor)
         try container.encode(surface, forKey: .surface)
         try container.encode(numberOfLines, forKey: .numberOfLines)
         try container.encodeIfPresent(maxWidth, forKey: .maxWidth)
-        try container.encode(fillColorStyle, forKey: .fillColorStyle)
-        switch textColorStyle {
-        case .custom(let color):
-            try container.encode(Color(uiColor: color), forKey: .textColor)
-        default:
-            break
-        }
     }
     
     public func isEqual(to model: any ModelComparisonProtocol) -> Bool {
         guard let model = model as? BadgeModel else { return false }
         return self.backgroundColor == model.backgroundColor
-        && self.fillColorStyle == model.fillColorStyle
-        && self.textColorStyle == model.textColorStyle
+        && self.fillColor == model.fillColor
         && self.numberOfLines == model.numberOfLines
         && self.text == model.text
         && self.surface == model.surface

MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift

@@ -107,15 +107,15 @@ import UIKit
         // configure attributed string for progress percentage.
         let attributedString = NSMutableAttributedString(string: String(percent) + "%")
         // percent value
-        attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.BoldTitleXLarge], range: NSMakeRange(0, percentLen))
+        attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldTitleLarge()], range: NSMakeRange(0, percentLen))
         // % symbol
-        attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.RegularMicro], range: NSMakeRange(percentLen, 1))
+        attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldBodyLarge()], range: NSMakeRange(percentLen, 1))
 
         // show progress percentage in a text layer
         let width = viewWidth
         let height = width
         labelLayer.string = attributedString
-        labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 40)/2, 80, 40)
+        labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 30)/2, 60, 30)
         self.layer.addSublayer(labelLayer)
     }
     

MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift

@@ -51,7 +51,7 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
         eyebrowModel = viewModel.eyebrowModel(delegateObject: delegateObject, additionalData: additionalData)
         titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData)
         subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData)
-        badgeModel = viewModel.badgeModel()
+        badgeModel = viewModel.badge
         descriptiveIconModel = viewModel.descriptiveIcon
         directionalIconModel = viewModel.directionalIcon
         //setup action

MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift

@@ -18,7 +18,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     
-    public var badge: BadgeModel?
+    public var badge: Tilelet.BadgeModel?
     public var eyebrow: LabelModel?
     public var eyebrowColor: TitleLockup.TextColor = .primary
     public var title: LabelModel?
@@ -49,7 +49,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        badge = try container.decodeIfPresent(BadgeModel.self, forKey: .badge)
+        badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge)
         eyebrow = try container.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
         title = try container.decodeIfPresent(LabelModel.self, forKey: .title)
         subTitle = try container.decodeIfPresent(LabelModel.self, forKey: .subTitle)
@@ -91,17 +91,6 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
         try super.init(from: decoder)
     }
     
-    public func badgeModel() -> Tilelet.BadgeModel? {
-        guard let badge else { return nil }
-        return .init(text: badge.text,
-                     textColor: badge.textColorStyle,
-                     fillColor: badge.fillColorStyle,
-                     surface: badge.surface,
-                     numberOfLines: badge.numberOfLines,
-                     maxWidth: badge.maxWidth
-                    )
-    }
-    
     public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? {
         guard let eyebrow else { return nil }
         let attrs = eyebrow.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)

MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift

@@ -16,6 +16,7 @@ import MVMCore
 //--------------------------------------------------
 
 extension VDS.Surface: Codable {}
+extension VDS.Badge.FillColor: Codable {}
 extension VDS.BadgeIndicator.FillColor: Codable {}
 extension VDS.BadgeIndicator.Kind: Codable {}
 extension VDS.BadgeIndicator.MaximumDigits: Codable {}
@@ -293,45 +294,6 @@ extension VDS.TitleLockup.TextColor: Codable {
     }
 }
 
-extension VDS.Badge.FillColor: Codable {
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        let type = try container.decode(String.self)
-        switch type {
-        case "red":
-            self = .red
-        case "yellow":
-            self = .yellow
-        case "green":
-            self = .green
-        case "orange":
-            self = .orange
-        case "blue":
-            self = .blue
-        case "black":
-            self = .black
-        case "white":
-            self = .white
-        default:
-            if let color = try? Color(from: decoder) {
-                self = .custom(color.uiColor)
-            } else {
-                self = .custom(UIColor(hexString: type))
-            }
-        }
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        switch self {
-        case .custom(let value):
-            try container.encode(Color(uiColor: value))
-        default:
-            try container.encode(String(reflecting: self))
-        }
-    }
-}
-
 extension VDS.TitleLockup.TitleTextColor: Codable {
 
     enum CodingKeys: String, CodingKey {

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift

@@ -52,9 +52,6 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift

@@ -31,9 +31,6 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift

@@ -47,15 +47,18 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     //--------------------------------------------------
     
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift

@@ -42,15 +42,18 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     // MARK: - Methods
     //--------------------------------------------------
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift

@@ -46,15 +46,18 @@ public class HeadersH2LinkModel: HeaderModel, ParentMoleculeModelProtocol {
     //--------------------------------------------------
     
     public override func setDefaults() {
-       if titleLockup.title.fontStyle == nil {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift

@@ -36,15 +36,18 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     }
 
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift

@@ -57,6 +57,12 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol, P
     // MARK: - Methods
     //--------------------------------------------------
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         if headline.accessibilityTraits == nil {
             headline.accessibilityTraits = .header
         }

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift

@@ -47,15 +47,18 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     //--------------------------------------------------
     
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        if titleLockup.title.accessibilityTraits == nil {
-            titleLockup.title.accessibilityTraits = [.header]
-        }
         super.setDefaults()
         button.style = .secondary
         button.size = .small

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift

@@ -15,7 +15,7 @@ import Foundation
     //-----------------------------------------------------
     
     public var stack: Stack<StackModel>
-    public let headline = Label(fontStyle: .BoldTitleLarge)
+    public let headline = Label(fontStyle: .BoldTitleMedium)
     public let body = Label(fontStyle: .RegularBodySmall)
     
     //--------------------------------------------------
@@ -24,7 +24,7 @@ import Foundation
     
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
-                                                     (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
+                                                     (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
                                               axis: .vertical)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
@@ -63,7 +63,7 @@ import Foundation
     
     open override func reset() {
         super.reset()
-        headline.setFontStyle(.BoldTitleLarge)
+        headline.setFontStyle(.BoldTitleMedium)
         body.setFontStyle(.RegularBodySmall)
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift

@@ -47,9 +47,6 @@ public class ListOneColumnTextWithWhitespaceDividerShortModel: ListItemModel, Mo
     
     override public func setDefaults() {
         style = .shortDivider
-        if headline.accessibilityTraits == nil {
-            headline.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift

@@ -15,7 +15,7 @@ import Foundation
     //-----------------------------------------------------
     
     public var stack: Stack<StackModel>
-    public let headline = Label(fontStyle: .BoldTitleLarge)
+    public let headline = Label(fontStyle: .BoldTitleMedium)
     public let body = Label(fontStyle: .RegularBodySmall)
     
     //--------------------------------------------------
@@ -24,7 +24,7 @@ import Foundation
     
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
-                                                     (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
+                                                     (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
                                               axis: .vertical)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
@@ -62,7 +62,7 @@ import Foundation
     
     open override func reset() {
         super.reset()
-        headline.setFontStyle(.BoldTitleLarge)
+        headline.setFontStyle(.BoldTitleMedium)
         body.setFontStyle(.RegularBodySmall)
         accessibilityLabel = nil
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift

@@ -47,9 +47,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol
     
     override public func setDefaults() {
         style = .tallDivider
-        if headline.accessibilityTraits == nil {
-            headline.accessibilityTraits = [.header]
-        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift

@@ -72,9 +72,9 @@ import MVMCore
         case .standard:
             set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: Padding.Component.VerticalMarginSpacing)
         case .shortDivider:
-            set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Five)
+            set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Four)
         case .tallDivider:
-            set(topPadding: Padding.Twelve, bottomPadding: Padding.Five)
+            set(topPadding: Padding.Twelve, bottomPadding: Padding.Four)
         case .sectionFooter:
             set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0)
         case ListItemStyle.none:

MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift

@@ -37,8 +37,7 @@ import VDSCoreTokens
         verticalStack.alignment = .fill
         verticalStack.distribution = .fill
         addSubview(verticalStack)
-        verticalStack.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor).isActive = true
-        NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: false, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
+        NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: true, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
         
         reset()
         subscribeForNotifications()
@@ -224,10 +223,6 @@ extension CollapsableNotification: StatusBarUI {
         topView.label.textColor.getWhite(&greyScale, alpha: nil)
         return (color, greyScale > 0.5 ? .lightContent : .default)
     }
-    
-    public func shouldUseSafeAreaLayoutGuide() -> Bool {
-        return false
-    }
 }
 
 extension CollapsableNotification: AccessibilityProtocol {

MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift

@@ -332,7 +332,7 @@ open class Carousel: View {
         
         addSubview(pagingView)
         pagingView.centerXAnchor.constraint(equalTo: collectionView.centerXAnchor).isActive = true
-        collectionView.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: pagingView.centerYAnchor, constant: position).isActive = true
+        collectionView.bottomAnchor.constraint(equalTo: pagingView.centerYAnchor, constant: position).isActive = true
         pagingBottomPin = bottomAnchor.constraint(greaterThanOrEqualTo: pagingView.bottomAnchor)
         pagingBottomPin?.isActive = true
         bottomPin = bottomAnchor.constraint(equalTo: collectionView.bottomAnchor)

MVMCoreUI/Atomic/Protocols/ModelProtocols/ContainerModelProtocol.swift

@@ -19,10 +19,4 @@ public protocol ContainerModelProtocol {
     var useVerticalMargins: Bool? { get set }
     var topPadding: CGFloat? { get set }
     var bottomPadding: CGFloat? { get set }
-    
-    var useSafeAreaInsets: Bool? { get set }
-}
-
-public extension ContainerModelProtocol {
-    var useSafeAreaInsets: Bool? { get { return nil } set {} }
 }

MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift

@@ -16,7 +16,6 @@
     public var header: MoleculeModelProtocol?
     public var anchorFooter: Bool = false
     public var footer: MoleculeModelProtocol?
-    public var fullScreen: Bool = false
     
     public override var rootMolecules: [MoleculeModelProtocol] {
         [navigationBar, header, footer].compactMap { $0 }
@@ -51,7 +50,6 @@
         case header
         case anchorFooter
         case footer
-        case fullScreen
     }
     
     //--------------------------------------------------
@@ -68,7 +66,6 @@
             anchorFooter = anchor
         }
         footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
-        fullScreen = try typeContainer.decodeIfPresent(Bool.self, forKey: .fullScreen) ?? false
         try super.init(from: decoder)
     }
     
@@ -79,7 +76,6 @@
         try container.encodeModelIfPresent(header, forKey: .header)
         try container.encodeIfPresent(anchorFooter, forKey: .anchorFooter)
         try container.encodeModelIfPresent(footer, forKey: .footer)
-        try container.encodeIfPresent(fullScreen, forKey: .fullScreen)
     }
     
     public override func isEqual(to model: any ModelComparisonProtocol) -> Bool {

MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift

@@ -18,24 +18,9 @@ import UIKit
         return try parseTemplate(loadObject: loadObject)
     }
     
-    open override func setContentHeightConstraint() {
-        // The height is used to keep the bottom view at the bottom.
-        if let contentView = contentView, let scrollView = scrollView {
-            let anchor = templateModel?.fullScreen == true ? scrollView.heightAnchor : scrollView.safeAreaLayoutGuide.heightAnchor
-            heightConstraint = contentView.heightAnchor.constraint(equalTo: anchor, multiplier: 1.0)
-            heightConstraint?.priority = UILayoutPriority.defaultLow
-        }
-    }
-    
     open override func updateUI(for molecules: [MoleculeModelProtocol]? = nil) {
         topViewOutsideOfScroll = templateModel?.anchorHeader ?? false
         bottomViewOutsideOfScroll = templateModel?.anchorFooter ?? false
-        
-        // Check if we are respecting the safe areas or not.
-        scrollView.contentInsetAdjustmentBehavior = templateModel?.fullScreen == true ? .never : .automatic
-        heightConstraint?.isActive = false
-        setContentHeightConstraint()
-        
         super.updateUI(for: molecules)
     }
 

MVMCoreUI/BaseClasses/CollectionView.swift

@@ -55,6 +55,6 @@ open class CollectionView: UICollectionView, MVMCoreViewProtocol {
         showsVerticalScrollIndicator = false
         backgroundColor = .clear
         isAccessibilityElement = false
-        contentInsetAdjustmentBehavior = .never
+        contentInsetAdjustmentBehavior = .always
     }
 }

MVMCoreUI/BaseClasses/CollectionViewCell.swift

@@ -65,7 +65,6 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     open func updateView(_ size: CGFloat) {
         if let model = model as? ContainerModelProtocol {
             containerHelper.updateViewMargins(contentView, model: model, size: size)
-            contentView.insetsLayoutMarginsFromSafeArea = model.useSafeAreaInsets == true
         }
         (molecule as? MVMCoreViewProtocol)?.updateView(size)
     }

MVMCoreUI/BaseClasses/TableViewCell.swift

@@ -116,8 +116,6 @@ import UIKit
         } else {
             contentView.directionalLayoutMargins = directionalLayoutMargins
         }
-        
-        contentView.insetsLayoutMarginsFromSafeArea = listItemModel?.useSafeAreaInsets == true
     
         topSeparatorView?.updateView(size)
         bottomSeparatorView?.updateView(size)

MVMCoreUI/BaseControllers/ThreeLayerViewController.swift

@@ -42,10 +42,6 @@ open class ThreeLayerViewController: ProgrammaticScrollViewController, RotorView
     
     open override func loadView() {
         super.loadView()
-        setContentHeightConstraint()
-    }
-    
-    open func setContentHeightConstraint() {
         // The height is used to keep the bottom view at the bottom.
         if let contentView = contentView, let scrollView = scrollView {
             heightConstraint = contentView.heightAnchor.constraint(equalTo: scrollView.safeAreaLayoutGuide.heightAnchor, multiplier: 1.0)

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift

@@ -15,9 +15,6 @@ import MVMCore
 public protocol StatusBarUI {
     /// Returns the background color of the status bar view and the style of the status bar.
     func getStatusBarUI() -> (color: UIColor, style: UIStatusBarStyle)
-    
-    /// Returns if this view should use the safe area layout guide or not (be below the status bar or behind the status bar)
-    func shouldUseSafeAreaLayoutGuide() -> Bool
 }
 
 // Navigation bar update functions
@@ -233,7 +230,8 @@ public extension MVMCoreUISplitViewController {
     func setStatusBar(for viewController: UIViewController?) {
         let viewController = viewController as? MVMCoreUIDetailViewProtocol
         let backgroundColor = viewController?.defaultStatusBarBackgroundColor?() ??
-        navigationController?.navigationBar.standardAppearance.backgroundColor
+        navigationController?.navigationBar.standardAppearance.backgroundColor ??
+        statusBarView?.backgroundColor
 
         let style = viewController?.defaultStatusBarStyle?() ??
         getStatusBarStyle(for: backgroundColor)

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h

@@ -43,6 +43,9 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 // Reference to the top alert view
 @property (nullable, weak, nonatomic) UIView *topAlertView;
 
+// Reference to the status bar view
+@property (nullable, weak, nonatomic) UIView *statusBarView;
+
 // References to the current navigation item settings.
 @property (nonatomic, readonly) BOOL leftPanelIsAccessible;
 @property (nonatomic, readonly) BOOL rightPanelIsAccessible;
@@ -180,4 +183,10 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 /// Updates the status bar with the given style and background color
 - (void)setStatusBarBackgroundColor:(nullable UIColor *)backgroundColor style:(UIStatusBarStyle)style;
 
+/// Shows the view under the status bar.
+- (void)expandStatusBarView;
+
+/// Hides the view under the status bar.
+- (void)collapseStatusBarView;
+
 @end

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -63,6 +63,8 @@ typedef NS_OPTIONS(NSInteger, MFExtendedDrawer) {
 @property (strong, nonatomic) NSNumber *transitionWidth;
 
 @property (nonatomic) UIStatusBarStyle statusBarStyle;
+@property (strong, nonatomic) NSLayoutConstraint *statusBarHeightConstraint;
+@property (strong, nonatomic) NSLayoutConstraint *statusBarBottomConstraint;
 
 // Dismisses any panel
 - (void)dismissPanels:(id)sender;
@@ -863,6 +865,7 @@ CGFloat const PanelAnimationDuration = 0.2;
 #pragma mark - Status Bar
 
 - (void)setStatusBarBackgroundColor:(UIColor *)backgroundColor style:(UIStatusBarStyle)style {
+    self.statusBarView.backgroundColor = backgroundColor;
     self.statusBarStyle = style;
     
     // Triggers preferredStatusBarStyle
@@ -873,6 +876,24 @@ CGFloat const PanelAnimationDuration = 0.2;
     return self.statusBarStyle;
 }
 
+- (void)expandStatusBarView {
+    __weak typeof(self) weakSelf = self;
+    [MVMCoreDispatchUtility performBlockOnMainThread:^{
+        weakSelf.statusBarBottomConstraint.active = YES;
+        weakSelf.statusBarHeightConstraint.active = NO;
+        [weakSelf.view layoutIfNeeded];
+    }];
+}
+
+- (void)collapseStatusBarView {
+    __weak typeof(self) weakSelf = self;
+    [MVMCoreDispatchUtility performBlockOnMainThread:^{
+        weakSelf.statusBarBottomConstraint.active = NO;
+        weakSelf.statusBarHeightConstraint.active = YES;
+        [weakSelf.view layoutIfNeeded];
+    }];
+}
+
 #pragma mark - View Cyle
 
 - (void)loadView {
@@ -880,6 +901,17 @@ CGFloat const PanelAnimationDuration = 0.2;
     UIView *view = [[UIView alloc] init];
     view.translatesAutoresizingMaskIntoConstraints = NO;
     self.view = view;
+    
+    // Status bar
+    UIView *statusBarView = [MVMCoreUICommonViewsUtility commonView];
+    statusBarView.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:statusBarView];
+    [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[statusBarView]-0-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(statusBarView)]];
+    id topGuide = view.safeAreaLayoutGuide;
+    self.statusBarBottomConstraint = [NSLayoutConstraint constraintWithItem:statusBarView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:topGuide attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
+    self.statusBarBottomConstraint.active = YES;
+    self.statusBarHeightConstraint = [statusBarView.heightAnchor constraintEqualToConstant:0];
+    self.statusBarView = statusBarView;
 
     // Top Alert
     if (self.topAlertView) {
@@ -922,9 +954,9 @@ CGFloat const PanelAnimationDuration = 0.2;
     
     if (self.topAlertView) {
         UIView *topAlertView = self.topAlertView;
-        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-0-[topAlertView]-0-[mainView]-0-[progressView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topAlertView, mainView, progressView)]];
+        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-0-[statusBarView]-0-[topAlertView]-0-[mainView]-0-[progressView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(statusBarView,topAlertView, mainView, progressView)]];
     } else {
-        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-0-[mainView]-0-[progressView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(mainView, progressView)]];
+        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-0-[statusBarView]-0-[mainView]-0-[progressView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(statusBarView,mainView, progressView)]];
     }
     
     // Add tabbar if we have it.

MVMCoreUI/Containers/Views/Container.swift

@@ -64,7 +64,6 @@ open class Container: View, ContainerProtocol {
         super.updateView(size)
         (view as? MVMCoreViewProtocol)?.updateView(size)
         containerHelper.updateViewMargins(self, model: containerModel, size: size)
-        insetsLayoutMarginsFromSafeArea = containerModel?.useSafeAreaInsets == true
     }
 
     /// Will be called only once.

MVMCoreUI/Containers/Views/ContainerModel.swift

@@ -30,8 +30,6 @@ open class ContainerModel: ContainerModelProtocol, Codable, ModelComparisonProto
     
     public var cornerRadius: CGFloat?
     
-    public var useSafeAreaInsets: Bool?
-    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------
@@ -48,7 +46,6 @@ open class ContainerModel: ContainerModelProtocol, Codable, ModelComparisonProto
         case topPadding
         case bottomPadding
         case cornerRadius
-        case useSafeAreaInsets
     }
     
     //--------------------------------------------------
@@ -104,7 +101,6 @@ open class ContainerModel: ContainerModelProtocol, Codable, ModelComparisonProto
         topPadding = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .topPadding)
         bottomPadding = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .bottomPadding)
         cornerRadius = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .cornerRadius)
-        useSafeAreaInsets = try typeContainer.decodeIfPresent(Bool.self, forKey: .useSafeAreaInsets)
         setDefaults()
     }
     
@@ -121,7 +117,6 @@ open class ContainerModel: ContainerModelProtocol, Codable, ModelComparisonProto
         try container.encodeIfPresent(topPadding, forKey: .topPadding)
         try container.encodeIfPresent(bottomPadding, forKey: .bottomPadding)
         try container.encodeIfPresent(cornerRadius, forKey: .cornerRadius)
-        try container.encodeIfPresent(useSafeAreaInsets, forKey: .useSafeAreaInsets)
     }
     
     public func isEqual(to model: any ModelComparisonProtocol) -> Bool {

MVMCoreUI/Notification/NotificationContainerView.swift

@@ -32,14 +32,7 @@ extension NotificationContainerView: NotificationTransitionDelegateProtocol {
     public func show(notification: UIView) async {
         currentNotificationView?.removeFromSuperview()
         addSubview(notification)
-        if (notification as? StatusBarUI)?.shouldUseSafeAreaLayoutGuide() ?? true {
-            NSLayoutConstraint.activate([notification.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor),
-                                         safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: notification.bottomAnchor),
-                                         notification.leadingAnchor.constraint(equalTo: leadingAnchor),
-                                         trailingAnchor.constraint(equalTo: notification.trailingAnchor)])
-        } else {
-            NSLayoutConstraint.constraintPinSubview(toSuperview: notification)
-        }
+        NSLayoutConstraint.constraintPinSubview(toSuperview: notification)
         currentNotificationView = notification
         
         if let conformer = notification as? MVMCoreViewProtocol {