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

Fix for base style for legacy controllers. (sign in different user font)

Browse Source
This commit is contained in:
Scott Pfeil 2022-03-10 10:05:33 -05:00
parent 07226731c0
commit f23e30645e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MVMCoreUI/Containers/NavigationController.swift
View File

@ -23,6 +23,7 @@ import UIKit
MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = navigationController MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = navigationController
MVMCoreNavigationHandler.shared()?.navigationController = navigationController MVMCoreNavigationHandler.shared()?.navigationController = navigationController
MVMCoreNavigationHandler.shared()?.addDelegate(navigationController) MVMCoreNavigationHandler.shared()?.addDelegate(navigationController)
NavigationController.setNavigationBarUI(navigationController: navigationController, navigationItemModel: NavigationItemModel())
return navigationController return navigationController
} }
@ -98,7 +99,7 @@ import UIKit
// } // }
/// Convenience function for setting the navigation bar ui, except for the buttons. /// Convenience function for setting the navigation bar ui, except for the buttons.
public static func setNavigationBarUI(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) { public static func setNavigationBarUI(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol) {
let navigationBar = navigationController.navigationBar let navigationBar = navigationController.navigationBar
let font = MFStyler.fontBoldBodySmall(false) let font = MFStyler.fontBoldBodySmall(false)
let backgroundColor = navigationItemModel.backgroundColor?.uiColor let backgroundColor = navigationItemModel.backgroundColor?.uiColor
@ -174,7 +175,7 @@ extension NavigationController: MVMCoreViewManagerProtocol {
let topViewController = topViewController, let topViewController = topViewController,
let model = getNavigationModel(from: viewController) { let model = getNavigationModel(from: viewController) {
Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: topViewController) Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: topViewController)
Self.setNavigationBarUI(navigationController: self, navigationItemModel: model, viewController: topViewController) Self.setNavigationBarUI(navigationController: self, navigationItemModel: model)
} }
manager?.newDataReceived?(in: viewController) manager?.newDataReceived?(in: viewController)
} }
@ -189,9 +190,8 @@ extension NavigationController: MVMCoreViewManagerProtocol {
public func displayedViewController(_ viewController: UIViewController) { public func displayedViewController(_ viewController: UIViewController) {
if isDisplayed(viewController: viewController), if isDisplayed(viewController: viewController),
let topViewController = topViewController,
let model = getNavigationModel(from: viewController) { let model = getNavigationModel(from: viewController) {
Self.setNavigationBarUI(navigationController: self, navigationItemModel: model, viewController: topViewController) Self.setNavigationBarUI(navigationController: self, navigationItemModel: model)
} }
manager?.displayedViewController?(viewController) manager?.displayedViewController?(viewController)
} }
@ -218,7 +218,7 @@ extension NavigationController: MVMCorePresentationDelegateProtocol {
guard self == navigationController, guard self == navigationController,
let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return } let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return }
if let model = getNavigationModel(from: newViewController) { if let model = getNavigationModel(from: newViewController) {
Self.setNavigationBarUI(navigationController: self, navigationItemModel: model, viewController: viewController) Self.setNavigationBarUI(navigationController: self, navigationItemModel: model)
} }
manager?.displayedViewController?(newViewController) manager?.displayedViewController?(newViewController)
if let controller = viewController as? (UIViewController & MVMCoreViewManagerViewControllerProtocol) { if let controller = viewController as? (UIViewController & MVMCoreViewManagerViewControllerProtocol) {