From de20e77829fe7d737966750fc75911497359a5c4 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Mon, 12 Oct 2020 22:49:59 +0530 Subject: [PATCH 1/2] MoleculeName fix for MoleculeStackItem Bugfix: Headline body spilling @ traling --- MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift | 2 ++ .../Molecules/VerticalCombinationViews/HeadlineBodyLink.swift | 1 + 2 files changed, 3 insertions(+) diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift index 1f6e4d88..39fef8e2 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift @@ -20,6 +20,7 @@ import Foundation case spacing case percent case gone + case moleculeName } public override init(with moleculeModel: MoleculeModelProtocol) { @@ -39,6 +40,7 @@ import Foundation public override func encode(to encoder: Encoder) throws { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(moleculeName, forKey: .moleculeName) try container.encodeIfPresent(spacing, forKey: .spacing) try container.encodeIfPresent(percent, forKey: .percent) try container.encode(gone, forKey: .gone) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift index da5014a9..a4228ae9 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift @@ -34,6 +34,7 @@ import UIKit headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true + headlineBody.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor).isActive = true var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor) constraint.priority = .defaultHigh constraint.isActive = true From c30c442562d0546c4f11b6f3b343139e9bd24b46 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Tue, 13 Oct 2020 13:08:53 +0530 Subject: [PATCH 2/2] Changed as per MR comments --- .../Molecules/VerticalCombinationViews/HeadlineBodyLink.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift index a4228ae9..1683d8e9 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift @@ -34,7 +34,7 @@ import UIKit headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true - headlineBody.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor).isActive = true + rightAnchor.constraint(greaterThanOrEqualTo: headlineBody.rightAnchor).isActive = true var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor) constraint.priority = .defaultHigh constraint.isActive = true