Merge branch 'feature/header_subclass' into 'develop'

Feature/header subclass

See merge request BPHV_MIPS/mvm_core_ui!275

MVMCoreUI.xcodeproj/project.pbxproj

@@ -307,7 +307,7 @@
 		D2A5145F2211DDC100345BFB /* MoleculeStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5145E2211DDC100345BFB /* MoleculeStackView.swift */; };
 		D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */; };
 		D2A514632213643100345BFB /* MoleculeStackCenteredTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */; };
-		D2A514672213885800345BFB /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514662213885800345BFB /* HeaderView.swift */; };
+		D2A514672213885800345BFB /* MoleculeHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514662213885800345BFB /* MoleculeHeaderView.swift */; };
 		D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; };
 		D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A638FC22CA98280052ED1F /* HeadlineBody.swift */; };
 		D2A6390122CBB1820052ED1F /* Carousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A6390022CBB1820052ED1F /* Carousel.swift */; };
@@ -322,6 +322,8 @@
 		D2C521A923EDE79E00CA2634 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2C521A823EDE79E00CA2634 /* ViewController.swift */; };
 		D2D6CD4022E78C1A00D701B8 /* Scroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */; };
 		D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */; };
+		D2D90B42240463E100DD6EC9 /* MoleculeHeaderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D90B41240463E100DD6EC9 /* MoleculeHeaderModel.swift */; };
+		D2D90B442404789000DD6EC9 /* MoleculeContainerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D90B432404789000DD6EC9 /* MoleculeContainerProtocol.swift */; };
 		D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */; };
 		D2E1FADF2268B8E700AEFD8C /* ThreeLayerTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADE2268B8E700AEFD8C /* ThreeLayerTableViewController.swift */; };
 		D2E1FAE12268E81D00AEFD8C /* MoleculeListTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */; };
@@ -650,7 +652,7 @@
 		D2A5145E2211DDC100345BFB /* MoleculeStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackView.swift; sourceTree = "<group>"; };
 		D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackTemplate.swift; sourceTree = "<group>"; };
 		D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackCenteredTemplate.swift; sourceTree = "<group>"; };
-		D2A514662213885800345BFB /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
+		D2A514662213885800345BFB /* MoleculeHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeHeaderView.swift; sourceTree = "<group>"; };
 		D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerViewController.swift; sourceTree = "<group>"; };
 		D2A638FC22CA98280052ED1F /* HeadlineBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBody.swift; sourceTree = "<group>"; };
 		D2A6390022CBB1820052ED1F /* Carousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Carousel.swift; sourceTree = "<group>"; };
@@ -665,6 +667,8 @@
 		D2C521A823EDE79E00CA2634 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scroller.swift; sourceTree = "<group>"; };
 		D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerTemplate.swift; sourceTree = "<group>"; };
+		D2D90B41240463E100DD6EC9 /* MoleculeHeaderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeHeaderModel.swift; sourceTree = "<group>"; };
+		D2D90B432404789000DD6EC9 /* MoleculeContainerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeContainerProtocol.swift; sourceTree = "<group>"; };
 		D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIDelegateObject.swift; sourceTree = "<group>"; };
 		D2E1FADE2268B8E700AEFD8C /* ThreeLayerTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerTableViewController.swift; sourceTree = "<group>"; };
 		D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeListTemplate.swift; sourceTree = "<group>"; };
@@ -757,6 +761,7 @@
 			children = (
 				9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */,
 				D29E28DE23D740FC00ACEA85 /* Container */,
+				D2D90B432404789000DD6EC9 /* MoleculeContainerProtocol.swift */,
 				014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */,
 				D2FB151A23A2B65B00C20E10 /* MoleculeContainer.swift */,
 			);
@@ -1128,7 +1133,8 @@
 				D224798E2316A995003FCCF9 /* HorizontalCombinationViews */,
 				D224798D2316A988003FCCF9 /* VerticalCombinationViews */,
 				01EB368C23609801006832FA /* HeaderModel.swift */,
-				D2A514662213885800345BFB /* HeaderView.swift */,
+				D2D90B41240463E100DD6EC9 /* MoleculeHeaderModel.swift */,
+				D2A514662213885800345BFB /* MoleculeHeaderView.swift */,
 				012A88EB238F084D00FE3DA1 /* FooterModel.swift */,
 				D274CA322236A78900B01B62 /* FooterView.swift */,
 				0116A4E4228B19640094F3ED /* RadioButtonModel.swift */,
@@ -1716,7 +1722,7 @@
 				D2E2A99C23D8D975000B42E6 /* ImageHeadlineBodyModel.swift in Sources */,
 				D28A837F23CCA96400DFE4FC /* TabsModel.swift in Sources */,
 				012A88EC238F084D00FE3DA1 /* FooterModel.swift in Sources */,
