From bfa77d70329b4b58e60669322ae27655d7148633 Mon Sep 17 00:00:00 2001 From: "Khan, Arshad" Date: Tue, 20 Oct 2020 00:21:53 +0530 Subject: [PATCH] implemented review feedback --- .../Headers/H1/HeadersH1Button.swift | 3 +-- .../Headers/H2/HeadersH2Buttons.swift | 3 +-- .../Headers/H2/HeadersH2CaretLink.swift | 3 +-- .../Headers/H2/HeadersH2Link.swift | 3 +-- .../Headers/H2/HeadersH2PricingTwoRows.swift | 25 ++++++++----------- .../Headers/H2/HeadersH2TinyButton.swift | 7 +++--- .../LockUps/LockUpsPlanNames.swift | 7 +++--- .../LockUps/LockupsPlanSMLXL.swift | 16 ++++++------ 8 files changed, 27 insertions(+), 40 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift index 74ad3715..3bd34674 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1Button.swift @@ -15,8 +15,7 @@ import Foundation public let headlineBody = HeadlineBody(frame: .zero) public let buttons = TwoButtonView(frame: .zero) public lazy var stack: Stack = { - let stack = Stack.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen) - return stack + return Stack.createStack(with: [headlineBody, buttons], spacing: Padding.Eighteen) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift index 0931fcd9..8604a56b 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Buttons.swift @@ -17,8 +17,7 @@ import Foundation public let headlineBody = HeadlineBody() public let buttons = TwoButtonView() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3) - return stack + return Stack.createStack(with: [headlineBody, buttons], spacing: PaddingDefaultVerticalSpacing3) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift index 14d5c61e..c641ac97 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLink.swift @@ -14,8 +14,7 @@ import Foundation public let headlineBody = HeadlineBody() public let caretLink = CaretLink() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [headlineBody, caretLink]) - return stack + return Stack.createStack(with: [headlineBody, caretLink]) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift index e401876a..e90a51f2 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2Link.swift @@ -15,8 +15,7 @@ import Foundation public let headlineBody = HeadlineBody() public let link = Link() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [headlineBody, link]) - return stack + return Stack.createStack(with: [headlineBody, link]) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRows.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRows.swift index e8d31ded..a6d69e24 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRows.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRows.swift @@ -22,29 +22,24 @@ import Foundation public let verticalLine1 = Line() public let verticalLine2 = Line() public lazy var verticalStack1: Stack = { - let stack = Stack.createStack(with: [body, subBody], spacing: 0) - return stack + return Stack.createStack(with: [body, subBody], spacing: 0) }() public lazy var verticalStack2: Stack = { - let stack = Stack.createStack(with: [body2, subBody2], spacing: 0) - return stack + return Stack.createStack(with: [body2, subBody2], spacing: 0) }() public lazy var verticalStack3: Stack = { - let stack = Stack.createStack(with: [body3, subBody3], spacing: 0) - return stack + return Stack.createStack(with: [body3, subBody3], spacing: 0) }() public lazy var horizontalStack: Stack = { - let stack = Stack.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 + return Stack.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) }() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [headline, horizontalStack], spacing: 8) - return stack + return Stack.createStack(with: [headline, horizontalStack], spacing: 8) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift index 45b37caf..77a44761 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButton.swift @@ -17,10 +17,9 @@ import Foundation public let headlineBody = HeadlineBody() public let button = PillButton() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)), - (view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))], - axis: .vertical) - return stack + return Stack.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .fill)), + (view: button, model: StackItemModel(spacing: spacingBetwenHeadlineBodyAndButton, horizontalAlignment: .leading))], + axis: .vertical) }() //------------------------------------------------------ diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNames.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNames.swift index 3b6e33c3..fd776ebb 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNames.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNames.swift @@ -16,10 +16,9 @@ import Foundation public let subHeadline = Label(fontStyle: .RegularTitleLarge) public let body = Label(fontStyle: .RegularBodySmall) public lazy var stack: Stack = { - let stack = Stack.createStack(with: [(view: headline, model: StackItemModel()), - (view: subHeadline, model: StackItemModel(spacing: 16)), - (view: body, model: StackItemModel(spacing: 8))]) - return stack + return Stack.createStack(with: [(view: headline, model: StackItemModel()), + (view: subHeadline, model: StackItemModel(spacing: 16)), + (view: body, model: StackItemModel(spacing: 8))]) }() //------------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXL.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXL.swift index 53a6288a..c0d4c44f 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXL.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXL.swift @@ -17,17 +17,15 @@ import Foundation public let subHeadline = Label(fontStyle: .RegularTitleLarge) public let body = Label(fontStyle: .RegularBodySmall) public lazy var verticalStack: Stack = { - let stack = Stack.createStack(with: [(view: headline, model: StackItemModel()), - (view: subHeadline, model: StackItemModel()), - (view: body, model: StackItemModel(horizontalAlignment: .fill))], - axis: .vertical, spacing: 0) - return stack + return Stack.createStack(with: [(view: headline, model: StackItemModel()), + (view: subHeadline, model: StackItemModel()), + (view: body, model: StackItemModel(horizontalAlignment: .fill))], + axis: .vertical, spacing: 0) }() public lazy var stack: Stack = { - let stack = Stack.createStack(with: [(view: planLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading)), - (view: verticalStack, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))], - axis: .horizontal) - return stack + return Stack.createStack(with: [(view: planLabel, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading)), + (view: verticalStack, model: StackItemModel(horizontalAlignment: .fill, verticalAlignment: .leading))], + axis: .horizontal) }() //-------------------------------------------------------