diff --git a/MVMCoreUI/Styles/Padding.swift b/MVMCoreUI/Styles/Padding.swift index ca99d5dc..3ed0922e 100644 --- a/MVMCoreUI/Styles/Padding.swift +++ b/MVMCoreUI/Styles/Padding.swift @@ -11,7 +11,7 @@ import Foundation public struct Padding { - public static let One: CGFloat = 6 + public static let One: CGFloat = 8 public static let Two: CGFloat = 12 public static let Three: CGFloat = 18 public static let Four: CGFloat = 24 @@ -24,24 +24,24 @@ public struct Padding { public struct Default { public static let Standard: CGFloat = 24 - public static let HorizontalSpacing: CGFloat = 32 - public static let VerticalSpacing: CGFloat = 32 - public static let VerticalSpacing3: CGFloat = 24 + public static let HorizontalMarginSpacing: CGFloat = 32 + public static let LargeVerticalMarginSpacing: CGFloat = 32 + public static let VerticalMarginSpacing: CGFloat = 24 public static var horizontalPaddingForApplicationWidth: CGFloat { - return MFSizeObject(scalingStandardSize: HorizontalSpacing)?.getValueBasedOnApplicationWidth() ?? HorizontalSpacing + return MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? HorizontalMarginSpacing } public static var verticalPaddingForApplicationWidth: CGFloat { - return MFSizeObject(scalingStandardSize: VerticalSpacing)?.getValueBasedOnApplicationWidth() ?? VerticalSpacing + return MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBasedOnApplicationWidth() ?? VerticalMarginSpacing } public static func horizontalPaddingForSize(_ size: CGFloat) -> CGFloat { - return MFSizeObject(scalingStandardSize: HorizontalSpacing)?.getValueBased(onSize: size) ?? HorizontalSpacing + return MFSizeObject(scalingStandardSize: HorizontalMarginSpacing)?.getValueBased(onSize: size) ?? HorizontalMarginSpacing } public static func verticalPaddingForSize(_ size: CGFloat) -> CGFloat { - return MFSizeObject(scalingStandardSize: VerticalSpacing)?.getValueBased(onSize: size) ?? VerticalSpacing + return MFSizeObject(scalingStandardSize: VerticalMarginSpacing)?.getValueBased(onSize: size) ?? VerticalMarginSpacing } } } diff --git a/MVMCoreUI/Styles/Styler.swift b/MVMCoreUI/Styles/Styler.swift index 75d0b9ee..e6675b1d 100644 --- a/MVMCoreUI/Styles/Styler.swift +++ b/MVMCoreUI/Styles/Styler.swift @@ -167,10 +167,10 @@ open class Styler { } /// Styles the provided label to the declared enum Font case. - public func styleLabel(_ label: UILabel, genericScaling: Bool = true) { + public func styleLabel(_ label: UILabel, textColor: UIColor = .mvmBlack, genericScaling: Bool = true) { label.font = getFont(genericScaling) - label.textColor = .black + label.textColor = textColor } }