From 19ef7a3a26aa337ea9e17f3b695703079cefb6a8 Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 27 May 2022 00:18:18 +0530 Subject: [PATCH 1/4] Fix for CXTDT-288387, removing line molecule from Tab --- .../Atomic/Molecules/HorizontalCombinationViews/Tabs.swift | 6 ------ MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift | 1 - 2 files changed, 7 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift index 4e424549..e78ccf19 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift @@ -28,7 +28,6 @@ import VDSColorTokens let bottomScrollView = UIScrollView(frame: .zero) let bottomContentView = View() - let bottomLine = Line() let selectionLine = View() var selectionLineLeftConstraint: NSLayoutConstraint? var selectionLineWidthConstraint: NSLayoutConstraint? @@ -68,7 +67,6 @@ import VDSColorTokens open override func setupView() { super.setupView() backgroundColor = VDSColor.backgroundPrimaryLight - addSubview(bottomLine) setupCollectionView() setupSelectionLine() setupConstraints() @@ -116,10 +114,6 @@ import VDSColorTokens selectionLineWidthConstraint = selectionLine.widthAnchor.constraint(equalToConstant: minimumItemWidth) selectionLineWidthConstraint?.isActive = true NSLayoutConstraint.constraintPinSubview(toSuperview: bottomContentView) - - //bottom line - bottomLine.topAnchor.constraint(equalTo: bottomScrollView.bottomAnchor).isActive = true; - NSLayoutConstraint.constraintPinSubview(bottomLine, pinTop: false, pinBottom: true, pinLeft: true, pinRight: true) } //------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift index d3b91b11..5fe9c530 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift @@ -22,7 +22,6 @@ import UIKit tabs.paddingBeforeFirstTab = false tabs.translatesAutoresizingMaskIntoConstraints = false tabs.delegate = self - tabs.bottomLine.setStyle(.none) contentView.addSubview(tabs) NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: tabs, useMargins: true).values)) From eeb6573e727eae09b6a6df3eefef6d5901c021ad Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 27 May 2022 12:13:06 +0530 Subject: [PATCH 2/4] Reverting - line changes in Tab component & Removing line item in Subnavigation controller --- .../Atomic/Molecules/HorizontalCombinationViews/Tabs.swift | 7 +++++++ MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift | 1 + MVMCoreUI/Managers/SubNav/SubNavManagerController.swift | 6 +----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift index e78ccf19..f6f834ca 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift @@ -28,6 +28,7 @@ import VDSColorTokens let bottomScrollView = UIScrollView(frame: .zero) let bottomContentView = View() + let bottomLine = Line() let selectionLine = View() var selectionLineLeftConstraint: NSLayoutConstraint? var selectionLineWidthConstraint: NSLayoutConstraint? @@ -67,6 +68,8 @@ import VDSColorTokens open override func setupView() { super.setupView() backgroundColor = VDSColor.backgroundPrimaryLight + bottomLine.setStyle(.secondary) + addSubview(bottomLine) setupCollectionView() setupSelectionLine() setupConstraints() @@ -114,6 +117,10 @@ import VDSColorTokens selectionLineWidthConstraint = selectionLine.widthAnchor.constraint(equalToConstant: minimumItemWidth) selectionLineWidthConstraint?.isActive = true NSLayoutConstraint.constraintPinSubview(toSuperview: bottomContentView) + + //bottom line + bottomLine.topAnchor.constraint(equalTo: bottomScrollView.bottomAnchor).isActive = true; + NSLayoutConstraint.constraintPinSubview(bottomLine, pinTop: false, pinBottom: true, pinLeft: true, pinRight: true) } //------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift index 5fe9c530..0ecb230f 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift @@ -22,6 +22,7 @@ import UIKit tabs.paddingBeforeFirstTab = false tabs.translatesAutoresizingMaskIntoConstraints = false tabs.delegate = self + tabs.bottomLine.setStyle(.secondary) contentView.addSubview(tabs) NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: tabs, useMargins: true).values)) diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift index b3a142ba..f5c4023a 100644 --- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift +++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift @@ -19,7 +19,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, /// Used to layout the ui. public lazy var stackView: UIStackView = { - let stackView = UIStackView(arrangedSubviews: [tabs, line, subNavigationController.view]) + let stackView = UIStackView(arrangedSubviews: [tabs, subNavigationController.view]) stackView.translatesAutoresizingMaskIntoConstraints = false stackView.isAccessibilityElement = false stackView.axis = .vertical @@ -33,10 +33,6 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, return tabs }() - public lazy var line: Line = { - return Line(model: LineModel(type: .secondary), delegateObjectIVar, nil) - }() - public lazy var subNavigationController: UINavigationController = { let subNavigationController = SubNavManagerNavigationController(rootViewController: viewController) subNavigationController.view.translatesAutoresizingMaskIntoConstraints = false From 7fbac6b8dcef2edc7427044534503c4dc8118f41 Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 27 May 2022 20:25:47 +0530 Subject: [PATCH 3/4] Changes to set the line style after initialization --- MVMCoreUI/Atomic/Atoms/Views/Line.swift | 3 +++ .../Atomic/Molecules/HorizontalCombinationViews/Tabs.swift | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Line.swift b/MVMCoreUI/Atomic/Atoms/Views/Line.swift index d4c4d26d..e36c8d23 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Line.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Line.swift @@ -49,16 +49,19 @@ import UIKit public init() { super.init(frame: .zero) model = LineModel(type: .secondary) + setStyle(.secondary) } public override init(frame: CGRect) { super.init(frame: frame) model = LineModel(type: .secondary) + setStyle(.secondary) } public required init?(coder: NSCoder) { super.init(coder: coder) model = LineModel(type: .secondary) + setStyle(.secondary) } public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift index f6f834ca..4e424549 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift @@ -68,7 +68,6 @@ import VDSColorTokens open override func setupView() { super.setupView() backgroundColor = VDSColor.backgroundPrimaryLight - bottomLine.setStyle(.secondary) addSubview(bottomLine) setupCollectionView() setupSelectionLine() From 3e8f464aac5322b805712e7a779809654c43f25b Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 27 May 2022 21:10:41 +0530 Subject: [PATCH 4/4] Reverting line changes in TabTableCell --- MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift index 0ecb230f..d3b91b11 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/TabsTableViewCell.swift @@ -22,7 +22,7 @@ import UIKit tabs.paddingBeforeFirstTab = false tabs.translatesAutoresizingMaskIntoConstraints = false tabs.delegate = self - tabs.bottomLine.setStyle(.secondary) + tabs.bottomLine.setStyle(.none) contentView.addSubview(tabs) NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: tabs, useMargins: true).values))