Merge branch 'feature/vds_gts_sync_updates' into 'develop'

vds gts sync updates

See merge request BPHV_MIPS/mvm_core_ui!359

MVMCoreUI.xcodeproj/project.pbxproj

@@ -91,6 +91,8 @@
 		0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */; };
 		0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */; };
 		0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */; };
+		0A7ECC5D243CE85300C828E8 /* DoughnutChartItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7ECC5C243CE85300C828E8 /* DoughnutChartItemModel.swift */; };
+		0A7ECC5F243CEB1200C828E8 /* ColorViewWithLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7ECC5E243CEB1200C828E8 /* ColorViewWithLabel.swift */; };
 		0A7EF85B23D8A52800B2AAD1 /* EntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */; };
 		0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */; };
 		0A7EF85F23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */; };
@@ -494,6 +496,8 @@
 		0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
 		0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
 		0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxLabel.swift; sourceTree = "<group>"; };
+		0A7ECC5C243CE85300C828E8 /* DoughnutChartItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoughnutChartItemModel.swift; sourceTree = "<group>"; };
+		0A7ECC5E243CEB1200C828E8 /* ColorViewWithLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewWithLabel.swift; sourceTree = "<group>"; };
 		0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MdnEntryFieldModel.swift; sourceTree = "<group>"; };
@@ -1358,9 +1362,11 @@
 		D260105723CF9CC500764D80 /* Doughnut */ = {
 			isa = PBXGroup;
 			children = (
+				0A7ECC5C243CE85300C828E8 /* DoughnutChartItemModel.swift */,
 				C695A69323C9909000BFB94E /* DoughnutChartModel.swift */,
 				C695A69523C990BC00BFB94E /* DoughnutChart.swift */,
 				C695A69723C990C200BFB94E /* DoughnutChartView.swift */,
+				0A7ECC5E243CEB1200C828E8 /* ColorViewWithLabel.swift */,
 			);
 			path = Doughnut;
 			sourceTree = "<group>";
@@ -2088,6 +2094,7 @@
 				D268C70C2386DFFD007F2C1C /* MoleculeStackItemModel.swift in Sources */,
 				DBEFFA04225A829700230692 /* Label.swift in Sources */,
 				D2D6CD4022E78C1A00D701B8 /* Scroller.swift in Sources */,
+				0A7ECC5D243CE85300C828E8 /* DoughnutChartItemModel.swift in Sources */,
 				0A7EF85F23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift in Sources */,
 				011D959B240451E3000E3791 /* RuleRequiredModel.swift in Sources */,
 				526A265C240D1FF700B0D828 /* ListTwoColumnCompareChangesModel.swift in Sources */,
@@ -2195,6 +2202,7 @@
 				C695A67F23C9830600BFB94E /* UnOrderedListModel.swift in Sources */,
 				0AE98BB523FF18D2004C5109 /* Arrow.swift in Sources */,
 				D2D90B442404789000DD6EC9 /* MoleculeContainerProtocol.swift in Sources */,
+				0A7ECC5F243CEB1200C828E8 /* ColorViewWithLabel.swift in Sources */,
 				94C0150A24215643005811A9 /* ActionTopAlertModel.swift in Sources */,
 				012A88DB238ED45900FE3DA1 /* CarouselModel.swift in Sources */,
 				D29DF28C21E7AC2B003B2FB9 /* ViewConstrainingView.m in Sources */,

MVMCoreUI/Atomic/Atoms/Buttons/CaretLink.swift

@@ -25,11 +25,11 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
     @objc public var rightViewHeight: NSNumber?
     @objc public var rightViewWidth: NSNumber?
     
-    @objc public var enabledColor: UIColor = .black {
+    @objc public var enabledColor: UIColor = .mvmBlack {
         didSet { changeCaretColor() }
     }
     
-    @objc public var disabledColor: UIColor = .mfSilver() {
+    @objc public var disabledColor: UIColor = .mvmCoolGray3 {
         didSet { changeCaretColor() }
     }
     
@@ -103,8 +103,7 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
         let width = CGFloat(rightViewWidth?.floatValue ?? CARET_VIEW_WIDTH)
         let height = CGFloat(rightViewHeight?.floatValue ?? CARET_VIEW_HEIGHT)
         
-        let edgeInsets: UIEdgeInsets = contentEdgeInsets
+        contentEdgeInsets.right = 4 + width
-        contentEdgeInsets = UIEdgeInsets(top: edgeInsets.top, left: edgeInsets.left, bottom: edgeInsets.bottom, right: 4 + width)
         
         let caretView: UIView = rightView ?? createCaretView()
         rightView = caretView
@@ -114,12 +113,12 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
         caretView.widthAnchor.constraint(equalToConstant: width).isActive = true
         caretView.heightAnchor.constraint(equalToConstant: height).isActive = true
         
-        let caretLabelSpacing = NSLayoutConstraint(item: caretView, attribute: .left, relatedBy: .equal, toItem: titleLabel, attribute: .right, multiplier: 1.0, constant: 4)
+        let caretLabelSpacing = NSLayoutConstraint(item: caretView, attribute: .left, relatedBy: .equal, toItem: titleLabel, attribute: .right, multiplier: 1.0, constant: 7)
         caretLabelSpacing.isActive = true
         caretSpacingConstraint = caretLabelSpacing
         
-        NSLayoutConstraint(item: caretView, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1.0, constant: 0).isActive = true
+        caretView.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
-        NSLayoutConstraint(item: self, attribute: .right, relatedBy: .greaterThanOrEqual, toItem: caretView, attribute: .right, multiplier: 1.0, constant: 0).isActive = true
+        trailingAnchor.constraint(greaterThanOrEqualTo: caretView.trailingAnchor).isActive = true
         caretView.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
         bottomAnchor.constraint(greaterThanOrEqualTo: caretView.bottomAnchor).isActive = true
         contentHorizontalAlignment = .left
@@ -137,17 +136,21 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
     // MARK: - Atomization
     //------------------------------------------------------
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        guard let caretLinkModel = model as? CaretLinkModel else { return }
+        
-        if let color = caretLinkModel.backgroundColor {
+        guard let model = model as? CaretLinkModel else { return }
+        
+        if let color = model.backgroundColor {
             backgroundColor = color.uiColor
         }
-        enabledColor = caretLinkModel.enabledColor.uiColor
+        
-        if let color = caretLinkModel.disabledColor {
+        enabledColor = model.enabledColor.uiColor
+        if let color = model.disabledColor {
             disabledColor = color.uiColor
         }
-        isEnabled = caretLinkModel.enabled
+        
-        set(with: caretLinkModel.action, delegateObject: delegateObject, additionalData: additionalData)
+        isEnabled = model.enabled
-        setTitle(caretLinkModel.title, for: .normal)
+        set(with: model.action, delegateObject: delegateObject, additionalData: additionalData)
+        setTitle(model.title, for: .normal)
     }
     
     public func needsToBeConstrained() -> Bool {

MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+
 @objcMembers open class RadioButton: Control {
     //--------------------------------------------------
     // MARK: - Properties
@@ -19,8 +20,8 @@ import UIKit
         }
     }
     
-    public var enabledColor: UIColor = .black
+    public var enabledColor: UIColor = .mvmBlack
-    public var disabledColor: UIColor = .mfSilver()
+    public var disabledColor: UIColor = .mvmCoolGray6
     public var delegateObject: MVMCoreUIDelegateObject?
     
     public var radioModel: RadioButtonModel? {
@@ -108,7 +109,7 @@ import UIKit
     open override func setupView() {
         super.setupView()
         
-        backgroundColor = .white
+        backgroundColor = .mvmWhite
         clipsToBounds = true
         widthConstraint = widthAnchor.constraint(equalToConstant: 30)
         widthConstraint?.isActive = true
@@ -132,7 +133,7 @@ import UIKit
     }
     
     public override func reset() {
-          super.reset()
+        super.reset()
-          backgroundColor = .white
+        backgroundColor = .white
     }
 }

MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift

@@ -7,24 +7,36 @@
 //
 
 import Foundation
-import UIKit
+
 
 @objcMembers public class RadioButtonSelectionHelper: FormFieldProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var fieldKey: String?
     public var groupName: String = FormValidator.defaultGroupName
     private var selectedRadioButton: RadioButton?
     private var fieldGroupName: String?
     public var baseValue: AnyHashable?
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     init(_ fieldKey: String?) {
         self.fieldKey = fieldKey
     }
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton, delegateObject: MVMCoreUIDelegateObject?) {
+        
         guard let groupName = radioButtonModel.fieldKey,
-            let formValidator = delegateObject?.formHolderDelegate?.formValidator else {
+            let formValidator = delegateObject?.formHolderDelegate?.formValidator
-            return
+            else { return }
-        }
         
         let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper(radioButtonModel.fieldKey)        
         radioButtonSelectionHelper.fieldGroupName = radioButtonModel.fieldKey
@@ -37,6 +49,7 @@ import UIKit
     }
     
     public func selected(_ radioButton: RadioButton) {
+        
         selectedRadioButton?.isSelected = false
         selectedRadioButton = radioButton
         selectedRadioButton?.isSelected = true
@@ -45,8 +58,9 @@ import UIKit
 
 // MARK: - FormValidationFormFieldProtocol
 extension RadioButtonSelectionHelper {
+    
     public func formFieldGroupName() -> String? {
-        return selectedRadioButton?.formFieldGroupName() ?? self.fieldGroupName
+        return selectedRadioButton?.formFieldGroupName() ?? fieldGroupName
     }
     
     public func formFieldValue() -> AnyHashable? {

MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift

@@ -116,7 +116,7 @@ import UIKit
             for (index, field) in digitBoxes.enumerated() {
                 if index < newValue.count {
                     let indexChar = newValue.index(newValue.startIndex, offsetBy: index)
-                    field.digitField.attributedPlaceholder = NSAttributedString(string: String(newValue[indexChar]), attributes: [NSAttributedString.Key.foregroundColor: UIColor.mfBattleshipGrey()])
+                    field.digitField.attributedPlaceholder = NSAttributedString(string: String(newValue[indexChar]), attributes: [NSAttributedString.Key.foregroundColor: UIColor.mvmCoolGray6])
                 }
             }
             

MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift

@@ -20,8 +20,8 @@ import UIKit
     
     public private(set) var titleLabel: Label = {
         let label = Label()
-        label.font = MFStyler.fontB3()
+        label.font = MFStyler.fontRegularMicro()
-        label.textColor = .mvmCoolGray6
+        label.textColor = .mvmBlack
         label.setContentCompressionResistancePriority(.required, for: .vertical)
         return label
     }()
@@ -31,7 +31,7 @@ import UIKit
     /// Provides contextual information on the TextField.
     public private(set) var feedbackLabel: Label = {
         let label = Label()
-        label.font = MFStyler.fontForTextFieldUnderLabel()
+        label.font = MFStyler.fontRegularMicro()
         label.textColor = .mvmBlack
         label.setContentCompressionResistancePriority(.required, for: .vertical)
         return label
@@ -65,7 +65,8 @@ import UIKit
     public var isEnabled: Bool {
         get { return entryFieldContainer.isEnabled }
         set (enabled) {
-            self.feedbackLabel.textColor = enabled ? .black : .mfSilver()
+            self.titleLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3
+            self.feedbackLabel.textColor = enabled ? .mvmBlack : .mvmCoolGray3
             self.entryFieldContainer.isEnabled = enabled
         }
     }
@@ -233,15 +234,16 @@ import UIKit
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
+    
     @objc open override func reset() {
         super.reset()
         
         backgroundColor = .clear
         isAccessibilityElement = false
-        titleLabel.font = MFStyler.fontB3()
+        titleLabel.font = MFStyler.fontRegularMicro()
-        titleLabel.textColor = .mfBattleshipGrey()
+        titleLabel.textColor = .mvmBlack
-        feedbackLabel.font = MFStyler.fontForTextFieldUnderLabel()
+        feedbackLabel.font = MFStyler.fontRegularMicro()
-        feedbackLabel.textColor = .black
+        feedbackLabel.textColor = .mvmBlack
         entryFieldContainer.reset()
     }
     

MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift

@@ -28,7 +28,8 @@ import UIKit
         let textField = TextField()
         textField.isAccessibilityElement = true
         textField.setContentCompressionResistancePriority(.required, for: .vertical)
-        textField.font = MFStyler.fontForTextField()
+        textField.font = MFStyler.fontRegularBodyLarge()
+        textField.textColor = .mvmBlack
         textField.smartQuotesType = .no
         textField.smartDashesType = .no
         textField.smartInsertDeleteType = .no
@@ -40,7 +41,7 @@ import UIKit
     //--------------------------------------------------
     
     /// Set enabled and disabled colors to be utilized when setting this texfield's isEnabled property.
-    public var textColor: (enabled: UIColor?, disabled: UIColor?) = (.black, .mfSilver())
+    public var textColor: (enabled: UIColor?, disabled: UIColor?) = (.mvmBlack, .mvmCoolGray3)
     
     private var observingForChange: Bool = false
     
@@ -168,7 +169,7 @@ import UIKit
     
     @objc open override func setupFieldContainerContent(_ container: UIView) {
         
-        MFStyler.styleTextField(textField)
+        textField.font = MFStyler.fontRegularBodyLarge()
         container.addSubview(textField)
         
         NSLayoutConstraint.activate([
@@ -193,14 +194,14 @@ import UIKit
     @objc open override func updateView(_ size: CGFloat) {
         super.updateView(size)
         
-        MFStyler.styleTextField(textField)
+        textField.font = MFStyler.fontRegularBodyLarge()
         layoutIfNeeded()
     }
     
     open override func reset() {
         super.reset()
         
-        textField.font = MFStyler.fontForTextField()
+        textField.font = MFStyler.fontRegularBodyLarge()
     }
     
     @objc deinit {
@@ -252,6 +253,7 @@ import UIKit
             observingTextFieldDelegate?.isValid?(textfield: self)
         }
     }
+    
     /// Executes on UITextField.textDidBeginEditingNotification
     @objc func startEditing() {
         isSelected = true
@@ -270,7 +272,7 @@ import UIKit
         resignFirstResponder()
         if isValid {
             showError = false
-            entryFieldContainer.bottomBar?.backgroundColor = UIColor.black.cgColor
+            entryFieldContainer.bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
         }
     }
     
@@ -278,6 +280,10 @@ import UIKit
         resignFirstResponder()
     }
     
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         

MVMCoreUI/Atomic/Atoms/Views/Toggle.swift

@@ -25,13 +25,13 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     //--------------------------------------------------
     
     /// Holds the on and off colors for the container.
-    public var containerTintColor: (on: UIColor?, off: UIColor?)? = (on: .mvmGreen, off: .black)
+    public var containerTintColor: (on: UIColor?, off: UIColor?)? = (on: .mvmGreen, off: .mvmBlack)
     
     /// Holds the on and off colors for the knob.
-    public var knobTintColor: (on: UIColor?, off: UIColor?)? = (on: .white, off: .white)
+    public var knobTintColor: (on: UIColor?, off: UIColor?)? = (on: .mvmWhite, off: .mvmWhite)
     
     /// Holds the on and off colors for the disabled state..
-    public var disabledTintColor: (container: UIColor?, knob: UIColor?)? = (container: .mvmCoolGray3, knob: .white)
+    public var disabledTintColor: (container: UIColor?, knob: UIColor?)? = (container: .mvmCoolGray3, knob: .mvmWhite)
     
     /// Set this flag to false if you do not want to animate state changes.
     public var isAnimated = true

MVMCoreUI/Atomic/Molecules/Doughnut/ColorViewWithLabel.swift

@@ -0,0 +1,73 @@
+//
+//  ColorViewWithLabel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 4/7/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+
+open class ColorViewWithLabel: View {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public var label = Label.createLabelRegularBodySmall(true)
+    public var colorView = View()
+    private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: 8)!
+    
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
+    public var heightConstraint: NSLayoutConstraint?
+    
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
+    open override func setupView() {
+        super.setupView()
+        
+        addSubview(colorView)
+        addSubview(label)
+        
+        heightConstraint = colorView.heightAnchor.constraint(equalToConstant: sizeObject.getValueBasedOnApplicationWidth())
+        heightConstraint?.isActive = true
+        colorView.widthAnchor.constraint(equalTo: colorView.heightAnchor).isActive = true
+        colorView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
+        colorView.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        
+        label.leadingAnchor.constraint(equalTo: colorView.trailingAnchor, constant: PaddingOne).isActive = true
+        label.topAnchor.constraint(equalTo: topAnchor).isActive = true
+        trailingAnchor.constraint(equalTo: label.trailingAnchor).isActive = true
+        bottomAnchor.constraint(equalTo: label.bottomAnchor).isActive = true
+    }
+    
+    open override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        label.updateView(size)
+        heightConstraint?.constant = sizeObject.getValueBased(onSize: size)
+        setNeedsDisplay()
+    }
+    
+    open override func reset() {
+        super.reset()
+        label.reset()
+    }
+    
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        
+        guard let chartItemModel = model as? DoughnutChartItemModel else { return }
+        
+        label.set(with: chartItemModel.label, delegateObject, additionalData)
+        colorView.backgroundColor = chartItemModel.color.uiColor
+    }
+}

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChart.swift

@@ -8,23 +8,38 @@
 
 import UIKit
 
-open class DoughnutChart: View {
-     var doughnutLayer = CALayer()
-     var titleLabel = Label.commonLabelH3(true)
-     var subTitleLabel = Label.commonLabelB2(true)
-     var doughnutChartModel: DoughnutChartModel? {
-        get { return model as? DoughnutChartModel }
-     }
-     var labelContainer = MVMCoreUICommonViewsUtility.commonView()
-     var labelContainerLeftConstraint: NSLayoutConstraint?
-     var labelContainerTopConstraint: NSLayoutConstraint?
-     var labelContainerBottomConstraint: NSLayoutConstraint?
-     var labelContainerRightConstraint: NSLayoutConstraint?
-     var heightConstraint: NSLayoutConstraint?
 
-     static let heightConstant: CGFloat = 150
+open class DoughnutChart: View {
-     private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: heightConstant)!
+    //--------------------------------------------------
-     var height: CGFloat = heightConstant {
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public var doughnutLayer = CALayer()
+    public var titleLabel = Label.createLabelBoldTitleLarge(true)
+    public var subTitleLabel = Label.createLabelRegularMicro(true)
+    public var labelContainer = MVMCoreUICommonViewsUtility.commonView()
+    public static let heightConstant: CGFloat = 136
+    private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: heightConstant)!
+    
+    //--------------------------------------------------
+    // MARK: - Constraints
+    //--------------------------------------------------
+    
+    public var labelContainerLeftConstraint: NSLayoutConstraint?
+    public var labelContainerTopConstraint: NSLayoutConstraint?
+    public var labelContainerBottomConstraint: NSLayoutConstraint?
+    public var labelContainerRightConstraint: NSLayoutConstraint?
+    public var heightConstraint: NSLayoutConstraint?
+    
+    //--------------------------------------------------
+    // MARK: - Computed Properties
+    //--------------------------------------------------
+    
+    public var doughnutChartModel: DoughnutChartModel? {
+        get { return model as? DoughnutChartModel }
+    }
+    
+    public var height: CGFloat = heightConstant {
         didSet {
             if height != oldValue {
                 sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: height)!
@@ -32,69 +47,89 @@ open class DoughnutChart: View {
                 drawGraph()
             }
         }
-     }
-      
-     open override func updateView(_ size: CGFloat) {
-         super.updateView(size)
-         titleLabel.updateView(size)
-         subTitleLabel.updateView(size)
-         updateContainer()
-         drawGraph()
-     }
-     
-     open override func reset() {
-         super.reset()
-         titleLabel.reset()
-         subTitleLabel.reset()
-         clearLayers()
-     }
-     
-     open override func setupView() {
-         super.setupView()
-         guard labelContainer.superview == nil else {
-             return
-         }
-         addSubview(labelContainer)
-         
-         labelContainer.addSubview(titleLabel)
-         labelContainer.addSubview(subTitleLabel)
-         titleLabel.textAlignment = .center
-         subTitleLabel.textAlignment = .center
-        
-         //Make label font size to adjust width if label content is high
-         titleLabel.numberOfLines = 1
-         titleLabel.adjustsFontSizeToFitWidth = true
-
-         layer.addSublayer(doughnutLayer)
-         heightConstraint = heightAnchor.constraint(equalToConstant:
-            sizeObject.getValueBasedOnApplicationWidth())
-         heightConstraint?.isActive = true
-         widthAnchor.constraint(equalTo: heightAnchor).isActive = true
-         
-         labelContainerLeftConstraint = labelContainer.leftAnchor.constraint(greaterThanOrEqualTo: leftAnchor, constant: lineWidth())
-         labelContainerLeftConstraint?.isActive = true
-         labelContainerTopConstraint = labelContainer.topAnchor.constraint(greaterThanOrEqualTo: topAnchor, constant: lineWidth())
-         labelContainerTopConstraint?.isActive = true
-         labelContainerRightConstraint = rightAnchor.constraint(greaterThanOrEqualTo: labelContainer.rightAnchor, constant: lineWidth())
-         labelContainerRightConstraint?.isActive = true
-         labelContainerBottomConstraint = bottomAnchor.constraint(greaterThanOrEqualTo: labelContainer.bottomAnchor, constant: lineWidth())
-         labelContainerBottomConstraint?.isActive = true
-         labelContainer.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
-         labelContainer.centerXAnchor.constraint(equalTo: centerXAnchor).isActive = true
-         
-         NSLayoutConstraint.constraintPinSubview(titleLabel, pinTop: true, pinBottom: false, pinLeft: true, pinRight: true)
-         NSLayoutConstraint.constraintPinSubview(subTitleLabel, pinTop: false, pinBottom: true, pinLeft: true, pinRight: true)
-         _ = NSLayoutConstraint(pinFirstView: titleLabel, toSecondView: subTitleLabel, withConstant: 0, directionVertical: true)
-         //Rotate view for initial draw
-         doughnutLayer.transform = CATransform3DMakeRotation(1 * .pi, 0.0, 0.0, 1.0)
     }
     
-    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    public override init(frame: CGRect) {
+        super.init(frame: .zero)
+    }
+    
+    public convenience init() {
+        self.init(frame: .zero)
+    }
+    
+    public required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
+    open override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        titleLabel.updateView(size)
+        subTitleLabel.updateView(size)
+        updateContainer()
+        drawGraph()
+    }
+    
+    open override func reset() {
+        super.reset()
+        titleLabel.reset()
+        subTitleLabel.reset()
+        clearLayers()
+    }
+    
+    open override func setupView() {
+        super.setupView()
+        
+        addSubview(labelContainer)
+        
+        labelContainer.addSubview(titleLabel)
+        labelContainer.addSubview(subTitleLabel)
+        titleLabel.textAlignment = .center
+        subTitleLabel.textAlignment = .center
+        
+        //Make label font size to adjust width if label content is high
+        titleLabel.numberOfLines = 1
+        titleLabel.adjustsFontSizeToFitWidth = true
+        
+        layer.addSublayer(doughnutLayer)
+        heightConstraint = heightAnchor.constraint(equalToConstant: sizeObject.getValueBasedOnApplicationWidth())
+        heightConstraint?.isActive = true
+        widthAnchor.constraint(equalTo: heightAnchor).isActive = true
+        
+        labelContainerLeftConstraint = labelContainer.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor, constant: lineWidth())
+        labelContainerLeftConstraint?.isActive = true
+        labelContainerTopConstraint = labelContainer.topAnchor.constraint(greaterThanOrEqualTo: topAnchor, constant: lineWidth())
+        labelContainerTopConstraint?.isActive = true
+        labelContainerRightConstraint = trailingAnchor.constraint(greaterThanOrEqualTo: labelContainer.trailingAnchor, constant: lineWidth())
+        labelContainerRightConstraint?.isActive = true
+        labelContainerBottomConstraint = bottomAnchor.constraint(greaterThanOrEqualTo: labelContainer.bottomAnchor, constant: lineWidth())
+        labelContainerBottomConstraint?.isActive = true
+        labelContainer.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        labelContainer.centerXAnchor.constraint(equalTo: centerXAnchor).isActive = true
+        
+        NSLayoutConstraint.constraintPinSubview(titleLabel, pinTop: true, pinBottom: false, pinLeft: true, pinRight: true)
+        NSLayoutConstraint.constraintPinSubview(subTitleLabel, pinTop: false, pinBottom: true, pinLeft: true, pinRight: true)
+        _ = NSLayoutConstraint(pinFirstView: titleLabel, toSecondView: subTitleLabel, withConstant: 0, directionVertical: true)
+        //Rotate view for initial draw
+        doughnutLayer.transform = CATransform3DMakeRotation(1 * .pi, 0, 0, 1)
+    }
+    
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         clearLayers()
-        guard let doughnutChartModel = doughnutChartModel else {
+        guard let doughnutChartModel = doughnutChartModel else { return }
-            return
+        
-        }
         titleLabel.setOptional(with: doughnutChartModel.title, delegateObject, additionalData)
         subTitleLabel.setOptional(with: doughnutChartModel.subtitle, delegateObject, additionalData)
         titleLabel.textAlignment = .center
@@ -103,78 +138,83 @@ open class DoughnutChart: View {
         drawGraph()
     }
     
-    func drawGraph() {
+    //--------------------------------------------------
-         clearLayers()
+    // MARK: - Draw Graph
-         let widthHeight = sizeObject.getValueBasedOnApplicationWidth()
+    //--------------------------------------------------
-         doughnutLayer.frame = CGRect(x: 0, y: 0,
+    
-                                       width: widthHeight,
+    private func drawGraph() {
-                                       height: widthHeight)
+        clearLayers()
-         if let doughnutChart = doughnutChartModel {
+        let widthHeight = sizeObject.getValueBasedOnApplicationWidth()
-             var prevPercent: CGFloat = 0.0
+        doughnutLayer.frame = CGRect(x: 0, y: 0, width: widthHeight, height: widthHeight)
-             for model in doughnutChart.sections {
+        
+        if let doughnutChart = doughnutChartModel {
+            var prevPercent: CGFloat = 0.0
+            for model in doughnutChart.sections {
                 prevPercent += drawBar(model, prevPercent)
-             }
+            }
-         }
+        }
-      }
+    }
     
-    func drawBar(_ chartModel: DoughnutChartItemModel, _ prevPercent: CGFloat) -> CGFloat {
+    private func drawBar(_ chartModel: DoughnutChartItemModel, _ prevPercent: CGFloat) -> CGFloat {
         
-         let shapeLayer = CAShapeLayer()
+        let shapeLayer = CAShapeLayer()
-         shapeLayer.frame = doughnutLayer.frame
+        shapeLayer.frame = doughnutLayer.frame
-         shapeLayer.lineWidth = lineWidth()
+        shapeLayer.lineWidth = lineWidth()
-         shapeLayer.fillColor = nil
+        shapeLayer.fillColor = nil
-         shapeLayer.strokeColor = chartModel.color.uiColor.cgColor
+        shapeLayer.strokeColor = chartModel.color.uiColor.cgColor
         
-         let arcCenter = shapeLayer.position
+        let arcCenter = shapeLayer.position
-         let radius = shapeLayer.bounds.size.width / 2.0 - lineWidth()/2.0
+        let radius = shapeLayer.bounds.size.width / 2.0 - lineWidth() / 2.0
         
-         let value: CGFloat = chartModel.percent
+        let value: CGFloat = chartModel.percent
-         let gap: CGFloat = spaceRequired() ? lineGap() : 0.0
+        let gap: CGFloat = spaceRequired() ? lineGap() : 0.0
-         let startAngle =  ((prevPercent / 100.0) * 2 * .pi) - (0.5 * .pi)
+        let startAngle =  ((prevPercent / 100.0) * 2 * .pi) - (0.5 * .pi)
-         let endAngle = ((value / 100.0) * 2 * .pi) + startAngle - gap
+        let endAngle = ((value / 100.0) * 2 * .pi) + startAngle - gap
-         let circlePath = UIBezierPath(arcCenter: arcCenter,
+        let circlePath = UIBezierPath(arcCenter: arcCenter,
-                                       radius: radius,
+                                      radius: radius,
-                                       startAngle: startAngle,
+                                      startAngle: startAngle,
-                                       endAngle: endAngle,
+                                      endAngle: endAngle,
-                                       clockwise: true)
+                                      clockwise: true)
         
-         shapeLayer.path = circlePath.cgPath
+        shapeLayer.path = circlePath.cgPath
-         doughnutLayer.addSublayer(shapeLayer)
+        doughnutLayer.addSublayer(shapeLayer)
-         return value
+        return value
-     }
+    }
     
-     func clearLayers() {
+    private func clearLayers() {
-         doughnutLayer.sublayers?.forEach({ $0.removeFromSuperlayer() })
+        doughnutLayer.sublayers?.forEach{ $0.removeFromSuperlayer() }
-     }
+    }
     
-     func updateContainer() {
+    public func updateContainer() {
-         heightConstraint?.constant = sizeObject.getValueBasedOnApplicationWidth()
-         updateLabelContainer()
-         setNeedsDisplay()
-     }
         
-     func lineWidth() -> CGFloat {
+        heightConstraint?.constant = sizeObject.getValueBasedOnApplicationWidth()
-        return 30
+        updateLabelContainer()
-     }
+        setNeedsDisplay()
+    }
     
-     func lineGap() -> CGFloat {
+    public func lineWidth() -> CGFloat {
+        return 12
+    }
+    
+    public func lineGap() -> CGFloat {
         //If array is having the single item then no space required
         return doughnutChartModel?.sections.count == 1 ? 0.0 : 0.05
-     }
+    }
     
-     func spaceRequired() -> Bool {
+    public func spaceRequired() -> Bool {
         return doughnutChartModel?.spaceRequired ?? true
-     }
+    }
+    
+    public func updateLabelContainer() {
         
-    func updateLabelContainer() {
         labelContainer.setNeedsDisplay()
         labelContainer.layoutIfNeeded()
-        let radius = sizeObject.getValueBasedOnApplicationWidth()/2 - lineWidth()
+        let radius = sizeObject.getValueBasedOnApplicationWidth() / 2 - lineWidth()
-        let labelheight = labelContainer.frame.height/2
+        let labelheight = labelContainer.frame.height / 2
-        let padding = sizeObject.getValueBasedOnApplicationWidth()/2 - sqrt(max(0, pow(radius, 2) - pow(labelheight, 2)))
+        let padding = sizeObject.getValueBasedOnApplicationWidth() / 2 - sqrt(max(0, pow(radius, 2) - pow(labelheight, 2)))
         
-        labelContainerLeftConstraint?.constant = padding
+        labelContainerLeftConstraint?.constant = round(padding)
-        labelContainerRightConstraint?.constant = padding
+        labelContainerRightConstraint?.constant = round(padding)
         labelContainerTopConstraint?.constant = max(radius - labelheight, labelheight)
         labelContainerBottomConstraint?.constant = max(radius - labelheight, labelheight)
     }

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift

@@ -0,0 +1,44 @@
+//
+//  DoughnutChartItemModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 4/7/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+
+@objcMembers public class DoughnutChartItemModel: MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public var backgroundColor: Color?
+    public static var identifier: String = "doughnutChartItem"
+    public var moleculeName: String = DoughnutChartItemModel.identifier
+    public var label: LabelModel
+    @Percent public var percent: CGFloat
+    public var color: Color
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case backgroundColor
+        case label
+        case percent
+        case color
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
+    public init(percent: CGFloat, color: Color, label: LabelModel) {
+        self.percent = percent
+        self.color = color
+        self.label = label
+    }
+}

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift

@@ -8,7 +8,12 @@
 
 import Foundation
 
+
 @objcMembers public class DoughnutChartModel: MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var backgroundColor: Color?
     public static var identifier: String = "doughnutChart"
     public var moleculeName: String = DoughnutChartModel.identifier
@@ -17,22 +22,11 @@ import Foundation
     public var sections: [DoughnutChartItemModel]
     public var spaceRequired: Bool?
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(sections: [DoughnutChartItemModel]) {
         self.sections = sections
     }
 }
-
-@objcMembers public class DoughnutChartItemModel: MoleculeModelProtocol {
-    public var backgroundColor: Color?
-    public static var identifier: String = "doughnutChartItem"
-    public var moleculeName: String = DoughnutChartItemModel.identifier
-    public var label: LabelModel
-    @Percent public var percent: CGFloat
-    public var color: Color
-    
-    public init(percent: CGFloat, color: Color, label: LabelModel) {
-        self.percent = percent
-        self.color = color
-        self.label = label
-    }
-}

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartView.swift

@@ -8,46 +8,52 @@
 
 import Foundation
 
+
 @objcMembers open class DoughnutChartView: View {
-    var doughnutChart = DoughnutChart(frame: CGRect.zero)
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public var doughnutChart = DoughnutChart()
     var colorLablesStack = ColorViewLabelsStack()
-    var doughnutChartModel: DoughnutChartModel? {
+    
-       get { return model as? DoughnutChartModel }
+    public var doughnutChartModel: DoughnutChartModel? {
+        get { return model as? DoughnutChartModel }
     }
     
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
     open override func setupView() {
         super.setupView()
-        guard doughnutChart.superview == nil else {
+        
-            return
-        }
-        doughnutChart.translatesAutoresizingMaskIntoConstraints = false
         addSubview(doughnutChart)
-        colorLablesStack.translatesAutoresizingMaskIntoConstraints = false
         addSubview(colorLablesStack)
         
         doughnutChart.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
-        doughnutChart.topAnchor.constraint(equalTo: topAnchor).isActive = true
+        doughnutChart.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
+        
         bottomAnchor.constraint(greaterThanOrEqualTo: doughnutChart.bottomAnchor).isActive = true
         
         let doughnutBottomAnchor = bottomAnchor.constraint(equalTo: doughnutChart.bottomAnchor)
         doughnutBottomAnchor.priority = UILayoutPriority(rawValue: 200)
         doughnutBottomAnchor.isActive = true
         
+        bottomAnchor.constraint(greaterThanOrEqualTo: colorLablesStack.bottomAnchor).isActive = true
+        
         let colorLablesBottomAnchor = bottomAnchor.constraint(equalTo: colorLablesStack.bottomAnchor)
         colorLablesBottomAnchor.priority = UILayoutPriority(rawValue: 204)
         colorLablesBottomAnchor.isActive = true
         
-        let colorLablesTopAnchor = colorLablesStack.topAnchor.constraint(equalTo: doughnutChart.topAnchor)
+        colorLablesStack.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
+        
+        let colorLablesTopAnchor = colorLablesStack.topAnchor.constraint(equalTo: topAnchor)
         colorLablesTopAnchor.priority = .defaultLow
         colorLablesTopAnchor.isActive = true
         
-        colorLablesStack.topAnchor.constraint(greaterThanOrEqualTo: doughnutChart.topAnchor).isActive = true
-        bottomAnchor.constraint(greaterThanOrEqualTo: colorLablesStack.bottomAnchor).isActive = true
         trailingAnchor.constraint(equalTo: colorLablesStack.trailingAnchor).isActive = true
-        
+        doughnutChart.centerYAnchor.constraint(equalTo: colorLablesStack.centerYAnchor).isActive = true
-        let centerY = colorLablesStack.centerYAnchor.constraint(equalTo: doughnutChart.centerYAnchor)
-        centerY.priority = UILayoutPriority(rawValue: 500)
-        centerY.isActive = true
 
         colorLablesStack.leadingAnchor.constraint(equalTo: doughnutChart.trailingAnchor, constant: PaddingThree).isActive = true
         colorLablesStack.backgroundColor = .clear
@@ -65,7 +71,11 @@ import Foundation
         colorLablesStack.reset()
     }
     
-    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         
         guard let model = doughnutChartModel else { return }
@@ -82,14 +92,17 @@ import Foundation
     }
 }
 
+// MARK: - MVMCoreUIViewConstrainingProtocol
 extension DoughnutChartView: MVMCoreUIViewConstrainingProtocol {
+    
     open func horizontalAlignment() -> UIStackView.Alignment {
         return .leading
     }
 }
 
 class ColorViewLabelsStack: MoleculeStackView {
-    override func createStackItemsFromModel(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+    
+    override func createStackItemsFromModel(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let stackItemModels = stackModel?.molecules else { return }
         for model in stackItemModels {
             let view = ColorViewWithLabel()
@@ -99,53 +112,3 @@ class ColorViewLabelsStack: MoleculeStackView {
         }
     }
 }
-
-class ColorViewWithLabel: View {
-    
-    var label = Label.commonLabelB2(true)
-    var colorView = MVMCoreUICommonViewsUtility.commonView()
-    private var sizeObject = MFStyler.sizeObjectGeneric(forCurrentDevice: 8)!
-    var heightConstraint: NSLayoutConstraint?
-    
-    override func setupView() {
-        super.setupView()
-        guard colorView.superview == nil else {
-            return
-        }
-        translatesAutoresizingMaskIntoConstraints = false
-        addSubview(colorView)
-        addSubview(label)
-        
-        heightConstraint = colorView.heightAnchor.constraint(equalToConstant: sizeObject.getValueBasedOnApplicationWidth())
-        heightConstraint?.isActive = true
-        colorView.widthAnchor.constraint(equalTo: colorView.heightAnchor).isActive = true
-        colorView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
-        colorView.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
-        
-        label.leadingAnchor.constraint(equalTo: colorView.trailingAnchor, constant: PaddingOne).isActive = true
-        label.topAnchor.constraint(equalTo: topAnchor).isActive = true
-        trailingAnchor.constraint(equalTo: label.trailingAnchor).isActive = true
-        bottomAnchor.constraint(equalTo: label.bottomAnchor).isActive = true
-    }
-    
-    override func updateView(_ size: CGFloat) {
-        super.updateView(size)
-        label.updateView(size)
-        heightConstraint?.constant = sizeObject.getValueBased(onSize: size)
-        setNeedsDisplay()
-    }
-    
-    override func reset() {
-        super.reset()
-        label.reset()
-    }
-    
-    override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
-        super.set(with: model, delegateObject, additionalData)
-        guard let chartItemModel = model as? DoughnutChartItemModel else {
-            return
-        }
-        label.set(with: chartItemModel.label, delegateObject, additionalData)
-        colorView.backgroundColor = chartItemModel.color.uiColor
-    }
-}

MVMCoreUI/Containers/Views/EntryFieldContainer.swift

@@ -17,7 +17,7 @@ import UIKit
     /// The bottom border line. Height is dynamic based on scenario.
     public var bottomBar: CAShapeLayer? = {
         let layer = CAShapeLayer()
-        layer.backgroundColor = UIColor.black.cgColor
+        layer.backgroundColor = UIColor.mvmBlack.cgColor
         layer.drawsAsynchronously = true
         layer.anchorPoint = CGPoint(x: 0.5, y: 1.0);
         return layer
@@ -46,7 +46,7 @@ import UIKit
     /// Determines if the top, left, and right borders should be drawn.
     private var hideBorders = false
     
-    public var borderStrokeColor: UIColor = .mfSilver()
+    public var borderStrokeColor: UIColor = .mvmCoolGray3
     private var borderPath: UIBezierPath = UIBezierPath()
     
     //--------------------------------------------------
@@ -210,8 +210,8 @@ import UIKit
         
         isUserInteractionEnabled = true
         hideBorders = false
-        borderStrokeColor = .mfSilver()
+        borderStrokeColor = .mvmCoolGray3
-        bottomBar?.backgroundColor = UIColor.black.cgColor
+        bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
         refreshUI(bottomBarSize: 1)
     }
     
@@ -219,8 +219,8 @@ import UIKit
         
         isUserInteractionEnabled = true
         hideBorders = false
-        borderStrokeColor = .mfPumpkin()
+        borderStrokeColor = .mvmOrange
-        bottomBar?.backgroundColor = UIColor.mfPumpkin().cgColor
+        bottomBar?.backgroundColor = UIColor.mvmOrange.cgColor
         refreshUI(bottomBarSize: 4)
     }
     
@@ -228,8 +228,8 @@ import UIKit
         
         isUserInteractionEnabled = true
         hideBorders = false
-        borderStrokeColor = .black
+        borderStrokeColor = .mvmBlack
-        bottomBar?.backgroundColor = UIColor.mfPumpkin().cgColor
+        bottomBar?.backgroundColor = UIColor.mvmOrange.cgColor
         refreshUI(bottomBarSize: 4)
     }
     
@@ -237,8 +237,8 @@ import UIKit
         
         isUserInteractionEnabled = true
         hideBorders = false
-        borderStrokeColor = .black
+        borderStrokeColor = .mvmBlack
-        bottomBar?.backgroundColor = UIColor.black.cgColor
+        bottomBar?.backgroundColor = UIColor.mvmBlack.cgColor
         refreshUI(bottomBarSize: 1)
     }
     
@@ -255,7 +255,7 @@ import UIKit
         
         isUserInteractionEnabled = false
         hideBorders = false
-        borderStrokeColor = .mfSilver()
+        borderStrokeColor = .mvmCoolGray3
         bottomBar?.backgroundColor = UIColor.mvmCoolGray3.cgColor
         refreshUI(bottomBarSize: 1)
     }

MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m

@@ -117,7 +117,7 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
     if ([type isEqualToString:ValueTypeError]) {
         return [UIColor mvmOrange];
     } else {
-        return [UIColor mfShamrock];
+        return [UIColor mvmGreen];
     }
 }