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

Added view controller getter.

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-10-08 11:31:40 -04:00
parent e60824ee1b
commit 43bd436225
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Containers/NavigationController.swift
View File

@ -59,7 +59,7 @@ import UIKit
var leftItems: [UIBarButtonItem] = [] var leftItems: [UIBarButtonItem] = []
if navigationItemModel.alwaysShowBackButton != false { if navigationItemModel.alwaysShowBackButton != false {
if let backButtonModel = navigationItemModel.backButton, if let backButtonModel = navigationItemModel.backButton,
navigationController.viewControllers.count > 1 || navigationItemModel.alwaysShowBackButton ?? false { MVMCoreNavigationHandler.shared()?.getViewControllers(for: navigationController)?.count ?? 0 > 1 || navigationItemModel.alwaysShowBackButton ?? false {
leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil)) leftItems.append(backButtonModel.createNavigationItemButton(delegateObject: delegate, additionalData: nil))
} }
if let leftItemModels = navigationItemModel.additionalLeftButtons { if let leftItemModels = navigationItemModel.additionalLeftButtons {

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

@ -48,7 +48,7 @@ public extension MVMCoreUISplitViewController {
if let forceBackButton = navigationItemModel?.alwaysShowBackButton { if let forceBackButton = navigationItemModel?.alwaysShowBackButton {
showBackButton = forceBackButton showBackButton = forceBackButton
} else { } else {
showBackButton = navigationController.viewControllers.count > 1 showBackButton = MVMCoreNavigationHandler.shared()?.getViewControllers(for: navigationController)?.count ?? 0 > 1
} }
if showBackButton { if showBackButton {
if let backButtonModel = navigationItemModel?.backButton { if let backButtonModel = navigationItemModel?.backButton {

2
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
View File

@ -241,7 +241,7 @@ CGFloat const PanelAnimationDuration = 0.2;
- (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended { - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
NSMutableArray *leftBarButtonItems = [NSMutableArray array]; NSMutableArray *leftBarButtonItems = [NSMutableArray array];
if ([viewController.navigationController.viewControllers count] > 1) { if (viewController.navigationController && [MVMCoreNavigationHandler.sharedNavigationHandler getViewControllersForNavigationController:viewController.navigationController].count > 1) {
[leftBarButtonItems addObject:self.backButton]; [leftBarButtonItems addObject:self.backButton];
} }
if ((accessible && !extended) && self.leftPanelButton) { if ((accessible && !extended) && self.leftPanelButton) {