-				D2A514672213885800345BFB /* HeaderView.swift in Sources */,
+				D2A514672213885800345BFB /* MoleculeHeaderView.swift in Sources */,
 				D29E28D823D21AB800ACEA85 /* StringAndMoleculeView.swift in Sources */,
 				01EB369023609801006832FA /* MoleculeListItemModel.swift in Sources */,
 				D28A838323CCBD3F00DFE4FC /* CircleProgressModel.swift in Sources */,
@@ -1781,6 +1787,7 @@
 				D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */,
 				8D24041523E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift in Sources */,
 				D28A838F23CCDEDE00DFE4FC /* TwoButtonViewModel.swift in Sources */,
+				D2D90B42240463E100DD6EC9 /* MoleculeHeaderModel.swift in Sources */,
 				012A88B1238C880100FE3DA1 /* CarouselPagingModelProtocol.swift in Sources */,
 				D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */,
 				9445890E2385C3F800DE9FD4 /* MultiProgressModel.swift in Sources */,
@@ -1802,6 +1809,7 @@
 				D22D1F47220496A30077CEC0 /* MVMCoreUISwitch.m in Sources */,
 				C695A67F23C9830600BFB94E /* UnOrderedListModel.swift in Sources */,
 				017BEB4223620AD20024EF95 /* FormModelProtocol.swift in Sources */,
+				D2D90B442404789000DD6EC9 /* MoleculeContainerProtocol.swift in Sources */,
 				012A88DB238ED45900FE3DA1 /* CarouselModel.swift in Sources */,
 				D29DF28C21E7AC2B003B2FB9 /* ViewConstrainingView.m in Sources */,
 				0AE14F64238315D2005417F8 /* TextField.swift in Sources */,

MVMCoreUI/Atoms/Buttons/ButtonModel.swift

