From 818afb3dfc84b29cf45d76a0e8fc8f759e90ff20 Mon Sep 17 00:00:00 2001 From: Kyle Matthew Hedden Date: Thu, 10 Mar 2022 12:38:31 -0500 Subject: [PATCH] add molecule generation hooks to other 3 templates --- MVMCoreUI/Atomic/Templates/CollectionTemplate.swift | 8 +++++--- MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift | 6 +++--- MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift b/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift index f3bd5d83..d6d920bb 100644 --- a/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift +++ b/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift @@ -47,7 +47,7 @@ open override func viewForTop() -> UIView? { guard let headerModel = templateModel?.header, - let molecule = ModelRegistry.createMolecule(headerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: headerModel) else { return super.viewForTop() } // Temporary, Default the horizontal padding @@ -60,7 +60,7 @@ override open func viewForBottom() -> UIView? { guard let footerModel = templateModel?.footer, - let molecule = ModelRegistry.createMolecule(footerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: footerModel) else { return super.viewForBottom() } return molecule @@ -125,7 +125,9 @@ let cell = collectionView.dequeueReusableCell(withReuseIdentifier: moleculeInfo.identifier, for: indexPath) (cell as? MoleculeViewProtocol)?.reset() - (cell as? MoleculeViewProtocol)?.set(with: moleculeInfo.molecule, delegateObjectIVar, nil) + if let molecularCell = cell as? MoleculeViewProtocol { + updateMoleculeView(molecularCell, from: moleculeInfo.molecule) + } update(cell: cell, size: view.frame.width) // Neded to fix an apple defect where the cell is not the correct size on certain devices for certain cells cell.layoutIfNeeded() diff --git a/MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift index 046469a8..c429f620 100644 --- a/MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift +++ b/MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift @@ -55,7 +55,7 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol { open override func viewForTop() -> UIView? { guard let headerModel = templateModel?.header, - let molecule = ModelRegistry.createMolecule(headerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: headerModel) else { return nil } return molecule @@ -74,13 +74,13 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol { stackItem.useHorizontalMargins = true } - stack.set(with: moleculeStackModel, delegateObject() as? MVMCoreUIDelegateObject, nil) + updateMoleculeView(stack, from: moleculeStackModel) return stack } override open func viewForBottom() -> UIView? { guard let footerModel = templateModel?.footer, - let molecule = ModelRegistry.createMolecule(footerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: footerModel) else { return nil } return molecule diff --git a/MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift b/MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift index 502b269f..7fd5651b 100644 --- a/MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift +++ b/MVMCoreUI/Atomic/Templates/ThreeLayerTemplate.swift @@ -32,7 +32,7 @@ import UIKit open override func viewForTop() -> UIView? { guard let headerModel = templateModel?.header, - let molecule = ModelRegistry.createMolecule(headerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: headerModel) else { return nil } return molecule @@ -40,7 +40,7 @@ import UIKit open override func viewForMiddle() -> UIView? { guard let middleModel = templateModel?.middle, - let molecule = ModelRegistry.createMolecule(middleModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: middleModel) else { return nil } return molecule @@ -48,7 +48,7 @@ import UIKit override open func viewForBottom() -> UIView? { guard let footerModel = templateModel?.footer, - let molecule = ModelRegistry.createMolecule(footerModel, delegateObject: delegateObjectIVar) + let molecule = generateMoleculeView(from: footerModel) else { return nil } return molecule