From 0cf5d641e97c31d2621eb4de2b319fedb3ca3a77 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Wed, 17 Jun 2020 22:17:10 -0400 Subject: [PATCH 1/2] Wishlist update --- .../SplitViewController/MVMCoreUISplitViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index b6d4f812..d5124769 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -1069,6 +1069,7 @@ CGFloat const PanelAnimationDuration = 0.2; if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) { [((UIBarButtonItem *)self.rightPanelButton) setIconColor:color]; } + [self.backButton setTintColor:color]; } @end From 728a3ca62284117d36b519f1b37638c93326e89a Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Wed, 17 Jun 2020 22:23:40 -0400 Subject: [PATCH 2/2] order fix --- .../SplitViewController/MVMCoreUISplitViewController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index d5124769..82594e53 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -237,12 +237,12 @@ CGFloat const PanelAnimationDuration = 0.2; - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended { NSMutableArray *leftBarButtonItems = [NSMutableArray array]; NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController]; - if (extraButtons) { - [leftBarButtonItems addObjectsFromArray:extraButtons]; - } if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) { [leftBarButtonItems addObject:self.leftPanelButton]; } + if (extraButtons) { + [leftBarButtonItems addObjectsFromArray:extraButtons]; + } [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations]; }