From 8e284034804d5c1cec56818844cd52a5cde2f316 Mon Sep 17 00:00:00 2001
From: "Khan, Arshad" <arshad.khan@one.verizon.com>
Date: Tue, 21 Jan 2020 23:44:31 +0530
Subject: [PATCH] alignment fixes and progressBar mapping change.

---
 .../HeadLineBodyCaretLinkImage.swift          | 25 +++++++++----------
 .../MVMCoreUIMoleculeMappingObject.m          |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadLineBodyCaretLinkImage.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadLineBodyCaretLinkImage.swift
index 3b52e6bf..d1f0dbf5 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadLineBodyCaretLinkImage.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadLineBodyCaretLinkImage.swift
@@ -13,18 +13,15 @@ import Foundation
     let caretButton = CaretButton(frame: .zero)
     let backgroundImageView = MFLoadImageView()
     var spaceBetweenConstant: CGFloat = 104.0
-    var leftConstraintHeadline : NSLayoutConstraint?
-    var leftConstraintCaretView : NSLayoutConstraint?
-    let padding = MFStyler.defaultHorizontalPaddingForApplicationWidth()
     let maxWidth : CGFloat = 350.0
     // MARK: - MVMCoreViewProtocol
     open override func updateView(_ size: CGFloat) {
-         super.updateView(size)
-         headlineBody.updateView(size)
-         caretButton.updateView(size)
-         backgroundImageView.updateView(size)
-         leftConstraintHeadline?.constant = MFStyler.defaultHorizontalPadding(forSize: size)
-         leftConstraintCaretView?.constant = MFStyler.defaultHorizontalPadding(forSize: size)
+        super.updateView(size)
+        headlineBody.updateView(size)
+        caretButton.updateView(size)
+        backgroundImageView.updateView(size)
+        backgroundImageView.alignFillHorizontal()
+        backgroundImageView.alignFillVertical()
      }
 
     open override func setupView() {
@@ -39,8 +36,7 @@ import Foundation
         view.addSubview(caretButton)
         
         //Headline view
-        leftConstraintHeadline = headlineBody.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: padding)
-        leftConstraintHeadline?.isActive = true
+        headlineBody.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
         headlineBody.topAnchor.constraint(equalTo: view.topAnchor, constant: PaddingDefault).isActive = true
 
         let headLineBodyWidth = headlineBody.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.85)
@@ -50,8 +46,7 @@ import Foundation
         
         //Caret view
         caretButton.translatesAutoresizingMaskIntoConstraints = false
-        leftConstraintCaretView = caretButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: padding)
-        leftConstraintCaretView?.isActive = true
+        caretButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
         view.bottomAnchor.constraint(equalTo: caretButton.bottomAnchor, constant: PaddingDefault).isActive = true
         
         caretButton.topAnchor.constraint(greaterThanOrEqualTo: headlineBody.bottomAnchor, constant: spaceBetweenConstant).isActive = true
@@ -59,6 +54,8 @@ import Foundation
         //Background image view
         backgroundImageView.translatesAutoresizingMaskIntoConstraints = false
         backgroundImageView.imageView.contentMode = .scaleAspectFill
+        backgroundImageView.alignFillHorizontal()
+        backgroundImageView.alignFillVertical()
         view.addSubview(backgroundImageView)
         NSLayoutConstraint.constraintPinSubview(toSuperview: backgroundImageView)
         view.sendSubviewToBack(backgroundImageView)
@@ -88,6 +85,8 @@ import Foundation
         headlineBody.setWithModel(model.headlineBody, delegateObject, additionalData)
         caretButton.setWithModel(model.caretLink, delegateObject, additionalData)
         backgroundImageView.setWithModel(model.image, delegateObject, additionalData)
+        backgroundImageView.alignFillHorizontal()
+        backgroundImageView.alignFillVertical()
     }
 }
 
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index 1e589134..b5a39119 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -45,7 +45,7 @@
                      @"checkbox": Checkbox.class,
                      @"checkboxLabel": CheckboxWithLabelView.class,
                      @"cornerLabels" : CornerLabels.class,
-                     @"progressbar": ProgressBar.class,
+                     @"progressBar": ProgressBar.class,
                      @"circleProgress": GraphView.class,
                      @"multiProgressBar": MultiProgress.class,
                      @"radioButton": RadioButton.class,