Added indexColor property for NumberedList & UnOrderedList

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)
     }
 }
 

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 var indexColor: Color?
 
-    public init(string: String, molecule: MoleculeModelProtocol) {
+    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)
     }
 }

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)
     }
     

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)
     }
 }