Minor cleanup

MVMCoreUI.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 		D20C7009250BF99B0095B21C /* TopNotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20C7008250BF99B0095B21C /* TopNotificationModel.swift */; };
 		D20C700B250BFDE40095B21C /* MVMCoreUITopAlertView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20C700A250BFDE40095B21C /* MVMCoreUITopAlertView+Extension.swift */; };
 		D20F3B44252E00E4004B3F56 /* PageProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20F3B43252E00E4004B3F56 /* PageProtocol.swift */; };
+		D20F3B5E252F9B5E004B3F56 /* NavigationBarRefreshProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20F3B5D252F9B5D004B3F56 /* NavigationBarRefreshProtocol.swift */; };
 		D20FB165241A5D75004AFC3A /* NavigationItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20FB164241A5D75004AFC3A /* NavigationItemModel.swift */; };
 		D213347723843825008E41B3 /* Line.swift in Sources */ = {isa = PBXBuildFile; fileRef = D213347623843825008E41B3 /* Line.swift */; };
 		D21B7F602437C5BC00051ABF /* MoleculeStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21B7F5E2437C5BC00051ABF /* MoleculeStackView.swift */; };
@@ -798,6 +799,7 @@
 		D20C7008250BF99B0095B21C /* TopNotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopNotificationModel.swift; sourceTree = "<group>"; };
 		D20C700A250BFDE40095B21C /* MVMCoreUITopAlertView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MVMCoreUITopAlertView+Extension.swift"; sourceTree = "<group>"; };
 		D20F3B43252E00E4004B3F56 /* PageProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageProtocol.swift; sourceTree = "<group>"; };
+		D20F3B5D252F9B5D004B3F56 /* NavigationBarRefreshProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarRefreshProtocol.swift; sourceTree = "<group>"; };
 		D20FB164241A5D75004AFC3A /* NavigationItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationItemModel.swift; sourceTree = "<group>"; };
 		D213347623843825008E41B3 /* Line.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Line.swift; sourceTree = "<group>"; };
 		D21B7F5E2437C5BC00051ABF /* MoleculeStackView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeStackView.swift; sourceTree = "<group>"; };
@@ -2082,6 +2084,7 @@
 				D20F3B43252E00E4004B3F56 /* PageProtocol.swift */,
 				012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */,
 				D28BA7442481652D00B75CB8 /* TabBarProtocol.swift */,
+				D20F3B5D252F9B5D004B3F56 /* NavigationBarRefreshProtocol.swift */,
 				011B58EE23A2AA850085F53C /* ModelProtocols */,
 			);
 			path = Protocols;
@@ -2431,6 +2434,7 @@
 				D22479942316AE5E003FCCF9 /* NSLayoutConstraintExtension.swift in Sources */,
 				D2B18B94236214AD00A9AEDC /* NavigationController.swift in Sources */,
 				0A9D09222433796500D2E6C0 /* CarouselIndicator.swift in Sources */,
+				D20F3B5E252F9B5E004B3F56 /* NavigationBarRefreshProtocol.swift in Sources */,
 				D29E28DA23D21AFA00ACEA85 /* StringAndMoleculeModel.swift in Sources */,
 				D260105D23D0BCD400764D80 /* Stack.swift in Sources */,
 				0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */,

MVMCoreUI/Atomic/Protocols/NavigationBarRefreshProtocol.swift

@@ -0,0 +1,34 @@
+//
+//  NavigationBarRefreshProtocol.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 10/8/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+/// A protocol to inform that we should refresh the navigation bar ui.
+@objc public protocol NavigationBarRefreshProtocol {
+    @objc func refreshNavigationUI()
+}
+
+extension UIViewController: NavigationBarRefreshProtocol {
+    
+    /// Convenience function to refresh the navigation bar ui. A separate function for others to use.
+    @objc static func refreshNavigationUI(for viewController: UIViewController) {
+        guard let model = (viewController as? PageProtocol)?.pageModel?.navigationBar else { return }
+        if let navigationController = viewController.navigationController {
+            NavigationController.setNavigationItem(navigationController: navigationController, navigationItemModel: model, viewController: viewController)
+            MVMCoreUISplitViewController.setNavigationBarUI(for: viewController, navigationController: navigationController, navigationItemModel: model)
+        }
+        if let manager = ((viewController as? MVMCoreViewManagerViewControllerProtocol)?.manager as? NavigationBarRefreshProtocol) {
+            // Refresh the manager if possible.
+            manager.refreshNavigationUI()
+        }
+    }
+    
+    public func refreshNavigationUI() {
+        UIViewController.refreshNavigationUI(for: self)
+    }
+}

MVMCoreUI/Atomic/Protocols/PageProtocol.swift

@@ -11,30 +11,3 @@ import Foundation
 public protocol PageProtocol {
     var pageModel: PageModelProtocol? { get set }
 }
-
-/// A protocol to inform that we should refresh the navigation bar ui.
-@objc public protocol NavigationBarRefreshProtocol {
-    @objc func refreshNavigationUI()
-}
-
-public extension UINavigationBar {
-    
-    /// Convenience function to refresh the navigation bar ui.
-    @objc static func refreshNavigationUI(for viewController: UIViewController) {
-        guard let model = (viewController as? PageProtocol)?.pageModel?.navigationBar else { return }
-        if let navigationController = viewController.navigationController {
-            NavigationController.setNavigationItem(navigationController: navigationController, navigationItemModel: model, viewController: viewController)
-            MVMCoreUISplitViewController.setNavigationBarUI(for: viewController, navigationController: navigationController, navigationItemModel: model)
-        }
-        if let manager = ((viewController as? MVMCoreViewManagerViewControllerProtocol)?.manager as? NavigationBarRefreshProtocol) {
-            // Refresh the manager if possible.
-            manager.refreshNavigationUI()
-        }
-    }
-}
-
-extension UIViewController: NavigationBarRefreshProtocol {
-    public func refreshNavigationUI() {
-        UINavigationBar.refreshNavigationUI(for: self)
-    }
-}

MVMCoreUI/Containers/NavigationController.swift

@@ -96,24 +96,6 @@ import UIKit
         }
     }
 
-    /// Convenience setter for legacy files
-    public static func setNavigationItem(navigationController: UINavigationController, navigationJSON: [String: Any], viewController: UIViewController) throws {
-        let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
-        guard let barModel = try MoleculeObjectMapping.shared()?.getMoleculeModelForJSON(navigationJSON, delegateObject: delegate) as? (MoleculeModelProtocol & NavigationItemModelProtocol) else {
-            throw ModelRegistry.Error.decoderOther(message: "Model not a bar model")
-        }
-        setNavigationItem(navigationController: navigationController, navigationItemModel: barModel, viewController: viewController)
-    }
-    
-    /// Convenience setter for legacy files
-    public static func setNavigationBarUI(navigationController: UINavigationController, navigationJSON: [String: Any], viewController: UIViewController) throws {
-        let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
-        guard let barModel = try MoleculeObjectMapping.shared()?.getMoleculeModelForJSON(navigationJSON, delegateObject: delegate) as? (MoleculeModelProtocol & NavigationItemModelProtocol) else {
-            throw ModelRegistry.Error.decoderOther(message: "Model not a bar model")
-        }
-        setNavigationBarUI(navigationController: navigationController, navigationItemModel: barModel, viewController: viewController)
-    }
-    
     /// Convenience function for setting the navigation titleView.
     public static func setNavigationTitleView(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
         let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject