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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop

Browse Source
This commit is contained in:
Subhankar Acharya 2020-06-10 15:54:08 +05:30
commit e17dbb62ab
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift
View File

@ -50,15 +50,15 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol {
} }
open override func viewForMiddle() -> UIView? { open override func viewForMiddle() -> UIView? {
guard let moleculeStackModel = templateModel?.moleculeStack else { return nil }
guard let moleculeStackModel = templateModel?.moleculeStack else { // By default: Stack template stack has vertical space before the first item, dynamic stack items have default horizontal padding.
return nil
}
let stack = MoleculeStackView(frame: .zero) let stack = MoleculeStackView(frame: .zero)
moleculeStackModel.useStackSpacingBeforeFirstItem = true moleculeStackModel.useStackSpacingBeforeFirstItem = true
if moleculeStackModel.useHorizontalMargins == nil { for stackItem in moleculeStackModel.molecules {
moleculeStackModel.useHorizontalMargins = true guard let stackItem = stackItem as? MoleculeStackItemModel,
stackItem.horizontalAlignment == nil else { continue }
stackItem.useHorizontalMargins = true
} }
stack.set(with: moleculeStackModel, delegateObject() as? MVMCoreUIDelegateObject, nil) stack.set(with: moleculeStackModel, delegateObject() as? MVMCoreUIDelegateObject, nil)
return stack return stack

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

@ -240,7 +240,7 @@ CGFloat const PanelAnimationDuration = 0.2;
if (extraButtons) { if (extraButtons) {
[leftBarButtonItems addObjectsFromArray:extraButtons]; [leftBarButtonItems addObjectsFromArray:extraButtons];
} }
if ((accessible && !extended) && self.leftPanelButton) { if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) {
[leftBarButtonItems addObject:self.leftPanelButton]; [leftBarButtonItems addObject:self.leftPanelButton];
} }
[viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations]; [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations];
@ -407,10 +407,10 @@ CGFloat const PanelAnimationDuration = 0.2;
- (void)setRightNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended { - (void)setRightNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
NSMutableArray *navigationItems = [[NSMutableArray alloc] init]; NSMutableArray *navigationItems = [[NSMutableArray alloc] init];
if ((accessible && !extended) && self.rightPanelButton) { NSArray *extraButtons = [self additionalRightButtonsForViewController:viewController];
if ((accessible && !extended) && self.rightPanelButton && ![extraButtons containsObject:self.rightPanelButton]) {
[navigationItems addObject:self.rightPanelButton]; [navigationItems addObject:self.rightPanelButton];
} }
NSArray *extraButtons = [self additionalRightButtonsForViewController:viewController];
if (extraButtons) { if (extraButtons) {
[navigationItems addObjectsFromArray:extraButtons]; [navigationItems addObjectsFromArray:extraButtons];
} }