From 3734cae058ae90caaa28dfb4207cafd099b1e57e Mon Sep 17 00:00:00 2001 From: Subhankar Acharya Date: Wed, 26 Feb 2020 21:24:43 +0530 Subject: [PATCH] Code improvement. --- .../LeftVariable/ListProgressBarData.swift | 40 +++++-------------- .../ListProgressBarDataModel.swift | 8 +--- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarData.swift b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarData.swift index 466439a1..8f43369b 100644 --- a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarData.swift +++ b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarData.swift @@ -6,7 +6,6 @@ // Copyright © 2020 Verizon Wireless. All rights reserved. // -import Foundation import UIKit @objcMembers public class ListProgressBarData: TableViewCell { @@ -23,39 +22,23 @@ import UIKit //----------------------------------------------------- // MARK: - View Lifecycle //----------------------------------------------------- - - open override func updateView(_ size: CGFloat) { - super.updateView(size) - progressBar.updateView(size) - leftLabel.updateView(size) - rightLabel.updateView(size) - - } - override open func setupView() { super.setupView() - - contentView.addSubview(view) + + rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal) view.addSubview(progressBar) view.addSubview(leftLabel) view.addSubview(rightLabel) - containerHelper.constrainView(view) - - //constraints - + addMolecule(view) NSLayoutConstraint.pinViews(leftView: leftLabel, rightView: rightLabel, alignTop: false) progressBar.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true progressBar.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true progressBar.topAnchor.constraint(equalTo: leftLabel.bottomAnchor, constant: PaddingTwo).isActive = true - progressBar.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true - -} + view.bottomAnchor.constraint(equalTo: progressBar.bottomAnchor).isActive = true + } - //---------------------------------------------------- - // MARK: - Molecule - //------------------------------------------------------ - - public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { + // MARK: - MVMCoreUIMoleculeViewProtocol + open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { super.setWithModel(model, delegateObject, additionalData) guard let model = model as? ListProgressBarDataModel else { return} progressBar.setWithModel(model.progressBar, delegateObject, additionalData) @@ -63,16 +46,15 @@ import UIKit rightLabel.setWithModel(model.rightLabel, delegateObject, additionalData) } - public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { - return 90 - } - - override open func reset() { super.reset() progressBar.reset() leftLabel.styleB1(true) rightLabel.styleB1(true) } + + open override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { + return 90 + } } diff --git a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarDataModel.swift b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarDataModel.swift index b7917739..de6ada2e 100644 --- a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarDataModel.swift +++ b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListProgressBarDataModel.swift @@ -10,15 +10,10 @@ import Foundation public class ListProgressBarDataModel : ListItemModel, MoleculeModelProtocol { public static var identifier: String = "listPrgBarData" - public var progressBar : MultiProgressBarModel public var leftLabel: LabelModel public var rightLabel: LabelModel - - override public func setDefaults() { - super.setDefaults() - } - + public init (progressBar: MultiProgressBarModel, leftLabel: LabelModel, rightLabel: LabelModel){ self.progressBar = progressBar self.leftLabel = leftLabel @@ -48,6 +43,5 @@ public class ListProgressBarDataModel : ListItemModel, MoleculeModelProtocol { try container.encode(progressBar, forKey: .progressBar) try container.encode(leftLabel, forKey: .leftLabel) try container.encode(rightLabel, forKey: .rightLabel) - } }