From 0f6f0e849266cd6a95885c91a425c2ac894bea23 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 8 Dec 2020 12:56:07 +0530 Subject: [PATCH 01/10] Added indexColor property for NumberedList & UnOrderedList --- .../Lists/NumberedListModel.swift | 12 +++++++++--- .../StringAndMoleculeModel.swift | 9 +++++++-- .../StringAndMoleculeView.swift | 1 + .../Lists/UnOrderedListModel.swift | 10 ++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift index eeacb98d..38ddfd02 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift @@ -17,16 +17,18 @@ import Foundation case moleculeName case backgroundColor case list + case indexColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - + + let indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for (index, molecule) in list.enumerated() { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, indexColor: indexColor))) } super.init(molecules: models, spacing: 0) } @@ -36,11 +38,15 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) + var indexColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { - models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) + let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) + indexColor = stringAndMoleculeModel.indexColor + models.append(stringAndMoleculeModel.molecule) } try container.encodeModels(models, forKey: .list) + try container.encodeIfPresent(indexColor, forKey: .indexColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift index 3adb0bb3..37d5f580 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift @@ -13,10 +13,12 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { public var backgroundColor: Color? public var string: String public var molecule: MoleculeModelProtocol - - public init(string: String, molecule: MoleculeModelProtocol) { + public var indexColor: Color? + + public init(string: String, molecule: MoleculeModelProtocol, indexColor: Color?) { self.string = string self.molecule = molecule + self.indexColor = indexColor } private enum CodingKeys: String, CodingKey { @@ -24,6 +26,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { case backgroundColor case string case molecule + case indexColor } public required init(from decoder: Decoder) throws { @@ -31,6 +34,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) string = try typeContainer.decode(String.self, forKey: .string) molecule = try typeContainer.decodeModel(codingKey: .molecule) + indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) } public func encode(to encoder: Encoder) throws { @@ -39,5 +43,6 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { try container.encode(string, forKey: .string) try container.encodeModel(molecule, forKey: .molecule) try container.encode(moleculeName, forKey: .moleculeName) + try container.encodeIfPresent(indexColor, forKey: .indexColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift index a2a76f68..b95dd8cd 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift @@ -84,6 +84,7 @@ open class StringAndMoleculeView: View { super.set(with: model, delegateObject, additionalData) guard let model = model as? StringAndMoleculeModel else { return } label.text = model.string + label.textColor = model.indexColor?.uiColor ?? .black molecule.set(with: model.molecule, delegateObject, additionalData) } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift index 3866e918..c6e34197 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift @@ -19,6 +19,7 @@ import Foundation case backgroundColor case list case bulletChar + case indexColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] @@ -28,10 +29,11 @@ import Foundation self.bulletChar = bulletChar } + let indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for molecule in list { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, indexColor: indexColor))) } super.init(molecules: models, spacing: 0) } @@ -42,10 +44,14 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) + var indexColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { - models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) + let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) + indexColor = stringAndMoleculeModel.indexColor + models.append(stringAndMoleculeModel.molecule) } try container.encodeModels(models, forKey: .list) + try container.encodeIfPresent(indexColor, forKey: .indexColor) } } From 7e175ef581b1497f94fdf9aef10536080c500c68 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 8 Dec 2020 15:41:50 +0530 Subject: [PATCH 02/10] Updated indexColor datatype to string --- .../VerticalCombinationViews/Lists/NumberedListModel.swift | 4 ++-- .../StringAndMoleculeStack/StringAndMoleculeModel.swift | 6 +++--- .../StringAndMoleculeStack/StringAndMoleculeView.swift | 4 +++- .../VerticalCombinationViews/Lists/UnOrderedListModel.swift | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift index 38ddfd02..4d00d1b1 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift @@ -24,7 +24,7 @@ import Foundation public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - let indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) + let indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for (index, molecule) in list.enumerated() { @@ -38,7 +38,7 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var indexColor: Color? + var indexColor: String? var models: [MoleculeModelProtocol] = [] for molecule in molecules { let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift index 37d5f580..0bfe9e2b 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift @@ -13,9 +13,9 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { public var backgroundColor: Color? public var string: String public var molecule: MoleculeModelProtocol - public var indexColor: Color? + public var indexColor: String? - public init(string: String, molecule: MoleculeModelProtocol, indexColor: Color?) { + public init(string: String, molecule: MoleculeModelProtocol, indexColor: String?) { self.string = string self.molecule = molecule self.indexColor = indexColor @@ -34,7 +34,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) string = try typeContainer.decode(String.self, forKey: .string) molecule = try typeContainer.decodeModel(codingKey: .molecule) - indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) + indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) } public func encode(to encoder: Encoder) throws { diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift index b95dd8cd..d8c228ae 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift @@ -84,7 +84,9 @@ open class StringAndMoleculeView: View { super.set(with: model, delegateObject, additionalData) guard let model = model as? StringAndMoleculeModel else { return } label.text = model.string - label.textColor = model.indexColor?.uiColor ?? .black + if let indexColor = model.indexColor { + label.textColor = try? Color(colorString: indexColor)?.uiColor ?? .black + } molecule.set(with: model.molecule, delegateObject, additionalData) } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift index c6e34197..178794d1 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift @@ -29,7 +29,7 @@ import Foundation self.bulletChar = bulletChar } - let indexColor = try typeContainer.decodeIfPresent(Color.self, forKey: .indexColor) + let indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for molecule in list { @@ -44,7 +44,7 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var indexColor: Color? + var indexColor: String? var models: [MoleculeModelProtocol] = [] for molecule in molecules { let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) From b9267f219fec644168319fe3ff4f88b2ef76cf86 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 8 Dec 2020 20:18:40 +0530 Subject: [PATCH 03/10] Updated indexColor key to stringColor & data type to Color --- .../Lists/NumberedListModel.swift | 12 ++++++------ .../StringAndMoleculeModel.swift | 12 ++++++------ .../StringAndMoleculeView.swift | 4 +--- .../Lists/UnOrderedListModel.swift | 12 ++++++------ 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift index 4d00d1b1..f40069a6 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift @@ -17,18 +17,18 @@ import Foundation case moleculeName case backgroundColor case list - case indexColor + case stringColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - let indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) + let stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for (index, molecule) in list.enumerated() { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, indexColor: indexColor))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, stringColor: stringColor))) } super.init(molecules: models, spacing: 0) } @@ -38,15 +38,15 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var indexColor: String? + var indexColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) - indexColor = stringAndMoleculeModel.indexColor + indexColor = stringAndMoleculeModel.stringColor models.append(stringAndMoleculeModel.molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(indexColor, forKey: .indexColor) + try container.encodeIfPresent(indexColor, forKey: .stringColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift index 0bfe9e2b..c87007f2 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift @@ -13,12 +13,12 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { public var backgroundColor: Color? public var string: String public var molecule: MoleculeModelProtocol - public var indexColor: String? + public var stringColor: Color? - public init(string: String, molecule: MoleculeModelProtocol, indexColor: String?) { + public init(string: String, molecule: MoleculeModelProtocol, stringColor: Color?) { self.string = string self.molecule = molecule - self.indexColor = indexColor + self.stringColor = stringColor } private enum CodingKeys: String, CodingKey { @@ -26,7 +26,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { case backgroundColor case string case molecule - case indexColor + case stringColor } public required init(from decoder: Decoder) throws { @@ -34,7 +34,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) string = try typeContainer.decode(String.self, forKey: .string) molecule = try typeContainer.decodeModel(codingKey: .molecule) - indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) + stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) } public func encode(to encoder: Encoder) throws { @@ -43,6 +43,6 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { try container.encode(string, forKey: .string) try container.encodeModel(molecule, forKey: .molecule) try container.encode(moleculeName, forKey: .moleculeName) - try container.encodeIfPresent(indexColor, forKey: .indexColor) + try container.encodeIfPresent(stringColor, forKey: .stringColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift index d8c228ae..29f6ccf6 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift @@ -84,9 +84,7 @@ open class StringAndMoleculeView: View { super.set(with: model, delegateObject, additionalData) guard let model = model as? StringAndMoleculeModel else { return } label.text = model.string - if let indexColor = model.indexColor { - label.textColor = try? Color(colorString: indexColor)?.uiColor ?? .black - } + label.textColor = model.stringColor?.uiColor molecule.set(with: model.molecule, delegateObject, additionalData) } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift index 178794d1..067429e3 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift @@ -19,7 +19,7 @@ import Foundation case backgroundColor case list case bulletChar - case indexColor + case stringColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] @@ -29,11 +29,11 @@ import Foundation self.bulletChar = bulletChar } - let indexColor = try typeContainer.decodeIfPresent(String.self, forKey: .indexColor) + let stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for molecule in list { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, indexColor: indexColor))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, stringColor: stringColor))) } super.init(molecules: models, spacing: 0) } @@ -44,14 +44,14 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var indexColor: String? + var stringColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) - indexColor = stringAndMoleculeModel.indexColor + stringColor = stringAndMoleculeModel.stringColor models.append(stringAndMoleculeModel.molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(indexColor, forKey: .indexColor) + try container.encodeIfPresent(stringColor, forKey: .stringColor) } } From 77b5275a44905b48957a2b932ad6738bd594ea01 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 8 Dec 2020 21:38:44 +0530 Subject: [PATCH 04/10] Added numberColor, bulletColor & addressed review comments --- .../Lists/NumberedListModel.swift | 14 ++++++-------- .../StringAndMoleculeModel.swift | 6 +++--- .../StringAndMoleculeView.swift | 2 +- .../Lists/UnOrderedListModel.swift | 16 +++++++--------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift index f40069a6..7399a756 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift @@ -12,23 +12,24 @@ import Foundation public override class var identifier: String { return "numberedList" } + public var numberColor: Color? private enum CodingKeys: String, CodingKey { case moleculeName case backgroundColor case list - case stringColor + case numberColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - let stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) + numberColor = try typeContainer.decodeIfPresent(Color.self, forKey: .numberColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for (index, molecule) in list.enumerated() { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, stringColor: stringColor))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, stringColor: numberColor ?? Color(uiColor: .mvmBlack)))) } super.init(molecules: models, spacing: 0) } @@ -38,15 +39,12 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var indexColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { - let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) - indexColor = stringAndMoleculeModel.stringColor - models.append(stringAndMoleculeModel.molecule) + models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(indexColor, forKey: .stringColor) + try container.encodeIfPresent(numberColor, forKey: .numberColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift index c87007f2..c22a1c17 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift @@ -13,9 +13,9 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { public var backgroundColor: Color? public var string: String public var molecule: MoleculeModelProtocol - public var stringColor: Color? + public var stringColor: Color - public init(string: String, molecule: MoleculeModelProtocol, stringColor: Color?) { + public init(string: String, molecule: MoleculeModelProtocol, stringColor: Color) { self.string = string self.molecule = molecule self.stringColor = stringColor @@ -34,7 +34,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) string = try typeContainer.decode(String.self, forKey: .string) molecule = try typeContainer.decodeModel(codingKey: .molecule) - stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) + stringColor = try typeContainer.decode(Color.self, forKey: .stringColor) } public func encode(to encoder: Encoder) throws { diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift index 29f6ccf6..a9fd5da8 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeView.swift @@ -84,7 +84,7 @@ open class StringAndMoleculeView: View { super.set(with: model, delegateObject, additionalData) guard let model = model as? StringAndMoleculeModel else { return } label.text = model.string - label.textColor = model.stringColor?.uiColor + label.textColor = model.stringColor.uiColor molecule.set(with: model.molecule, delegateObject, additionalData) } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift index 067429e3..89cb391f 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift @@ -13,13 +13,14 @@ import Foundation return "unOrderedList" } public var bulletChar = "•" - + public var bulletColor: Color? + private enum CodingKeys: String, CodingKey { case moleculeName case backgroundColor case list case bulletChar - case stringColor + case bulletColor } // Numbered list model comes in the from of list = [MoleculeModelProtocol] @@ -29,11 +30,11 @@ import Foundation self.bulletChar = bulletChar } - let stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) + bulletColor = try typeContainer.decodeIfPresent(Color.self, forKey: .bulletColor) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for molecule in list { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, stringColor: stringColor))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, stringColor: bulletColor ?? Color(uiColor: .mvmBlack)))) } super.init(molecules: models, spacing: 0) } @@ -44,14 +45,11 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encode(moleculeName, forKey: .moleculeName) - var stringColor: Color? var models: [MoleculeModelProtocol] = [] for molecule in molecules { - let stringAndMoleculeModel: StringAndMoleculeModel = ((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel) - stringColor = stringAndMoleculeModel.stringColor - models.append(stringAndMoleculeModel.molecule) + models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(stringColor, forKey: .stringColor) + try container.encodeIfPresent(bulletColor, forKey: .bulletColor) } } From bd4abe3c00399daa5e510d2cbe36d931cf14e98d Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Tue, 8 Dec 2020 14:42:08 -0500 Subject: [PATCH 05/10] update to make heart enableaable and optional --- MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift | 8 +++-- .../Atomic/Atoms/Selectors/HeartModel.swift | 8 ++++- .../List/Miscellaneous/ListStoreLocator.swift | 34 ++++++++++++++----- .../Miscellaneous/ListStoreLocatorModel.swift | 8 ++--- 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift index 796bf617..1cf80fc3 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/Heart.swift @@ -79,8 +79,6 @@ import UIKit heightConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: 1) heightConstraint?.isActive = true isAccessibilityElement = true - accessibilityTraits = .button - updateAccessibilityLabel() } public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { @@ -89,6 +87,8 @@ import UIKit self.additionalData = additionalData guard let model = model as? HeartModel else { return } isSelected = model.isActive + isEnabled = model.enabled + updateAccessibilityLabel() } //-------------------------------------------------- @@ -96,11 +96,13 @@ import UIKit //-------------------------------------------------- /// Adjust accessibility label based on selection of Heart. func updateAccessibilityLabel() { - accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_unfavorite_action_hint" : "heart_favorite_action_hint") + accessibilityHint = isEnabled ? MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_unfavorite_action_hint" : "heart_favorite_action_hint") : nil + accessibilityTraits = isEnabled ? .button : .none accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "heart_selected_state" : "heart_not_selected_state") } func tapAction() { + guard isEnabled else { return } isSelected = !isSelected if let heartModel = heartModel { Button.performButtonAction(with: heartModel.action, button: self, delegateObject: delegateObject, additionalData: additionalData, sourceModel: heartModel) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift index 8001ddd5..7411899c 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift @@ -8,7 +8,7 @@ import Foundation -open class HeartModel: MoleculeModelProtocol { +open class HeartModel: MoleculeModelProtocol, EnableableModelProtocol { //-------------------------------------------------- // MARK: - Properties @@ -19,6 +19,7 @@ open class HeartModel: MoleculeModelProtocol { public var activeColor: Color = Color(uiColor: .mvmRed) public var inActiveColor: Color = Color(uiColor: .clear) public var action: ActionModelProtocol = ActionNoopModel() + public var enabled: Bool = true //-------------------------------------------------- // MARK: - Keys @@ -30,6 +31,7 @@ open class HeartModel: MoleculeModelProtocol { case activeColor case inActiveColor case action + case enabled } //-------------------------------------------------- @@ -51,6 +53,9 @@ open class HeartModel: MoleculeModelProtocol { if let action: ActionModelProtocol = try typeContainer.decodeModelIfPresent(codingKey: .action) { self.action = action } + if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) { + self.enabled = enabled + } } public func encode(to encoder: Encoder) throws { @@ -61,5 +66,6 @@ open class HeartModel: MoleculeModelProtocol { try container.encode(activeColor, forKey: .activeColor) try container.encode(inActiveColor, forKey: .inActiveColor) try container.encodeModel(action, forKey: .action) + try container.encode(enabled, forKey: .enabled) } } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift index 6a1f0dc5..d81ab5c8 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift @@ -42,8 +42,6 @@ addMolecule(stack) stack.restack() horizontalStack.restack() - accessibilityHint = heart.accessibilityHint - accessibilityTraits = heart.accessibilityTraits } public override func updateView(_ size: CGFloat) { @@ -123,20 +121,40 @@ } func updateAccessibilityLabel() { - if let accessoryView = accessoryView { - // Both caret and heart. + let hasHeart = !(horizontalStack.stackModel?.molecules[1].gone ?? true) + if let accessoryView = accessoryView, + hasHeart { + // Both accessory and heart actions. isAccessibilityElement = false accessoryView.accessibilityLabel = getAccessibilityMessage() accessibilityElements = [accessoryView, heart] } else { // Make whole cell focusable if no action. isAccessibilityElement = true - if let message = getAccessibilityMessage(), - let heartLabel = heart.accessibilityLabel { - accessibilityLabel = message + ", " + heartLabel + var message = getAccessibilityMessage() + if hasHeart { + accessibilityHint = heart.accessibilityHint + if let heartLabel = heart.accessibilityLabel { + message = (message ?? "") + ", " + heartLabel + } } else { - accessibilityLabel = getAccessibilityMessage() + accessibilityHint = nil } + accessibilityLabel = message } } + + // Ensures voice over does not read "selected" after user triggers action on cell. + override public var accessibilityTraits: UIAccessibilityTraits { + get { + if (accessoryView != nil) { + return .button + } else if (!(horizontalStack.stackModel?.molecules[1].gone ?? true)) { + return heart.accessibilityTraits + } else { + return .none + } + } + set {} + } } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift index 32392b50..10a0cd29 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift @@ -12,7 +12,7 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol { //-------------------------------------------------- public static var identifier = "listStoreLocator" - public var heart: HeartModel + public var heart: HeartModel? public var leftHeadline: LabelModel public var leftBody: LabelModel public var leftSubBody: LabelModel @@ -22,7 +22,7 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol { // MARK: - Initializer //-------------------------------------------------- - public init(heart: HeartModel, leftHeadline: LabelModel, leftBody: LabelModel, leftSubBody: LabelModel, rightLabel: LabelModel) { + public init(heart: HeartModel?, leftHeadline: LabelModel, leftBody: LabelModel, leftSubBody: LabelModel, rightLabel: LabelModel) { self.heart = heart self.leftHeadline = leftHeadline self.leftBody = leftBody @@ -59,7 +59,7 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol { public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - heart = try typeContainer.decode(HeartModel.self, forKey:.heart) + heart = try typeContainer.decodeIfPresent(HeartModel.self, forKey:.heart) leftHeadline = try typeContainer.decode(LabelModel.self, forKey: .leftHeadline) leftBody = try typeContainer.decode(LabelModel.self, forKey: .leftBody) leftSubBody = try typeContainer.decode(LabelModel.self, forKey: .leftSubBody) @@ -71,7 +71,7 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(moleculeName, forKey: .moleculeName) - try container.encode(heart, forKey: .heart) + try container.encodeIfPresent(heart, forKey: .heart) try container.encode(leftHeadline, forKey: .leftHeadline) try container.encode(leftBody, forKey: .leftBody) try container.encode(leftSubBody, forKey: .leftSubBody) From 813eb68aad7555e5d49df50445593b0b365ce457 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Wed, 9 Dec 2020 17:25:40 +0530 Subject: [PATCH 06/10] added default color in function param & removed optional properties --- .../Lists/NumberedListModel.swift | 8 ++++---- .../StringAndMoleculeStack/StringAndMoleculeModel.swift | 6 +++--- .../Lists/UnOrderedListModel.swift | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift index 7399a756..874868e5 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift @@ -12,7 +12,7 @@ import Foundation public override class var identifier: String { return "numberedList" } - public var numberColor: Color? + public var numberColor: Color private enum CodingKeys: String, CodingKey { case moleculeName @@ -25,11 +25,11 @@ import Foundation public required init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - numberColor = try typeContainer.decodeIfPresent(Color.self, forKey: .numberColor) + numberColor = try typeContainer.decodeIfPresent(Color.self, forKey: .numberColor) ?? Color(uiColor: .mvmBlack) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for (index, molecule) in list.enumerated() { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, stringColor: numberColor ?? Color(uiColor: .mvmBlack)))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule, stringColor: numberColor))) } super.init(molecules: models, spacing: 0) } @@ -44,7 +44,7 @@ import Foundation models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(numberColor, forKey: .numberColor) + try container.encode(numberColor, forKey: .numberColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift index c22a1c17..6556796b 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift @@ -15,7 +15,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { public var molecule: MoleculeModelProtocol public var stringColor: Color - public init(string: String, molecule: MoleculeModelProtocol, stringColor: Color) { + public init(string: String, molecule: MoleculeModelProtocol, stringColor: Color = Color(uiColor: .mvmBlack)) { self.string = string self.molecule = molecule self.stringColor = stringColor @@ -34,7 +34,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) string = try typeContainer.decode(String.self, forKey: .string) molecule = try typeContainer.decodeModel(codingKey: .molecule) - stringColor = try typeContainer.decode(Color.self, forKey: .stringColor) + stringColor = try typeContainer.decodeIfPresent(Color.self, forKey: .stringColor) ?? Color(uiColor: .mvmBlack) } public func encode(to encoder: Encoder) throws { @@ -43,6 +43,6 @@ public class StringAndMoleculeModel: MoleculeModelProtocol { try container.encode(string, forKey: .string) try container.encodeModel(molecule, forKey: .molecule) try container.encode(moleculeName, forKey: .moleculeName) - try container.encodeIfPresent(stringColor, forKey: .stringColor) + try container.encode(stringColor, forKey: .stringColor) } } diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift index 89cb391f..4013f3aa 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift @@ -13,7 +13,7 @@ import Foundation return "unOrderedList" } public var bulletChar = "•" - public var bulletColor: Color? + public var bulletColor: Color private enum CodingKeys: String, CodingKey { case moleculeName @@ -30,11 +30,11 @@ import Foundation self.bulletChar = bulletChar } - bulletColor = try typeContainer.decodeIfPresent(Color.self, forKey: .bulletColor) + bulletColor = try typeContainer.decodeIfPresent(Color.self, forKey: .bulletColor) ?? Color(uiColor: .mvmBlack) let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list) var models: [MoleculeStackItemModel] = [] for molecule in list { - models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, stringColor: bulletColor ?? Color(uiColor: .mvmBlack)))) + models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule, stringColor: bulletColor))) } super.init(molecules: models, spacing: 0) } @@ -50,6 +50,6 @@ import Foundation models.append(((molecule as! MoleculeStackItemModel).molecule as! StringAndMoleculeModel).molecule) } try container.encodeModels(models, forKey: .list) - try container.encodeIfPresent(bulletColor, forKey: .bulletColor) + try container.encode(bulletColor, forKey: .bulletColor) } } From 09b263fa23571ba78803b0db5b387ccc35d01ce9 Mon Sep 17 00:00:00 2001 From: "Khan, Arshad" Date: Mon, 14 Dec 2020 18:16:37 +0530 Subject: [PATCH 07/10] adding aem driven accessibilityText to navigationImageButton --- .../Buttons/NavigationImageButtonModel.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift index 9313f9a4..8d837a5a 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift @@ -13,6 +13,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule public var image: String public var action: ActionModelProtocol + public var accessibilityText: String? public init(with image: String, action: ActionModelProtocol) { self.image = image @@ -41,6 +42,11 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule /// Convenience function that creates a BarButtonItem for the model. public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem { let uiImage = MVMCoreCache.shared()?.getImageFromRegisteredBundles(image) - return ImageBarButtonItem.create(with: uiImage, actionModel: action, delegateObject: delegateObject, additionalData: additionalData) + let navigationImageButton = ImageBarButtonItem.create(with: uiImage, actionModel: action, delegateObject: delegateObject, additionalData: additionalData) + if let accessibilityString = accessibilityText { + navigationImageButton.accessibilityLabel = accessibilityString + navigationImageButton.isAccessibilityElement = true + } + return navigationImageButton } } From 77993736beaaffcbfc791e45cb2d79d7a5c8f436 Mon Sep 17 00:00:00 2001 From: "Khan, Arshad" Date: Tue, 15 Dec 2020 22:52:38 +0530 Subject: [PATCH 08/10] fix after tetsing --- .../NavigationBar/Buttons/NavigationImageButtonModel.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift index 8d837a5a..2cfcfbdc 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift @@ -24,12 +24,14 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule case image case action case moleculeName + case accessibilityText } required public init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) image = try typeContainer.decode(String.self, forKey: .image) action = try typeContainer.decodeModel(codingKey: .action) + accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText) } open func encode(to encoder: Encoder) throws { @@ -37,6 +39,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule try container.encode(image, forKey: .image) try container.encode(moleculeName, forKey: .moleculeName) try container.encodeModel(action, forKey: .action) + try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText) } /// Convenience function that creates a BarButtonItem for the model. From 3b75339209bd67515b8b78f255396354a49a46fb Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 17 Dec 2020 09:28:14 -0500 Subject: [PATCH 09/10] bugfix with styler --- MVMCoreUI/Styles/MFStyler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 130b4c7a..e8d58a26 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -1104,7 +1104,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (nonnull NSAttributedString *)styleGetRegularMicroAttributedString:(nullable NSString *)string { - return [MFStyler styleGetRegularBodySmallAttributedString:string genericScaling:YES]; + return [MFStyler styleGetRegularMicroAttributedString:string genericScaling:YES]; } + (nonnull NSAttributedString *)styleGetRegularMicroAttributedString:(nullable NSString *)string genericScaling:(BOOL)genericScaling { From 7418027b56ffc5fac5c6d8416b01e2371cd87626 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 17 Dec 2020 09:49:28 -0500 Subject: [PATCH 10/10] updated for easier readability --- MVMCoreUI/Styles/Styler.swift | 48 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/MVMCoreUI/Styles/Styler.swift b/MVMCoreUI/Styles/Styler.swift index 1229a146..c0dd6792 100644 --- a/MVMCoreUI/Styles/Styler.swift +++ b/MVMCoreUI/Styles/Styler.swift @@ -28,13 +28,13 @@ open class Styler { // Legacy Fonts case H1 - case H2 - case H3 case H32 + case H2 + case B20 + case H3 case B1 case B2 case B3 - case B20 /// Returns the font size of the current enum case. public func pointSize() -> CGFloat { @@ -45,8 +45,7 @@ open class Styler { case .Title2XLarge: return 36 - case .TitleXLarge, - .H32: + case .TitleXLarge, .H32: return 32 case .H2: @@ -57,8 +56,7 @@ open class Styler { return 24 case .BoldTitleMedium, - .RegularTitleMedium, - .B20: + .RegularTitleMedium, .B20: return 20 case .H3: @@ -68,15 +66,12 @@ open class Styler { .RegularBodyLarge: return 16 - case .BoldBodySmall, - .RegularBodySmall, - .B1, - .B2: + case .BoldBodySmall, .B1, + .RegularBodySmall, .B2: return 13 case .BoldMicro, - .RegularMicro, - .B3: + .RegularMicro, .B3: return 11 } } @@ -96,27 +91,22 @@ open class Styler { switch self { case .RegularTitleLarge, - .RegularTitleMedium, + .RegularTitleMedium, .B20, .RegularBodyLarge, - .RegularBodySmall, - .RegularMicro, - .B2, - .B3, - .B20: + .RegularBodySmall, .B2, + .RegularMicro, .B3: return false - case .Title2XLarge, - .TitleXLarge, + case .H1, + .Title2XLarge, + .TitleXLarge, .H32, + .H2, .BoldTitleLarge, .BoldTitleMedium, - .BoldBodyLarge, - .BoldBodySmall, - .BoldMicro, - .H1, - .H2, .H3, - .H32, - .B1: + .BoldBodyLarge, + .BoldBodySmall, .B1, + .BoldMicro: return true } } @@ -140,9 +130,9 @@ open class Styler { return false case .H1, + .H32, .H2, .H3, - .H32, .B1, .B2, .B3,