From 7bed914dca20a97c5975052bdb9c16153ed76388 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Wed, 16 Oct 2024 10:53:16 -0400 Subject: [PATCH] Digital ACT191 defect CXTDT-626309 - Updating fonts and spacing Digital ACT191 defect CXTDT-628092 - Fixing accessibility trait header default. --- .../Headers/H1/HeadersH1ButtonModel.swift | 3 +++ .../Headers/H1/HeadersH1NoButtonsBodyTextModel.swift | 3 +++ .../Headers/H2/HeadersH2ButtonsModel.swift | 3 +++ .../Headers/H2/HeadersH2CaretLinkModel.swift | 3 +++ .../DesignedComponents/Headers/H2/HeadersH2LinkModel.swift | 3 +++ .../Headers/H2/HeadersH2NoButtonsBodyTextModel.swift | 3 +++ .../Headers/H2/HeadersH2TinyButtonModel.swift | 3 +++ .../ListOneColumnTextWithWhitespaceDividerShort.swift | 6 +++--- .../ListOneColumnTextWithWhitespaceDividerShortModel.swift | 3 +++ .../ListOneColumnTextWithWhitespaceDividerTall.swift | 6 +++--- .../ListOneColumnTextWithWhitespaceDividerTallModel.swift | 3 +++ MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift | 4 ++-- 12 files changed, 35 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift index 901cf057..e228ea34 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift @@ -52,6 +52,9 @@ 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] + } } //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift index 05457cdf..f3191358 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift @@ -31,6 +31,9 @@ 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] + } } //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift index accd139e..b40ced44 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift @@ -53,6 +53,9 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo if titleLockup.subTitle?.fontStyle == nil { titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium } + if titleLockup.title.accessibilityTraits == nil { + titleLockup.title.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift index 6675abcf..f5277136 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift @@ -48,6 +48,9 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent if titleLockup.subTitle?.fontStyle == nil { titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium } + if titleLockup.title.accessibilityTraits == nil { + titleLockup.title.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift index 1a95bf73..f0084f99 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift @@ -52,6 +52,9 @@ public class HeadersH2LinkModel: HeaderModel, ParentMoleculeModelProtocol { if titleLockup.subTitle?.fontStyle == nil { titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium } + if titleLockup.title.accessibilityTraits == nil { + titleLockup.title.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift index 95414411..e5889562 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift @@ -42,6 +42,9 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol if titleLockup.subTitle?.fontStyle == nil { titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium } + if titleLockup.title.accessibilityTraits == nil { + titleLockup.title.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift index a8271b8f..5f7b4017 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift @@ -53,6 +53,9 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren 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 diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift index 72dc78c0..815e7ff0 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift @@ -15,7 +15,7 @@ import Foundation //----------------------------------------------------- public var stack: Stack - public let headline = Label(fontStyle: .BoldTitleMedium) + public let headline = Label(fontStyle: .BoldTitleLarge) public let body = Label(fontStyle: .RegularBodySmall) //-------------------------------------------------- @@ -24,7 +24,7 @@ import Foundation public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { stack = Stack.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)), - (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))], + (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))], axis: .vertical) super.init(style: style, reuseIdentifier: reuseIdentifier) } @@ -63,7 +63,7 @@ import Foundation open override func reset() { super.reset() - headline.setFontStyle(.BoldTitleMedium) + headline.setFontStyle(.BoldTitleLarge) body.setFontStyle(.RegularBodySmall) } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift index 141641e5..1ee3e04f 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift @@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerShortModel: ListItemModel, Mo override public func setDefaults() { style = .shortDivider + if headline.accessibilityTraits == nil { + headline.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift index 169c33c9..5c13690b 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift @@ -15,7 +15,7 @@ import Foundation //----------------------------------------------------- public var stack: Stack - public let headline = Label(fontStyle: .BoldTitleMedium) + public let headline = Label(fontStyle: .BoldTitleLarge) public let body = Label(fontStyle: .RegularBodySmall) //-------------------------------------------------- @@ -24,7 +24,7 @@ import Foundation public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { stack = Stack.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)), - (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))], + (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))], axis: .vertical) super.init(style: style, reuseIdentifier: reuseIdentifier) } @@ -62,7 +62,7 @@ import Foundation open override func reset() { super.reset() - headline.setFontStyle(.BoldTitleMedium) + headline.setFontStyle(.BoldTitleLarge) body.setFontStyle(.RegularBodySmall) accessibilityLabel = nil } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift index 74fd2965..44225509 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift @@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol override public func setDefaults() { style = .tallDivider + if headline.accessibilityTraits == nil { + headline.accessibilityTraits = [.header] + } super.setDefaults() } diff --git a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift index 3ac37b49..50692689 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift +++ b/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.Four) + set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Five) case .tallDivider: - set(topPadding: Padding.Twelve, bottomPadding: Padding.Four) + set(topPadding: Padding.Twelve, bottomPadding: Padding.Five) case .sectionFooter: set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0) case ListItemStyle.none: