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

Merge branch 'bugfix/CXTDT-288387' into 'release/10_0_0'

Browse Source 
Fix for CXTDT-288387, removing line molecule from Tab

See merge request BPHV_MIPS/mvm_core_ui!859
This commit is contained in:
Pfeil, Scott Robert 2022-05-27 15:44:54 +00:00
commit e0eebc4b4c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MVMCoreUI/Atomic/Atoms/Views/Line.swift
View File

@ -49,16 +49,19 @@ import UIKit
public init() { public init() {
super.init(frame: .zero) super.init(frame: .zero)
model = LineModel(type: .secondary) model = LineModel(type: .secondary)
setStyle(.secondary)
} }
public override init(frame: CGRect) { public override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
model = LineModel(type: .secondary) model = LineModel(type: .secondary)
setStyle(.secondary)
} }
public required init?(coder: NSCoder) { public required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
model = LineModel(type: .secondary) model = LineModel(type: .secondary)
setStyle(.secondary)
} }
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {

6
MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
View File

@ -19,7 +19,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
/// Used to layout the ui. /// Used to layout the ui.
public lazy var stackView: UIStackView = { public lazy var stackView: UIStackView = {
let stackView = UIStackView(arrangedSubviews: [tabs, line, subNavigationController.view]) let stackView = UIStackView(arrangedSubviews: [tabs, subNavigationController.view])
stackView.translatesAutoresizingMaskIntoConstraints = false stackView.translatesAutoresizingMaskIntoConstraints = false
stackView.isAccessibilityElement = false stackView.isAccessibilityElement = false
stackView.axis = .vertical stackView.axis = .vertical
@ -33,10 +33,6 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
return tabs return tabs
}() }()
public lazy var line: Line = {
return Line(model: LineModel(type: .secondary), delegateObjectIVar, nil)
}()
public lazy var subNavigationController: UINavigationController = { public lazy var subNavigationController: UINavigationController = {
let subNavigationController = SubNavManagerNavigationController(rootViewController: viewController) let subNavigationController = SubNavManagerNavigationController(rootViewController: viewController)
subNavigationController.view.translatesAutoresizingMaskIntoConstraints = false subNavigationController.view.translatesAutoresizingMaskIntoConstraints = false