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

Fix methodology of template model subclassing.

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2020-06-26 20:00:54 -04:00
parent d8e88aeac7
commit 0cb184a41b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
View File

@ -13,6 +13,10 @@ public protocol TemplateProtocol: AnyObject {
var templateModel: TemplateModel? { get set } var templateModel: TemplateModel? { get set }
} }
public protocol CustomTemplateDecoder {
func decodeTemplate(using decoder: JSONDecoder, from data: Data) throws -> TemplateModelProtocol
}
public extension TemplateProtocol where Self: ViewController { public extension TemplateProtocol where Self: ViewController {
func parseTemplate(json: [AnyHashable: Any]?) throws { func parseTemplate(json: [AnyHashable: Any]?) throws {
@ -20,8 +24,13 @@ public extension TemplateProtocol where Self: ViewController {
let data = try JSONSerialization.data(withJSONObject: pageJSON) let data = try JSONSerialization.data(withJSONObject: pageJSON)
let decoder = JSONDecoder() let decoder = JSONDecoder()
try decoder.add(delegateObject: delegateObjectIVar) try decoder.add(delegateObject: delegateObjectIVar)
let templateModel = try decodeTemplate(using: decoder, from: data) let templateModel: TemplateModel
self.templateModel = templateModel as? TemplateModel if let customDecoder = self as? CustomTemplateDecoder {
templateModel = try customDecoder.decodeTemplate(using: decoder, from: data) as! Self.TemplateModel
} else {
templateModel = try decoder.decode(TemplateModel.self, from: data)
}
self.templateModel = templateModel
self.pageModel = templateModel as? MVMControllerModelProtocol self.pageModel = templateModel as? MVMControllerModelProtocol
} }

4
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -129,10 +129,6 @@ import UIKit
open func parsePageJSON() throws { open func parsePageJSON() throws {
} }
open func decodeTemplate(using decoder: JSONDecoder, from data: Data) throws -> TemplateModel {
return try decoder.decode(TemplateModel.self, from: data)
}
open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool { open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool {
guard let pageType = loadObject?.pageType, var modulesRequired = MVMCoreUIViewControllerMappingObject.shared()?.modulesRequired(forPageType: pageType), guard let pageType = loadObject?.pageType, var modulesRequired = MVMCoreUIViewControllerMappingObject.shared()?.modulesRequired(forPageType: pageType),