From c97c3fe7341ff3aa25acb3dbf5d2524711d83d6f Mon Sep 17 00:00:00 2001 From: Prateek Arora Date: Tue, 18 Feb 2020 19:22:17 +0530 Subject: [PATCH] Code changes and cleaning --- .../VerticalCombinationViews/ListRVWheel.swift | 4 ++-- .../VerticalCombinationViews/ListRVWheelModel.swift | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift index 485a5464..47c77ed8 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift @@ -51,12 +51,12 @@ import Foundation wheel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), ]) - let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor) + let rightLabelTrailing = rightLabel.trailingAnchor.constraint(greaterThanOrEqualTo: contentView.trailingAnchor) rightLabelTrailing.priority = UILayoutPriority(900) NSLayoutConstraint.activate([ rightLabelTrailing, rightLabel.leadingAnchor.constraint(equalTo: wheel.trailingAnchor), - rightLabel.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.30), + rightLabel.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.32), rightLabel.topAnchor.constraint(equalTo: contentView.topAnchor), rightLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), ]) diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift index 9b8a95f4..a4c5f028 100644 --- a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift +++ b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift @@ -7,18 +7,8 @@ // import Foundation -public class ListRVWheelModel:ListItemModelProtocol,MoleculeModelProtocol { - +public class ListRVWheelModel:MoleculeModelProtocol { public var backgroundColor: Color? - public var line: LineModel? - public var hideArrow: Bool? - public var horizontalAlignment: UIStackView.Alignment? - public var verticalAlignment: UIStackView.Alignment? - public var useHorizontalMargins: Bool? - public var useVerticalMargins: Bool? - public var topMarginPadding: CGFloat? - public var bottomMarginPadding: CGFloat? - public static var identifier: String = "listRVWheel" public var leftLabel: LabelModel? public var rightLabel: LabelModel?