new json. test cases. changes made.

MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
 
 open class HeaderView: Container {
     public let line = Line()
@@ -15,7 +14,7 @@ open class HeaderView: Container {
     open var molecule: MoleculeViewProtocol?
 
     var headerModel: HeaderModel? {
-        get { return model as? HeaderModel }
+        get { model as? HeaderModel }
     }
     
     /// Convenience function to add a molecule to the view.
@@ -58,6 +57,6 @@ open class HeaderView: Container {
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return PaddingDefaultVerticalSpacing + PaddingDefaultVerticalSpacing
+        PaddingDefaultVerticalSpacing + PaddingDefaultVerticalSpacing
     }
 }

MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderModel.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2019 Suresh, Kamlesh. All rights reserved.
 //
 
-import Foundation
 
 @objcMembers public class MoleculeHeaderModel: HeaderModel, MoleculeModelProtocol, MoleculeContainerModelProtocol {
     public static var identifier: String = "header"

MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift

@@ -17,7 +17,7 @@ public class MoleculeHeaderView: MoleculeContainer {
     var line = Line()
     
     var headerModel: MoleculeHeaderModel? {
-        get { return model as? MoleculeHeaderModel }
+        get { model as? MoleculeHeaderModel }
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/ImageBarButtonItem.swift

@@ -6,17 +6,15 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
 
 @objcMembers open class ImageBarButtonItem: BarButtonItem {
-
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
     
     public static func create(with image: UIImage?) -> Self {
         let actionObject = ActionDelegate()
-        let button = self.init(image: image, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:)))
+        let button = self.init(image: image, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock))
         button.actionDelegate = actionObject
         return button
     }
@@ -29,7 +27,7 @@ import Foundation
     }
     
     /// Creates the item with the passed in action map.
-    public static func create(with image: UIImage?, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+    public static func create(with image: UIImage?, actionMap: [AnyHashable: Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
         let button = create(with: image)
         button.set(with: actionMap, delegateObject: delegateObject, additionalData: additionalData)
         return button
@@ -42,4 +40,3 @@ import Foundation
         return button
     }
 }
-

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift

@@ -6,10 +6,8 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
 
 @objcMembers open class LabelBarButtonItem: BarButtonItem {
-
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift

@@ -5,28 +5,45 @@
 //  Created by Scott Pfeil on 5/18/20.
 //
 
-import Foundation
 
 public class NavigationImageButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var backgroundColor: Color?
+    public var accessibilityIdentifier: String?
     public static var identifier: String = "navigationImageButton"
-
     public var image: String
     public var action: ActionModelProtocol
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(with image: String, action: ActionModelProtocol) {
         self.image = image
         self.action = action
     }
     
+    //--------------------------------------------------
+    // MARK: - Coding Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case image
         case action
+        case accessibilityIdentifier
         case moleculeName
     }
     
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         image = try typeContainer.decode(String.self, forKey: .image)
         action = try typeContainer.decodeModel(codingKey: .action)
     }
@@ -34,13 +51,20 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
     open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(image, forKey: .image)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeModel(action, forKey: .action)
     }
     
+    //--------------------------------------------------
+    // MARK: - Method
+    //--------------------------------------------------
+    
     /// 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 buttonItem = ImageBarButtonItem.create(with: uiImage, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+        buttonItem.accessibilityIdentifier = accessibilityIdentifier ?? image
+        return buttonItem
     }
 }

MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift

@@ -6,28 +6,45 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
 
 public class NavigationLabelButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var backgroundColor: Color?
     public static var identifier: String = "navigationLabelButton"
-
+    public var accessibilityIdentifier: String?
     public var title: String
     public var action: ActionModelProtocol
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(with title: String, action: ActionModelProtocol) {
         self.title = title
         self.action = action
     }
     
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case moleculeName
+        case accessibilityIdentifier
         case title
         case action
     }
     
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         title = try typeContainer.decode(String.self, forKey: .title)
         action = try typeContainer.decodeModel(codingKey: .action)
     }
@@ -35,10 +52,15 @@ public class NavigationLabelButtonModel: NavigationButtonModelProtocol, Molecule
     open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(title, forKey: .title)
         try container.encodeModel(action, forKey: .action)
     }
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     /// Convenience function that creates a BarButtonItem for the model.
     public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem {
         return LabelBarButtonItem.create(with: title, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)

MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift

@@ -6,12 +6,13 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
 
 open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtocol {
-    open class var identifier: String {
+    //--------------------------------------------------
-        return "navigationBar"
+    // MARK: - Properties
-    }
+    //--------------------------------------------------
+    
+    open class var identifier: String { "navigationBar" }
     
     open var title: String?
     open var hidden: Bool
@@ -28,13 +29,21 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
     open var additionalRightButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
     open var titleView: MoleculeModelProtocol?
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init() {
         hidden = false
-        backgroundColor = Color(uiColor: .white)
+        backgroundColor = Color(uiColor: .mvmWhite)
-        tintColor = Color(uiColor: .black)
+        tintColor = Color(uiColor: .mvmBlack)
         line = LineModel(type: .standard)
     }
     
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case title
@@ -48,13 +57,17 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         case additionalRightButtons
         case titleView
     }
-
+    
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
         hidden = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidden) ?? false
-        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) ?? Color(uiColor: .white)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) ?? Color(uiColor: .mvmWhite)
-        tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) ?? Color(uiColor: .black)
+        tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) ?? Color(uiColor: .mvmBlack)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) ?? LineModel(type: .standard)
         alwaysShowBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .alwaysShowBackButton)
         backButton = try typeContainer.decodeModelIfPresent(codingKey: .backButton)