Merge branch 'feature/3.0-NavBar-Shop-Store-Swap' into 'feature/develop_mvp_3'

Changes to swap store buttons with shop cart button in navigation bar

See merge request BPHV_MIPS/mvm_core_ui!840
This commit is contained in:
Pfeil, Scott Robert 2022-04-07 20:19:28 +00:00
commit 868a7fc22b

View File

@ -90,6 +90,11 @@ public extension MVMCoreUISplitViewController {
rightItems.append(panelButton)
}
// Add any buttons added by the splitview.
if let additionalRightButtons = additionalRightButtons(for: viewController) {
rightItems.append(contentsOf: additionalRightButtons)
}
// Add other model buttons
if let rightItemModels = navigationItemModel?.additionalRightButtons {
for item in rightItemModels {
@ -97,11 +102,6 @@ public extension MVMCoreUISplitViewController {
}
}
// Add any buttons added by the splitview.
if let additionalRightButtons = additionalRightButtons(for: viewController) {
rightItems.append(contentsOf: additionalRightButtons)
}
topViewController.navigationItem.setRightBarButtonItems(rightItems.count > 0 ? rightItems : nil, animated: !DisableAnimations.boolValue)
}