mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating Review comments to decode from Model

Browse Source
This commit is contained in:
“subrra7” 2020-07-15 21:21:19 +05:30
parent 3827edcf6e
commit 77be31f47f
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
View File

@ -18,6 +18,7 @@ import Foundation
}
public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]?
public var line: LineModel?
public var closeAction: ActionModelProtocol?
//--------------------------------------------------
// MARK: - Initializer
@ -36,6 +37,7 @@ import Foundation
private enum CodingKeys: String, CodingKey {
case molecules
case line
case closeAction
}
//--------------------------------------------------
@ -46,6 +48,7 @@ import Foundation
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
molecules = try typeContainer.decodeModelsIfPresent(codingKey: .molecules)
line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
closeAction = try typeContainer.decodeModelIfPresent(codingKey: .closeAction)
try super.init(from: decoder)
}
@ -54,6 +57,7 @@ import Foundation
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encodeModelsIfPresent(molecules, forKey: .molecules)
try container.encode(line, forKey: .line)
try container.encodeModelIfPresent(closeAction, forKey: .closeAction)
}
}

4
MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
View File

@ -27,11 +27,11 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
guard let self = self else {
return
}
guard let actionMap = self.loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyButtonMap,"CloseButton"]) else {
guard let actionMap = self.templateModel?.closeAction else {
MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
return
}
MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: nil, delegateObject: self.delegateObjectIVar)
MVMCoreActionHandler.shared()?.handleAction(with: actionMap.toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
})
}

17
MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift
View File

@ -13,15 +13,14 @@ open class ModalMoleculeStackTemplate: MoleculeStackTemplate {
override open func handleNewData() {
super.handleNewData()
_ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
guard let self = self else {
return
}
guard let actionMap = self.loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyButtonMap,"CloseButton"]) else {
MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
return
}
MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: nil, delegateObject: self.delegateObjectIVar)
guard let self = self else {
return
}
guard let actionMap = self.templateModel?.closeAction else {
MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
return
}
MVMCoreActionHandler.shared()?.handleAction(with: actionMap.toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
})
}
}

4
MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift
View File

@ -14,6 +14,7 @@ import Foundation
return "stack"
}
public var moleculeStack: StackModel
public var closeAction: ActionModelProtocol?
public init(pageType: String, moleculeStack: StackModel) {
self.moleculeStack = moleculeStack
@ -22,11 +23,13 @@ import Foundation
private enum CodingKeys: String, CodingKey {
case stack
case closeAction
}
required public init(from decoder: Decoder) throws {
let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
moleculeStack = try typeContainer.decode(StackModel.self, forKey: .stack)
closeAction = try typeContainer.decodeModelIfPresent(codingKey: .closeAction)
try super.init(from: decoder)
}
@ -34,5 +37,6 @@ import Foundation
try super.encode(to: encoder)
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(moleculeStack, forKey: .stack)
try container.encodeModelIfPresent(closeAction, forKey: .closeAction)
}
}