@@ -24,7 +24,7 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol {
     public var title: String
     public var action: ActionModelProtocol
     public var enabled: Bool = true
-    public var style: ButtonStyle? = .primary
+    public var style: ButtonStyle?
     public var size: ButtonSize? = .standard
     public var fillColor: Color?
     public var textColor: Color?

MVMCoreUI/Containers/Views/MoleculeContainer.swift

@@ -31,7 +31,7 @@ open class MoleculeContainer: Container {
     }
     
     public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        if let casteModel = model as? MoleculeContainerModel {
+        if let casteModel = model as? MoleculeContainerModelProtocol {
             if view != nil {
                 (view as? ModelMoleculeViewProtocol)?.setWithModel(casteModel.molecule, delegateObject, additionalData)
             } else {
@@ -44,7 +44,7 @@ open class MoleculeContainer: Container {
     }
     
     public override static func nameForReuse(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        guard let containerModel = model as? MoleculeContainerModel,
+        guard let containerModel = model as? MoleculeContainerModelProtocol,
             let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(containerModel.molecule) as? ModelMoleculeViewProtocol.Type,
             let moleculeName = moleculeClass.nameForReuse(containerModel.molecule, delegateObject) else {
                 return "\(model?.moleculeName ?? "moleculeContainer")<>"
@@ -53,7 +53,7 @@ open class MoleculeContainer: Container {
     }
     
     public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        guard let containerModel = molecule as? MoleculeContainerModel else { return 0 }
+        guard let containerModel = molecule as? MoleculeContainerModelProtocol else { return 0 }
         guard let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(containerModel.molecule) as? ModelMoleculeViewProtocol.Type,
         let moleculeHeight = moleculeClass.estimatedHeight(forRow: containerModel.molecule, delegateObject: delegateObject) else {
             return (containerModel.topMarginPadding ?? 0) + (containerModel.bottomMarginPadding ?? 0)
@@ -62,7 +62,7 @@ open class MoleculeContainer: Container {
     }
     
     public override class func requiredModules(_ molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
-        guard let containerModel = molecule as? MoleculeContainerModel,
+        guard let containerModel = molecule as? MoleculeContainerModelProtocol,
             let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(containerModel.molecule) as? ModelMoleculeViewProtocol.Type else { return nil }
         return moleculeClass.requiredModules(containerModel.molecule, delegateObject: delegateObject, error: error)
     }

MVMCoreUI/Containers/Views/MoleculeContainerModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class MoleculeContainerModel: ContainerModel {
+public class MoleculeContainerModel: ContainerModel, MoleculeContainerModelProtocol {
     public var molecule: MoleculeModelProtocol
     
     private enum CodingKeys: String, CodingKey {

MVMCoreUI/Containers/Views/MoleculeContainerProtocol.swift

@@ -0,0 +1,13 @@
+//
+//  MoleculeContainerProtocol.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 2/24/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public protocol MoleculeContainerModelProtocol: ContainerModelProtocol {
+    var molecule: MoleculeModelProtocol { get set }
+}

MVMCoreUI/Molecules/HeaderModel.swift

@@ -8,19 +8,17 @@
 
 import Foundation
 
-@objcMembers public class HeaderModel: MoleculeContainerModel, MoleculeModelProtocol {
+@objcMembers public class HeaderModel: ContainerModel {
-    public static var identifier: String = "header"
     public var backgroundColor: Color?
     public var line: LineModel?
     
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case line
         case backgroundColor
     }
     
     /// Defaults to set
-    func setDefaults() {
+    public func setDefaults() {
         if useHorizontalMargins == nil {
             useHorizontalMargins = true
         }
@@ -33,25 +31,27 @@ import Foundation
         if bottomMarginPadding == nil {
             bottomMarginPadding = PaddingDefaultVerticalSpacing
         }
-        line?.type = .heavy
+        if line == nil {
+            line = LineModel(type: .heavy)
+        }
     }
     
-    public override init(with moleculeModel: MoleculeModelProtocol) {
+    public override init() {
-        super.init(with: moleculeModel)
+        super.init()
         setDefaults()
     }
 
     required public init(from decoder: Decoder) throws {
         try super.init(from: decoder)
-        setDefaults()
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) ?? LineModel(type: .heavy)
+        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        setDefaults()
     }
     
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(line, forKey: .line)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
     }

MVMCoreUI/Molecules/MoleculeHeaderModel.swift

@@ -0,0 +1,37 @@
+//
+//  MoleculeHeaderModel.swift
+//  MVMCoreUI
+//
+//  Created by Suresh, Kamlesh on 10/3/19.
+//  Copyright © 2019 Suresh, Kamlesh. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class MoleculeHeaderModel: HeaderModel, MoleculeModelProtocol, MoleculeContainerModelProtocol {
+    public static var identifier: String = "header"
+    public var molecule: MoleculeModelProtocol
+
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case molecule
+    }
+    
+    public init(with moleculeModel: MoleculeModelProtocol) {
+        molecule = moleculeModel
+        super.init()
+    }
+
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        try super.init(from: decoder)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeModel(molecule, forKey: .molecule)
+    }
+}

MVMCoreUI/Molecules/MoleculeHeaderView.swift

@@ -1,5 +1,5 @@
 //
-//  HeaderView.swift
+//  MoleculeHeaderView.swift
 //  MVMCoreUI
 //
 //  Created by Scott Pfeil on 2/12/19.
@@ -8,55 +8,41 @@
 
 import UIKit
 
-public class HeaderView: MoleculeContainer {
+public class MoleculeHeaderView: MoleculeContainer {
-    var line: Line?
+    var line = Line()
     
-    var headerModel: HeaderModel? {
+    var headerModel: MoleculeHeaderModel? {
-        get { return model as? HeaderModel }
+        get { return model as? MoleculeHeaderModel }
     }
     
     // MARK: - MVMCoreViewProtocol
     open override func updateView(_ size: CGFloat) {
         super.updateView(size)
-        line?.updateView(size)
+        line.updateView(size)
     }
     
     public override func setupView() {
         super.setupView()
-        
-        guard line == nil else { return }
-        let line = Line()
         line.setStyle(.heavy)
         addSubview(line)
         NSLayoutConstraint.pinViewBottom(toSuperview: line, useMargins: false, constant: 0).isActive = true
         NSLayoutConstraint.pinViewLeft(toSuperview: line, useMargins: true, constant: 0).isActive = true
         NSLayoutConstraint.pinViewRight(toSuperview: line, useMargins: true, constant: 0).isActive = true
-        self.line = line
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        if let separatorJSON = json?.optionalDictionaryForKey("line") {
-            line?.setWithJSON(separatorJSON, delegateObject: delegateObject, additionalData: additionalData)
-        }
-    }
-
-    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        super.setWithModel(model, delegateObject, additionalData)
-
-        guard let headerModel = model as? HeaderModel else {
-            return
-        }
-
-        if let seperatorModel = headerModel.line {
-            line?.setWithJSON(seperatorModel.toJSON(), delegateObject: delegateObject, additionalData: additionalData)
-        }
-    }
-    
     open override func reset() {
         super.reset()
-        line?.setStyle(.heavy)
+        line.setStyle(.heavy)
+    }
+
+    // MARK: - ModelMoleculeViewProtocol
+    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        guard let headerModel = headerModel else { return }
+        if let lineModel = headerModel.line {
+            line.setWithModel(lineModel, delegateObject, additionalData)
+        }
     }
     
     public class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -88,7 +88,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: MoleculeCollectionViewCell.self, viewModelClass: CarouselItemModel.self)
 
         // Other Container Molecules
-        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: HeaderView.self, viewModelClass: HeaderModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: MoleculeHeaderView.self, viewModelClass: MoleculeHeaderModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: FooterView.self, viewModelClass: FooterModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: Scroller.self, viewModelClass: ScrollerModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ModuleMolecule.self, viewModelClass: ModuleMoleculeModel.self)