From 0f6f0e849266cd6a95885c91a425c2ac894bea23 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 8 Dec 2020 12:56:07 +0530 Subject: [PATCH] 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) } }