Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/two_button_remove_legacy

MVMCoreUI/Categories/UIColor+Extension.swift

@@ -6,11 +6,11 @@
 //  Copyright © 2019 Verizon Wireless. All rights reserved.
 //
 
-
 import UIKit
 
 public typealias ColorHexTuple = (uiColor: UIColor, hex: String)
 
+
 extension UIColor {
     
     /// Dictionary to access brand approved colors by name.
@@ -25,6 +25,7 @@ extension UIColor {
                                                         "coolGray1": (.mvmCoolGray1, "#F6F6F6"),
                                                         "coolGray3": (.mvmCoolGray3, "#D8DADA"),
                                                         "coolGray6": (.mvmCoolGray6, "#747676"),
+                                                        "coolGray10": (.mvmCoolGray10, "#333333"),
                                                         "vzupGold": (.vzupGold, "#B89B56"),
                                                         "vzupYellow1": (.vzupYellow1, "#F9D542"),
                                                         "vzupYellow2": (.vzupYellow2, "#F4CA53"),
@@ -67,6 +68,9 @@ extension UIColor {
     /// HEX: #747676
     public static let mvmCoolGray6 = UIColor.color8Bits(red: 116, green: 118, blue: 118)
     
+    /// HEX: #333333
+    public static let mvmCoolGray10 = UIColor.grayscale(rgb: 51)
+    
     //--------------------------------------------------
     // MARK: - VZ UP Brand
     //--------------------------------------------------
@@ -196,15 +200,4 @@ extension UIColor {
         
         return nil
     }
-    
-    public class func getColorAndHexFromName(_ name: String) -> ColorHexTuple? {
-        
-        for row in names {
-            if name == row.key {
-                return row.value
-            }
-        }
-        
-        return nil
-    }
 }

MVMCoreUI/CustomPrimitives/Color.swift

@@ -56,7 +56,7 @@ public final class Color: Codable {
     }
     
     init?(name: String) {
-        guard let colorTuple = UIColor.getColorAndHexFromName(name) else { return nil }
+        guard let colorTuple = UIColor.names[name] else { return nil }
         self.uiColor = colorTuple.uiColor
         self.hex = colorTuple.hex
         determineRGBA()
@@ -73,7 +73,7 @@ public final class Color: Codable {
         if colorString.hasPrefix("#") {
             hex = colorString.replacingOccurrences(of: "#", with: "")
         } else {
-            guard let hex = UIColor.getColorAndHexFromName(colorString)?.hex else { throw ColorError.badName(reason: "Check the spelling of your color.") }
+            guard let hex = UIColor.names[colorString]?.hex else { throw ColorError.badName(reason: "Check the spelling of your color.") }
             self.hex = hex.replacingOccurrences(of: "#", with: "")
             name = colorString
         }

MVMCoreUI/Legacy/Views/PrimaryButtonView.m

@@ -370,7 +370,7 @@
     return [self initWithPrimaryButtonMap:primaryButtonMap secondaryButtonMap:secondaryButtonMap actionDelegate:actionDelegate additionalData:additionalData buttonDelegate:buttonDelegate];
 }
 
-- (void)setupWithButtonMap:(nullable NSDictionary *)buttonMap delegate:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData {
+- (void)setupWithButtonMap:(nullable NSDictionary *)buttonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData {
     NSObject<ButtonDelegateProtocol> *buttonDelegate = nil;
     NSObject<MVMCoreActionDelegateProtocol> *actionDelegate = delegateObject.actionDelegate;
     if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {

MVMCoreUI/Templates/StackPageTemplateModel.swift

@@ -30,14 +30,14 @@ import Foundation
         case screenHeading
         case header
         case footer
-        case moleculeStack
+        case stack
         case isAtomicTabs
     }
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         pageType = try typeContainer.decode(String.self, forKey: .pageType)
-        moleculeStack = try typeContainer.decode(MoleculeStackModel.self, forKey: .moleculeStack)
+        moleculeStack = try typeContainer.decode(MoleculeStackModel.self, forKey: .stack)
         screenHeading = try typeContainer.decodeIfPresent(String.self, forKey: .screenHeading)
         isAtomicTabs = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAtomicTabs)
         header = try typeContainer.decodeMoleculeIfPresent(codingKey: .header)
@@ -47,7 +47,7 @@ import Foundation
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(pageType, forKey: .pageType)
-        try container.encode(moleculeStack, forKey: .moleculeStack)
+        try container.encode(moleculeStack, forKey: .stack)
         try container.encodeIfPresent(screenHeading, forKey: .screenHeading)
         try container.encodeIfPresent(isAtomicTabs, forKey: .isAtomicTabs)
         try container.encodeModelIfPresent(header, forKey: .header)