fixing merging issue

MVMCoreUI.xcodeproj/project.pbxproj

@@ -28,8 +28,6 @@
 		0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */; };
 		9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */; };
 		948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948DB67D2326DCD90011F916 /* MultiProgress.swift */; };
-		B8200E152280C4CF007245F4 /* ProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E142280C4CF007245F4 /* ProgressBar.swift */; };
-		B8200E192281DC1A007245F4 /* CornerLabels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E182281DC1A007245F4 /* CornerLabels.swift */; };
 		D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */; };
 		D20A9A5E2243D3E300ADE781 /* TwoButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */; };
@@ -220,8 +218,6 @@
 		0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxWithLabelView.swift; sourceTree = "<group>"; };
 		9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
 		948DB67D2326DCD90011F916 /* MultiProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiProgress.swift; sourceTree = "<group>"; };
-		B8200E142280C4CF007245F4 /* ProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBar.swift; sourceTree = "<group>"; };
-		B8200E182281DC1A007245F4 /* CornerLabels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabels.swift; sourceTree = "<group>"; };
 		D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUINavigationController.h; sourceTree = "<group>"; };
 		D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUINavigationController.m; sourceTree = "<group>"; };
 		D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonView.swift; sourceTree = "<group>"; };
@@ -706,7 +702,6 @@
 				D260D7AF22D65BDD007E7233 /* MVMCoreUIPageControl.h */,
 				D260D7B022D65BDD007E7233 /* MVMCoreUIPageControl.m */,
 				D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */,
-				B8200E142280C4CF007245F4 /* ProgressBar.swift */,
 				948DB67D2326DCD90011F916 /* MultiProgress.swift */,
 				DBC4391622442196001AB423 /* CaretView.swift */,
 				DBC4391722442197001AB423 /* DashLine.swift */,

MVMCoreUI/Atoms/Buttons/PrimaryButton.h

@@ -26,7 +26,6 @@ typedef enum : NSUInteger {
 static CGFloat const PrimaryButtonHeight = 42.0;
 static CGFloat const PrimaryButtonSmallHeight = 30.0;
 
-
 @interface PrimaryButton : MFCustomButton <MFTextFieldDelegate, UITextFieldDelegate, MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol, MVMCoreUIViewConstrainingProtocol>
 
 @property (nonatomic, readonly, assign) PrimaryButtonType primaryButtonType; //use reset function to set

MVMCoreUI/Atoms/Buttons/PrimaryButton.m

@@ -779,7 +779,7 @@
 
 #pragma mark - FormValidationEnableDisableProtocol
 
-- (BOOL) isValidationRequired {
+- (BOOL)isValidationRequired {
     return self.validationRequired;
 }
 

MVMCoreUI/Atoms/Views/ProgressBar.swift

@@ -1,81 +0,0 @@
-//
-//  ProgressBar.swift
-//  MVMCoreUI
-//
-//  Created by Panth Patel on 5/3/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-@objcMembers open class ProgressBar: UIProgressView, MVMCoreUIMoleculeViewProtocol, MVMCoreViewProtocol {
-    var isRounded = false
-    var thickness: CGFloat = 8.0 {
-        willSet(newValue) {
-            heightAnchor.constraint(equalToConstant: newValue).isActive = true
-            if isRounded {
-                layer.cornerRadius = newValue/2.0
-            } else {
-                progressViewStyle = .bar
-            }
-        }
-    }
-    
-    public override init(frame: CGRect) {
-        super.init(frame: frame)
-        setupView()
-    }
-    
-    public required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        setupView()
-    }
-    
-    init() {
-        super.init(frame: .zero)
-        setupView()
-    }
-    
-    // MARK: - MVMCoreViewProtocol
-    public func setupView() {
-        clipsToBounds = true
-        translatesAutoresizingMaskIntoConstraints = false
-        reset()
-    }
-    
-    public func updateView(_ size: CGFloat) {
-    }
-    
-    // MARK: - MVMCoreUIMoleculeViewProtocol
-    public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
-        if let isRounded = json?.optionalBoolForKey("roundedRect") {
-            self.isRounded = isRounded
-        }
-        if let thickness = json?.optionalCGFloatForKey("thickness") {
-            self.thickness = thickness
-        }
-        if let percentage = json?["percent"] as? Float {
-            progress = percentage/100.0
-        }
-        if let progressColor = json?.optionalStringForKey("progressColor") {
-            progressTintColor = UIColor.mfGet(forHex: progressColor)
-        }
-        if let backgroundColor = json?.optionalStringForKey("backgroundColor") {
-            trackTintColor = UIColor.mfGet(forHex: backgroundColor)
-        }
-    }
-    
-    public func reset() {
-        isRounded = false
-        thickness = 8
-        progress = 0
-        progressTintColor = UIColor.mfCerulean()
-        trackTintColor = UIColor.mfLightSilver()
-    }
-    
-    public static func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return 8
-    }
-}
-
-