From 34ef2e5c8196746d19b1039c1d9a40c34fd4af64 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Mon, 21 Nov 2022 19:22:40 +0530 Subject: [PATCH 1/3] Added accessibilityText for ListOneColumnTextWithWhitespaceDividerTall DOPMO-153745 --- ...eColumnTextWithWhitespaceDividerTall.swift | 34 +++++++++++-------- ...mnTextWithWhitespaceDividerTallModel.swift | 7 +++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift index 62ee43f5..4a6e7c96 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift @@ -17,6 +17,7 @@ import Foundation public var stack: Stack public let headline = Label(fontStyle: .BoldTitleMedium) public let body = Label(fontStyle: .RegularBodySmall) + public var accessibilityText: String? = nil //-------------------------------------------------- // MARK: - Initializers @@ -41,7 +42,6 @@ import Foundation addMolecule(stack) stack.restack() isAccessibilityElement = true - updateAccessibilityLabel() } //-------------------------------------------------- @@ -53,7 +53,8 @@ import Foundation guard let model = model as? ListOneColumnTextWithWhitespaceDividerTallModel else { return } stack.updateContainedMolecules(with: [model.headline, model.body], delegateObject, additionalData) - updateAccessibilityLabel() + + updateAccessibilityLabel(model: model) } open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { @@ -70,18 +71,23 @@ import Foundation // MARK: - Accessibility //---------------------------------------------------- - func updateAccessibilityLabel() { - - var message = "" - - if let headlineLabel = headline.text, !headlineLabel.isEmpty { - message += headlineLabel + ", " + func updateAccessibilityLabel(model: ListOneColumnTextWithWhitespaceDividerTallModel) { + if let accessibilityText = model.accessibilityText { + accessibilityLabel = accessibilityText + }else { + var message = "" + + if let headlineLabel = headline.text, !headlineLabel.isEmpty { + message += headlineLabel + ", " + } + + if let bodyLabel = body.text, !bodyLabel.isEmpty { + message += bodyLabel + } + + accessibilityLabel = message } - - if let bodyLabel = body.text, !bodyLabel.isEmpty { - message += bodyLabel - } - - accessibilityLabel = message + } + } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift index c713b0d2..ed233607 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift @@ -17,14 +17,16 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol public static var identifier: String = "list1CTxtDiv2" public var headline: LabelModel public var body: LabelModel? + public var accessibilityText: String? //-------------------------------------------------- // MARK: - Initializer //-------------------------------------------------- - public init(headline: LabelModel, body: LabelModel?) { + public init(headline: LabelModel, body: LabelModel?, accessibilityText: String?) { self.headline = headline self.body = body + self.accessibilityText = accessibilityText super.init() } @@ -45,6 +47,7 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol case moleculeName case headline case body + case accessibilityText } //-------------------------------------------------- @@ -55,6 +58,7 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol let typeContainer = try decoder.container(keyedBy: CodingKeys.self) headline = try typeContainer.decode(LabelModel.self, forKey: .headline) body = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .body) + accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText) try super.init(from: decoder) } @@ -64,5 +68,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol try container.encode(moleculeName, forKey: .moleculeName) try container.encode(headline, forKey: .headline) try container.encodeIfPresent(body, forKey: .body) + try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText) } } From 9dd400f894b5742003341591a9e049e42a3aa302 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Tue, 20 Dec 2022 19:58:30 +0530 Subject: [PATCH 2/3] Accessibility fix for PRODDEF-1201 Accessibility fix to provide custom accessibilityText for list1CTxtDiv3 --- ...eColumnTextWithWhitespaceDividerTall.swift | 26 +++++++------------ ...mnTextWithWhitespaceDividerTallModel.swift | 5 ---- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift index 4a6e7c96..d93cd0f2 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift @@ -17,7 +17,6 @@ import Foundation public var stack: Stack public let headline = Label(fontStyle: .BoldTitleMedium) public let body = Label(fontStyle: .RegularBodySmall) - public var accessibilityText: String? = nil //-------------------------------------------------- // MARK: - Initializers @@ -72,22 +71,17 @@ import Foundation //---------------------------------------------------- func updateAccessibilityLabel(model: ListOneColumnTextWithWhitespaceDividerTallModel) { - if let accessibilityText = model.accessibilityText { - accessibilityLabel = accessibilityText - }else { - var message = "" - - if let headlineLabel = headline.text, !headlineLabel.isEmpty { - message += headlineLabel + ", " - } - - if let bodyLabel = body.text, !bodyLabel.isEmpty { - message += bodyLabel - } - - accessibilityLabel = message + + var message = "" + + if let headlineLabel = model.headline.accessibilityText ?? headline.text, !headlineLabel.isEmpty { + message += headlineLabel + ", " } - } + if let bodyLabel = model.body?.accessibilityText ?? body.text, !bodyLabel.isEmpty { + message += bodyLabel + } + accessibilityLabel = message + } } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift index ed233607..4527dba0 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift @@ -17,7 +17,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol public static var identifier: String = "list1CTxtDiv2" public var headline: LabelModel public var body: LabelModel? - public var accessibilityText: String? //-------------------------------------------------- // MARK: - Initializer @@ -26,7 +25,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol public init(headline: LabelModel, body: LabelModel?, accessibilityText: String?) { self.headline = headline self.body = body - self.accessibilityText = accessibilityText super.init() } @@ -47,7 +45,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol case moleculeName case headline case body - case accessibilityText } //-------------------------------------------------- @@ -58,7 +55,6 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol let typeContainer = try decoder.container(keyedBy: CodingKeys.self) headline = try typeContainer.decode(LabelModel.self, forKey: .headline) body = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .body) - accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText) try super.init(from: decoder) } @@ -68,6 +64,5 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol try container.encode(moleculeName, forKey: .moleculeName) try container.encode(headline, forKey: .headline) try container.encodeIfPresent(body, forKey: .body) - try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText) } } From af97c5d38793287854df8183fef6fb7c56cbfb79 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Fri, 23 Dec 2022 23:33:18 +0530 Subject: [PATCH 3/3] addressed review comments --- .../OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift | 1 + .../ListOneColumnTextWithWhitespaceDividerTallModel.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift index d93cd0f2..772ec5ac 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift @@ -64,6 +64,7 @@ import Foundation super.reset() headline.setFontStyle(.BoldTitleMedium) 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 4527dba0..c713b0d2 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift @@ -22,7 +22,7 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol // MARK: - Initializer //-------------------------------------------------- - public init(headline: LabelModel, body: LabelModel?, accessibilityText: String?) { + public init(headline: LabelModel, body: LabelModel?) { self.headline = headline self.body = body super.init()