Merge branch 'bugfix/CXTDT-578423' into 'develop'
Digital ACT191 defect CXTDT-578423 - Fix to missing navigation line when the... ### Summary The hide navigation bar line logic has been updated to include if the sub navigation is manually hidden. ### JIRA Ticket https://onejira.verizon.com/browse/CXTDT-578423 Co-authored-by: Scott Pfeil <Scott.Pfeil3@verizonwireless.com> See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1143
This commit is contained in:
commit
3cdd3a95a0
@ -137,7 +137,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
|
||||
|
||||
open override func pageShown() {
|
||||
// Currently not calling super until we can decouple page shown logics for managers.
|
||||
hideNavigationBarLine(true)
|
||||
hideNavigationBarLine(!tabs.isHidden)
|
||||
}
|
||||
|
||||
open override func viewWillDisappear(_ animated: Bool) {
|
||||
@ -148,7 +148,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
|
||||
|
||||
open override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
hideNavigationBarLine(true)
|
||||
hideNavigationBarLine(!tabs.isHidden)
|
||||
}
|
||||
/// ensures margin for tabs are correct
|
||||
private func updateTabsMargin() {
|
||||
@ -263,7 +263,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
|
||||
}
|
||||
tabs.selectIndex(index, animated: true)
|
||||
self.index = nil
|
||||
hideNavigationBarLine(true)
|
||||
hideNavigationBarLine(!tabs.isHidden)
|
||||
}
|
||||
|
||||
public func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
|
||||
@ -354,12 +354,12 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
|
||||
|
||||
open func newDataReceived(in viewController: UIViewController) {
|
||||
manager?.newDataReceived?(in: viewController)
|
||||
hideNavigationBarLine(true)
|
||||
hideNavigationBarLine(!tabs.isHidden)
|
||||
}
|
||||
|
||||
public func willDisplay(_ viewController: UIViewController) {
|
||||
manager?.willDisplay?(viewController)
|
||||
hideNavigationBarLine(true)
|
||||
hideNavigationBarLine(!tabs.isHidden)
|
||||
}
|
||||
|
||||
public func displayedViewController(_ viewController: UIViewController) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user