From 10a91bd1ed38e052f8e59e52d0386f391e161c1d Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 24 Feb 2021 11:19:31 -0500
Subject: [PATCH] revised

---
 MVMCoreUI/Styles/Padding.swift | 10 ++++------
 MVMCoreUI/Styles/Styler.swift  | 17 +----------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/MVMCoreUI/Styles/Padding.swift b/MVMCoreUI/Styles/Padding.swift
index 0dd9ff6e..480896a0 100644
--- a/MVMCoreUI/Styles/Padding.swift
+++ b/MVMCoreUI/Styles/Padding.swift
@@ -6,8 +6,6 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import Foundation
-
 
 /// Padding is a multiple based on the number 4.
 public struct Padding {
@@ -30,19 +28,19 @@ public struct Padding {
         public static let VerticalMarginSpacing: CGFloat = 24
         
         public static var horizontalPaddingForApplicationWidth: CGFloat {
-            return MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? HorizontalMarginSpacing
+            MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? HorizontalMarginSpacing
         }
         
         public static var verticalPaddingForApplicationWidth: CGFloat {
-            return MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? VerticalMarginSpacing
+            MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? VerticalMarginSpacing
         }
         
         public static func horizontalPaddingForSize(_ size: CGFloat) -> CGFloat {
-            return MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBased(onSize: size) ?? HorizontalMarginSpacing
+            MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBased(onSize: size) ?? HorizontalMarginSpacing
         }
         
         public static func verticalPaddingForSize(_ size: CGFloat) -> CGFloat {
-            return MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBased(onSize: size) ?? VerticalMarginSpacing
+            MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBased(onSize: size) ?? VerticalMarginSpacing
         }
     }
 }
diff --git a/MVMCoreUI/Styles/Styler.swift b/MVMCoreUI/Styles/Styler.swift
index b2614f04..77402295 100644
--- a/MVMCoreUI/Styles/Styler.swift
+++ b/MVMCoreUI/Styles/Styler.swift
@@ -212,26 +212,11 @@ open class Styler {
         sizeObjectGeneric(forCurrentDevice: size)?.getValueBasedOnApplicationWidth() ?? size
     }
     
-    open class func defaultHorizontalPadding(for size: CGFloat) -> CGFloat {
-        sizeObject(withScalingStandardSize: CGFloat(Padding.Component.horizontalPaddingForApplicationWidth)).getValueBased(onSize: size)
-    }
-    
-    open class func defaultVerticalPadding(for size: CGFloat) -> CGFloat {
-        sizeObject(withScalingStandardSize: CGFloat(Padding.Component.verticalPaddingForApplicationWidth)).getValueBased(onSize: size)
-    }
-    
-    open class func sizeObject(withScalingStandardSize standardSize: CGFloat) -> MFSizeObject {
-        let object = MFSizeObject()
-        object.standardSize = standardSize
-        object.scaleStandardSize = true
-        return object
-    }
-    
     /// Provide additional size information to help calculate its intrinsic height.
     /// - Returns: The available spacing that can be used for intrinsic content width.
     open class func maxAvailableLayoutWidth(size: CGFloat) -> CGFloat {
         // The 2 is the product of both sides of padding.
-        size - (defaultHorizontalPadding(for: size) * 2)
+        size - (Padding.Component.horizontalPaddingForSize(size) * 2)
     }
     
     //--------------------------------------------------