From 895f0181ecdfc2340c9f3787d30679afe78c2488 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 30 Apr 2024 16:03:48 -0400
Subject: [PATCH] Digital PCT265 story ONEAPP-7592 - Updates to tile container
 to allow custom colors.

---
 .../Atomic/Atoms/Views/TileContainerModel.swift    |  3 ++-
 .../Atomic/Extensions/VDS-Enums+Codable.swift      |  6 +++++-
 .../H1/HeadersH1NoButtonsBodyTextModel.swift       |  6 +++---
 MVMCoreUI/Categories/UIColor+Extension.swift       |  6 ++++++
 MVMCoreUI/Categories/UIColor+MFConvenience.m       | 14 +++++++-------
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
index 895bb027..2a6d98aa 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import VDS
+import MVMCore
 
 open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, TileContainer>, ParentMoleculeModelProtocol, MoleculeModelProtocol {
     
@@ -36,7 +37,7 @@ open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, Til
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        molecule = try container.decodeModelIfPresent(codingKey: .molecule)
+        molecule = try container.decodeMoleculeIfPresent(codingKey: .molecule)
         try super.init(from: decoder)
     }
     
diff --git a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
index f514248e..e8b5d90f 100644
--- a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
+++ b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
@@ -95,7 +95,11 @@ extension VDS.TileContainerBase.BackgroundColor: Codable {
         case "black":
             self = .black
         default:
-            self = .custom(type)
+            if let color = try? Color(from: decoder) {
+                self = .custom(color.hex)
+            } else {
+                self = .custom(type)
+            }
         }
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
index 7450c9aa..97d635a1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
@@ -91,7 +91,7 @@ public struct DeprecatedHeadlineBodyHelper {
     
     public func createTitleLockupModel(defaultStyle: HeadlineBodyModel.Style = .header, headlineBody: HeadlineBodyModel) throws -> TitleLockupModel {
         guard let headline = headlineBody.headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
-        var body = headlineBody.body
+        let body = headlineBody.body
         switch headlineBody.style ?? defaultStyle {
         case .landingHeader:
             headline.fontStyle = Styler.Font.RegularTitle2XLarge
@@ -103,13 +103,13 @@ public struct DeprecatedHeadlineBodyHelper {
             headline.fontStyle = Styler.Font.RegularTitleXLarge
             body?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        let model = try TitleLockupModel(title: headline, subTitle: body)
+        let model = TitleLockupModel(title: headline, subTitle: body)
         model.id = headlineBody.id
         return model
     }
     
     public func createHeadlineBodyModel(titleLockup: TitleLockupModel) -> HeadlineBodyModel {
-        var headlineBody = HeadlineBodyModel(headline: titleLockup.title)
+        let headlineBody = HeadlineBodyModel(headline: titleLockup.title)
         headlineBody.body = titleLockup.subTitle
         headlineBody.id = titleLockup.id
         return headlineBody
diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index f4ef0f7f..1d2158a6 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -230,6 +230,12 @@ extension UIColor {
         return UIColor(named: name, in: MVMCoreUIUtility.bundleForMVMCoreUI(), compatibleWith: nil)!
     }
     
+    /// Returns a color corresponding to the passed in color name.
+    @objc
+    public static func mvmCoreUIColor(with name: String) -> UIColor? {
+        return UIColor.names[name]?.uiColor
+    }
+    
     /// Convenience to get a grayscale UIColor where the same value is used for red, green, and blue.
     public class func grayscale(rgb: Int, alpha: CGFloat = 1.0) -> UIColor {
         
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index cd809509..f33b71b0 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -7,6 +7,7 @@
 //
 
 #import "UIColor+MFConvenience.h"
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
 @import MVMCore.MVMCoreDispatchUtility;
 
 @implementation UIColor (MFConvenience)
@@ -298,6 +299,10 @@
 }
 
 + (nullable UIColor *)mfGetColorForString:(nullable NSString *)string {
+    if ([string hasPrefix:@"#"]) {
+        return [self mfGetColorForHex:string];
+    }
+    
     static NSDictionary *stringColorMapping;
     static dispatch_once_t once;
     dispatch_once(&once, ^{
@@ -327,14 +332,9 @@
     
     UIColor *color = nil;
     if (string && string.length > 0) {
-        color = [stringColorMapping objectForKey:string];
-        if (!color){
-            color = [UIColor blackColor];
-        }
-    } else {
-        color = [UIColor blackColor];
+        color = [stringColorMapping objectForKey:string] ?: [UIColor mvmCoreUIColorWith:string];
     }
-    return color;
+    return color ?: [UIColor blackColor];
 }
 
 + (nonnull UIColor *)mfGetColorForHex:(nonnull NSString *) hexString {