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

undo changes

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-06-29 19:58:34 -04:00
parent d1df1e2944
commit c599f314c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
View File

@ -43,14 +43,14 @@ public extension MVMCoreUISplitViewController {
} }
/// Sets the left navigation items for the view controller based on model and splitview. /// Sets the left navigation items for the view controller based on model and splitview.
func setLeftNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) { func setLeftNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
var leftItems: [UIBarButtonItem] = [] var leftItems: [UIBarButtonItem] = []
let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
// Add back button first. // Add back button first.
if navigationItemModel.alwaysShowBackButton ?? false != false { if navigationItemModel?.alwaysShowBackButton != false {
if let backButtonModel = navigationItemModel.backButton { if let backButtonModel = navigationItemModel?.backButton {
if navigationController.viewControllers.count > 1 || navigationItemModel.alwaysShowBackButton ?? false { if navigationController.viewControllers.count > 1 || navigationItemModel!.alwaysShowBackButton ?? false {
leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil)) leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
} }
} else if let backButton = backButton, } else if let backButton = backButton,
@ -67,7 +67,7 @@ public extension MVMCoreUISplitViewController {
} }
// Add other model buttons // Add other model buttons
if let leftItemModels = navigationItemModel.additionalLeftButtons { if let leftItemModels = navigationItemModel?.additionalLeftButtons {
for item in leftItemModels { for item in leftItemModels {
leftItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil)) leftItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
} }
@ -82,7 +82,7 @@ public extension MVMCoreUISplitViewController {
} }
/// Sets the right navigation items for the view controller based on model and splitview. /// Sets the right navigation items for the view controller based on model and splitview.
func setRightNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) { func setRightNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol?, viewController: UIViewController) {
let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
var rightItems: [UIBarButtonItem] = [] var rightItems: [UIBarButtonItem] = []
@ -94,7 +94,7 @@ public extension MVMCoreUISplitViewController {
} }
// Add other model buttons // Add other model buttons
if let rightItemModels = navigationItemModel.additionalRightButtons { if let rightItemModels = navigationItemModel?.additionalRightButtons {
for item in rightItemModels { for item in rightItemModels {
rightItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil)) rightItems.append(item.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
} }