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

Updated code as per confluence changes.

Browse Source
This commit is contained in:
Lekshmi S 2020-05-13 19:41:17 +05:30
parent 3fce526c90
commit e217970a04
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
View File

@ -14,7 +14,6 @@ import Foundation
let progressBar = ProgressBar() let progressBar = ProgressBar()
let leftHeadline = Label.commonLabelB1(true) let leftHeadline = Label.commonLabelB1(true)
let leftBody = Label.commonLabelB2(true) let leftBody = Label.commonLabelB2(true)
let leftBody2 = Label.commonLabelB2(true)
let bar = Line() let bar = Line()
let rightLabel = Label.commonLabelB2(true) let rightLabel = Label.commonLabelB2(true)
private let barStackItem: StackItem private let barStackItem: StackItem
@ -27,25 +26,19 @@ import Foundation
// MARK: - Initializers // MARK: - Initializers
//------------------------------------------------------ //------------------------------------------------------
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
//vertical stack with leftHeadline, leftBody, leftBody2 //vertical stack with leftHeadline, leftBody
let verticalStackModel = StackModel(molecules: [StackItemModel(horizontalAlignment: .leading, verticalAlignment: .leading), StackItemModel(horizontalAlignment: .leading), StackItemModel(horizontalAlignment: .leading)], verticalStack = Stack<StackModel>.createStack(with: [leftHeadline, leftBody], axis: .vertical, spacing: 2)
axis: .vertical, spacing: 0)
let verticalStackItems = [StackItem(andContain: leftHeadline), StackItem(andContain: leftBody), StackItem(andContain: leftBody2)]
verticalStack = Stack<StackModel>(with: verticalStackModel, stackItems: verticalStackItems)
//horizontal stack with leftHeadline, leftBody, leftBody2, bar, rightLabel //horizontal stack with leftHeadline, leftBody, bar, rightLabel
let horizontalStackModel = StackModel(molecules: [StackItemModel(horizontalAlignment: .leading), StackItemModel(horizontalAlignment: .fill), StackItemModel(spacing: 5, horizontalAlignment: .fill)], let horizontalStackModel = StackModel(molecules: [StackItemModel(horizontalAlignment: .leading), StackItemModel(horizontalAlignment: .fill), StackItemModel(spacing: 5, horizontalAlignment: .fill)],
axis: .horizontal) axis: .horizontal)
barStackItem = StackItem(andContain: bar) barStackItem = StackItem(andContain: bar)
rightLabelStackItem = StackItem(andContain: rightLabel) rightLabelStackItem = StackItem(andContain: rightLabel)
let horizontalStackItems = [StackItem(andContain: verticalStack), barStackItem, rightLabelStackItem] let horizontalStackItems = [StackItem(andContain: verticalStack), barStackItem, rightLabelStackItem]
horizontalStack = Stack<StackModel>(with: horizontalStackModel, stackItems: horizontalStackItems) horizontalStack = Stack<StackModel>(with: horizontalStackModel, stackItems: horizontalStackItems)
//stack with all components //stack with all components
let stackModel = StackModel(molecules: [StackItemModel(horizontalAlignment: .fill), stack = Stack<StackModel>.createStack(with: [horizontalStack, progressBar], axis: .vertical, spacing: PaddingDefaultVerticalSpacing3)
StackItemModel(spacing: 20, horizontalAlignment: .fill)], axis: .vertical)
let stackItems = [StackItem(andContain: horizontalStack), StackItem(andContain: progressBar)]
stack = Stack<StackModel>(with: stackModel, stackItems: stackItems)
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
} }
@ -85,8 +78,7 @@ import Foundation
super.set(with: model, delegateObject, additionalData) super.set(with: model, delegateObject, additionalData)
guard let model = model as? ListProgressBarThinModel else { return } guard let model = model as? ListProgressBarThinModel else { return }
verticalStack.updateContainedMolecules(with: [model.leftHeadline, verticalStack.updateContainedMolecules(with: [model.leftHeadline,
model.leftBody, model.leftBody], delegateObject, additionalData)
model.leftBody2],delegateObject, additionalData)
progressBar.set(with: model.progressBar, delegateObject, additionalData) progressBar.set(with: model.progressBar, delegateObject, additionalData)
bar.set(with: model.bar, delegateObject, additionalData) bar.set(with: model.bar, delegateObject, additionalData)
rightLabel.set(with: model.rightLabel, delegateObject, additionalData) rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
@ -100,7 +92,6 @@ import Foundation
super.reset() super.reset()
leftHeadline.styleB1(true) leftHeadline.styleB1(true)
leftBody.styleB2(true) leftBody.styleB2(true)
leftBody2.styleB2(true)
rightLabel.styleB2(true) rightLabel.styleB2(true)
bar.setStyle(.medium) bar.setStyle(.medium)
} }

