From 4be261e3184656d61b10025df83b91777a51062d Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Wed, 27 May 2020 17:37:17 -0400 Subject: [PATCH] update to match documentation --- .../Protocols/ModelProtocols/PageModelProtocol.swift | 2 +- MVMCoreUI/Atomic/Templates/TemplateModel.swift | 8 ++++---- MVMCoreUI/BaseControllers/ViewController.swift | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift b/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift index ec2bead8..275b17a1 100644 --- a/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift +++ b/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift @@ -13,5 +13,5 @@ public protocol PageModelProtocol { /// Temporary: for legacy response var screenHeading: String? { get set } var backgroundColor: Color? { get set } - var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set } + var navigationBar: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set } } diff --git a/MVMCoreUI/Atomic/Templates/TemplateModel.swift b/MVMCoreUI/Atomic/Templates/TemplateModel.swift index e8992e58..b478167d 100644 --- a/MVMCoreUI/Atomic/Templates/TemplateModel.swift +++ b/MVMCoreUI/Atomic/Templates/TemplateModel.swift @@ -26,7 +26,7 @@ import Foundation public var backgroundColor: Color? public var screenHeading: String? - public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? + public var navigationBar: (NavigationItemModelProtocol & MoleculeModelProtocol)? public var formRules: [FormGroupRule]? public var behaviors: [PageBehaviorProtocol]? @@ -49,7 +49,7 @@ import Foundation case backgroundColor case formRules case behaviors - case navigationItem + case navigationBar } //-------------------------------------------------- @@ -63,7 +63,7 @@ import Foundation backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) formRules = try typeContainer.decodeIfPresent([FormGroupRule].self, forKey: .formRules) behaviors = try typeContainer.decodeModelsIfPresent(codingKey: .behaviors) - navigationItem = try typeContainer.decodeModelIfPresent(codingKey: .navigationItem) + navigationBar = try typeContainer.decodeModelIfPresent(codingKey: .navigationBar) } public func encode(to encoder: Encoder) throws { @@ -73,6 +73,6 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encodeIfPresent(screenHeading, forKey: .screenHeading) try container.encodeIfPresent(formRules, forKey: .formRules) - try container.encodeModelIfPresent(navigationItem, forKey: .navigationItem) + try container.encodeModelIfPresent(navigationBar, forKey: .navigationBar) } } diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 0e313ac8..6ec63c24 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -172,9 +172,9 @@ import UIKit /// Processes any new data. Called after the page is loaded the first time and on response updates for this page, open func handleNewData() { // TODO: remove legacy. Temporary, convert legacy to navigation model. - if pageModel?.navigationItem == nil { + if pageModel?.navigationBar == nil { let navigationItem = createDefaultLegacyNavigationModel() - pageModel?.navigationItem = navigationItem + pageModel?.navigationBar = navigationItem } if formValidator == nil { @@ -190,7 +190,7 @@ import UIKit // MARK: - Navigation Item (Move to model base) open func setNavigationController() { let viewController = manager ?? self - guard let navigationItemModel = pageModel?.navigationItem, + guard let navigationItemModel = pageModel?.navigationBar, let navigationController = viewController.navigationController else { MVMCoreUISession.sharedGlobal()?.splitViewController?.parent?.setNeedsStatusBarAppearanceUpdate() return