implemented review feedback
This commit is contained in:
parent
73c59a9d57
commit
b512b0a20e
@ -93,7 +93,6 @@ import UIKit
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -93,7 +93,6 @@ open class Arrow: View {
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -42,7 +42,6 @@ open class DashLine: View {
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -64,7 +64,6 @@
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -14,13 +14,15 @@ import Foundation
|
||||
//--------------------------------------------------
|
||||
public let headlineBody = HeadlineBody(frame: .zero)
|
||||
public let buttons = TwoButtonView(frame: .zero)
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen)
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen)
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -29,7 +31,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen)
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -16,14 +16,16 @@ import Foundation
|
||||
|
||||
public let headlineBody = HeadlineBody()
|
||||
public let buttons = TwoButtonView()
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3)
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3)
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -32,7 +34,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3)
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -13,13 +13,15 @@ import Foundation
|
||||
//--------------------------------------------------
|
||||
public let headlineBody = HeadlineBody()
|
||||
public let caretLink = CaretLink()
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [headlineBody, caretLink])
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, caretLink])
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -28,7 +30,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, caretLink])
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -14,13 +14,15 @@ import Foundation
|
||||
//--------------------------------------------------
|
||||
public let headlineBody = HeadlineBody()
|
||||
public let link = Link()
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [headlineBody, link])
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, link])
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -29,7 +31,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [headlineBody, link])
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -21,25 +21,36 @@ import Foundation
|
||||
public let subBody3 = Label(fontStyle: .RegularMicro)
|
||||
public let verticalLine1 = Line()
|
||||
public let verticalLine2 = Line()
|
||||
public let verticalStack1: Stack<StackModel>
|
||||
public let verticalStack2: Stack<StackModel>
|
||||
public let verticalStack3: Stack<StackModel>
|
||||
public let horizontalStack: Stack<StackModel>
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var verticalStack1: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [body, subBody], spacing: 0)
|
||||
return stack
|
||||
}()
|
||||
public lazy var verticalStack2: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [body2, subBody2], spacing: 0)
|
||||
return stack
|
||||
}()
|
||||
public lazy var verticalStack3: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [body3, subBody3], spacing: 0)
|
||||
return stack
|
||||
}()
|
||||
public lazy var horizontalStack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [(view: verticalStack1, model: StackItemModel(percent: 29, verticalAlignment: .top)),
|
||||
(view: verticalLine1, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack2, model: StackItemModel(horizontalAlignment: .leading, verticalAlignment: .top)),
|
||||
(view: verticalLine2, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack3, model: StackItemModel(percent: 32, verticalAlignment: .top))],
|
||||
axis: .horizontal)
|
||||
return stack
|
||||
}()
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [headline, horizontalStack], spacing: 8)
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
verticalStack1 = Stack<StackModel>.createStack(with: [body, subBody], spacing: 0)
|
||||
verticalStack2 = Stack<StackModel>.createStack(with: [body2, subBody2], spacing: 0)
|
||||
verticalStack3 = Stack<StackModel>.createStack(with: [body3, subBody3], spacing: 0)
|
||||
horizontalStack = Stack<StackModel>.createStack(with: [(view: verticalStack1, model: StackItemModel(percent: 29, verticalAlignment: .top)), (view: verticalLine1, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack2, model: StackItemModel(horizontalAlignment: .leading, verticalAlignment: .top)),
|
||||
(view: verticalLine2, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack3, model: StackItemModel(percent: 32, verticalAlignment: .top))],
|
||||
axis: .horizontal)
|
||||
stack = Stack<StackModel>.createStack(with: [headline, horizontalStack], spacing: 8)
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -48,15 +59,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
verticalStack1 = Stack<StackModel>.createStack(with: [body, subBody], spacing: 0)
|
||||
verticalStack2 = Stack<StackModel>.createStack(with: [body2, subBody2], spacing: 0)
|
||||
verticalStack3 = Stack<StackModel>.createStack(with: [body3, subBody3], spacing: 0)
|
||||
horizontalStack = Stack<StackModel>.createStack(with: [(view: verticalStack1, model: StackItemModel(percent: 29, verticalAlignment: .top)), (view: verticalLine1, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack2, model: StackItemModel(horizontalAlignment: .leading, verticalAlignment: .top)),
|
||||
(view: verticalLine2, model: StackItemModel(verticalAlignment: .top)),
|
||||
(view: verticalStack3, model: StackItemModel(percent: 32, verticalAlignment: .top))],
|
||||
axis: .horizontal)
|
||||
stack = Stack<StackModel>.createStack(with: [headline, horizontalStack], spacing: 8)
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -16,16 +16,18 @@ import Foundation
|
||||
|
||||
public let headlineBody = HeadlineBody()
|
||||
public let button = PillButton()
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)),
|
||||
(view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))],
|
||||
axis: .vertical)
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)),
|
||||
(view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))],
|
||||
axis: .vertical)
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -34,9 +36,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)),
|
||||
(view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))],
|
||||
axis: .vertical)
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -15,15 +15,17 @@ import Foundation
|
||||
public let headline = Label(fontStyle: .Title2XLarge)
|
||||
public let subHeadline = Label(fontStyle: .RegularTitleLarge)
|
||||
public let body = Label(fontStyle: .RegularBodySmall)
|
||||
public let stack: Stack<StackModel>
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel(spacing: 16)),
|
||||
(view: body, model: StackItemModel(spacing: 8))])
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel(spacing: 16)),
|
||||
(view: body, model: StackItemModel(spacing: 8))])
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -32,9 +34,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel(spacing: 16)),
|
||||
(view: body, model: StackItemModel(spacing: 8))])
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -16,20 +16,24 @@ import Foundation
|
||||
public let headline = Label(fontStyle: .BoldTitleLarge)
|
||||
public let subHeadline = Label(fontStyle: .RegularTitleLarge)
|
||||
public let body = Label(fontStyle: .RegularBodySmall)
|
||||
public let verticalStack: Stack<StackModel>
|
||||
public var stack: Stack<StackModel>
|
||||
public lazy var verticalStack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel()),
|
||||
(view: body, model: StackItemModel(horizontalAlignment: .fill))],
|
||||
axis: .vertical, spacing: 0)
|
||||
return stack
|
||||
}()
|
||||
public lazy var stack: Stack<StackModel> = {
|
||||
let stack = Stack<StackModel>.createStack(with: [(view: planLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading)),
|
||||
(view: verticalStack, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))],
|
||||
axis: .horizontal)
|
||||
return stack
|
||||
}()
|
||||
|
||||
//-------------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//-------------------------------------------------------
|
||||
public override init(frame: CGRect) {
|
||||
verticalStack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel()),
|
||||
(view: body, model: StackItemModel(horizontalAlignment: .fill))],
|
||||
axis: .vertical, spacing: 0)
|
||||
stack = Stack<StackModel>.createStack(with: [(view: planLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading)),
|
||||
(view: verticalStack, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))],
|
||||
axis: .horizontal)
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
@ -38,13 +42,6 @@ import Foundation
|
||||
}
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
|
||||
verticalStack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel()),
|
||||
(view: subHeadline, model: StackItemModel()),
|
||||
(view: body, model: StackItemModel(horizontalAlignment: .fill))],
|
||||
axis: .vertical, spacing: 0)
|
||||
stack = Stack<StackModel>.createStack(with: [(view: planLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading)),
|
||||
(view: verticalStack, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))],
|
||||
axis: .horizontal)
|
||||
super.init(model: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -67,7 +67,6 @@ open class DoughnutChart: View {
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@ import UIKit
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,6 @@ import UIKit
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@ import Foundation
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -47,7 +47,6 @@ import UIKit
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -47,7 +47,6 @@ import UIKit
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -38,7 +38,6 @@ open class ThreeHeadlineBodyLink: View {
|
||||
|
||||
required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
@ -115,7 +115,6 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
|
||||
|
||||
public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.init(frame: .zero)
|
||||
initialSetup()
|
||||
set(with: model, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user