7
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThinModel.swift
View File

@ -12,15 +12,13 @@ public class ListProgressBarThinModel: ListItemModel, MoleculeModelProtocol {
public var progressBar: ProgressBarModel public var progressBar: ProgressBarModel
public var leftHeadline: LabelModel? public var leftHeadline: LabelModel?
public var leftBody: LabelModel? public var leftBody: LabelModel?
public var leftBody2: LabelModel?
public var bar: LineModel public var bar: LineModel
public var rightLabel: LabelModel public var rightLabel: LabelModel
public init(progressBar: ProgressBarModel, leftHeadline: LabelModel, leftBody: LabelModel, leftBody2: LabelModel, bar: LineModel, rightLabel: LabelModel) { public init(progressBar: ProgressBarModel, leftHeadline: LabelModel, leftBody: LabelModel, bar: LineModel, rightLabel: LabelModel) {
self.progressBar = progressBar self.progressBar = progressBar
self.leftHeadline = leftHeadline self.leftHeadline = leftHeadline
self.leftBody = leftBody self.leftBody = leftBody
self.leftBody2 = leftBody2
self.bar = bar self.bar = bar
self.rightLabel = rightLabel self.rightLabel = rightLabel
super.init() super.init()
@ -42,7 +40,6 @@ public class ListProgressBarThinModel: ListItemModel, MoleculeModelProtocol {
case progressBar case progressBar
case leftHeadline case leftHeadline
case leftBody case leftBody
case leftBody2
case line case line
case rightLabel case rightLabel
} }
@ -52,7 +49,6 @@ public class ListProgressBarThinModel: ListItemModel, MoleculeModelProtocol {
progressBar = try typeContainer.decode(ProgressBarModel.self, forKey:.progressBar) progressBar = try typeContainer.decode(ProgressBarModel.self, forKey:.progressBar)
leftHeadline = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .leftHeadline) leftHeadline = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .leftHeadline)
leftBody = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .leftBody) leftBody = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .leftBody)
leftBody2 = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .leftBody2)
bar = try typeContainer.decode(LineModel.self, forKey: .line) bar = try typeContainer.decode(LineModel.self, forKey: .line)
rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel) rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
try super.init(from: decoder) try super.init(from: decoder)
@ -65,7 +61,6 @@ public class ListProgressBarThinModel: ListItemModel, MoleculeModelProtocol {
try container.encode(progressBar, forKey: .progressBar) try container.encode(progressBar, forKey: .progressBar)
try container.encodeIfPresent(leftHeadline, forKey: .leftHeadline) try container.encodeIfPresent(leftHeadline, forKey: .leftHeadline)
try container.encodeIfPresent(leftBody, forKey: .leftBody) try container.encodeIfPresent(leftBody, forKey: .leftBody)
try container.encodeIfPresent(leftBody2, forKey: .leftBody2)
try container.encode(bar, forKey: .line) try container.encode(bar, forKey: .line)
try container.encode(rightLabel, forKey: .rightLabel) try container.encode(rightLabel, forKey: .rightLabel)
} }