From 1957f4d354a6bf6cb8d31764edc5a0a1942fbe38 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 1 Apr 2020 14:47:47 -0400 Subject: [PATCH] pulling in new changes --- MVMCoreUI/Styles/Styler.swift | 318 ++++++++++++++++++++++++++++++++++ 1 file changed, 318 insertions(+) diff --git a/MVMCoreUI/Styles/Styler.swift b/MVMCoreUI/Styles/Styler.swift index f5b90149..0a38e6f0 100644 --- a/MVMCoreUI/Styles/Styler.swift +++ b/MVMCoreUI/Styles/Styler.swift @@ -214,6 +214,170 @@ public class Styler { } } + //-------------------------------------------------- + // MARK: - 3.0 fonts + //-------------------------------------------------- + + class func getMVA3FontSize(_ size: CGFloat, bold isBold: Bool) -> UIFont { + if isBold { + if size >= 15 { + return MFFonts.mfFontDSBold(size) + } else { + return MFFonts.mfFontTXBold(size) + } + } else { + if size >= 15 { + return MFFonts.mfFontDSRegular(size) + } else { + return MFFonts.mfFontTXRegular(size) + } + } + } + + class func fontTitle2XLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 36 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontTitle2XLarge() -> UIFont { + return self.fontTitle2XLarge(true) + } + + class func fontTitleXLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 32 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontTitleXLarge() -> UIFont { + return self.fontTitleXLarge(true) + } + + class func fontBoldTitleLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 24 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontBoldTitleLarge() -> UIFont { + return self.fontBoldTitleLarge(true) + } + + class func fontRegularTitleLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 24 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: false) + } + + class func fontRegularTitleLarge() -> UIFont { + return self.fontRegularTitleLarge(true) + } + + class func fontBoldTitleMedium(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 20 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontBoldTitleMedium() -> UIFont { + return self.fontBoldTitleMedium(true) + } + + class func fontRegularTitleMedium(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 20 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: false) + } + + class func fontRegularTitleMedium() -> UIFont { + return self.fontRegularTitleMedium(true) + } + + class func fontBoldBodyLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 16 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontBoldBodyLarge() -> UIFont { + return self.fontBoldBodyLarge(true) + } + + class func fontRegularBodyLarge(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 16 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: false) + } + + class func fontRegularBodyLarge() -> UIFont { + return self.fontRegularBodyLarge(true) + } + + class func fontBoldBodySmall(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 13 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontBoldBodySmall() -> UIFont { + return self.fontBoldBodySmall(true) + } + + class func fontRegularBodySmall(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 13 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: false) + } + + class func fontRegularBodySmall() -> UIFont { + return self.fontRegularBodySmall(true) + } + + class func fontBoldMicro(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 11 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: true) + } + + class func fontBoldMicro() -> UIFont { + return self.fontBoldMicro(true) + } + + class func fontRegularMicro(_ genericScaling: Bool) -> UIFont { + var size: CGFloat = 11 + if genericScaling { + size = self.sizeFontGeneric(forCurrentDevice: size) + } + return self.getMVA3FontSize(size, bold: false) + } + + class func fontRegularMicro() -> UIFont { + return self.fontRegularMicro(true) + } + //-------------------------------------------------- // MARK: - Fonts //-------------------------------------------------- @@ -306,6 +470,160 @@ public class Styler { return MFFonts.mfFont55Rg(size) } + //-------------------------------------------------- + // MARK: - 3.0 Styles + //-------------------------------------------------- + + class func styleLabelTitle2XLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontTitle2XLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelTitle2XLarge(_ label: UILabel) { + self.styleLabelTitle2XLarge(label, genericScaling: true) + } + + class func styleLabelTitleXLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontTitleXLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelTitleXLarge(_ label: UILabel) { + self.styleLabelTitleXLarge(label, genericScaling: true) + } + + class func styleLabelBoldTitleLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontBoldTitleLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelBoldTitleLarge(_ label: UILabel) { + self.styleLabelBoldTitleLarge(label, genericScaling: true) + } + + class func styleLabelRegularTitleLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontRegularTitleLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelRegularTitleLarge(_ label: UILabel) { + self.styleLabelBoldTitleLarge(label, genericScaling: true) + } + + class func styleLabelBoldTitleMedium(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontBoldTitleMedium(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelBoldTitleMedium(_ label: UILabel) { + self.styleLabelBoldTitleMedium(label, genericScaling: true) + } + + class func styleLabelRegularTitleMedium(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontRegularTitleMedium(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelRegularTitleMedium(_ label: UILabel) { + self.styleLabelRegularTitleMedium(label, genericScaling: true) + } + + class func styleLabelBoldBodyLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontBoldBodyLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelBoldBodyLarge(_ label: UILabel) { + self.styleLabelBoldBodyLarge(label, genericScaling: true) + } + + class func styleLabelRegularBodyLarge(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontRegularBodyLarge(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelRegularBodyLarge(_ label: UILabel) { + self.styleLabelRegularBodyLarge(label, genericScaling: true) + } + + class func styleLabelBoldBodySmall(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontBoldBodySmall(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelBoldBodySmall(_ label: UILabel) { + self.styleLabelBoldBodySmall(label, genericScaling: true) + } + + class func styleLabelRegularBodySmall(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontRegularBodySmall(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelRegularBodySmall(_ label: UILabel) { + self.styleLabelRegularBodySmall(label, genericScaling: true) + } + + class func styleLabelBoldMicro(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontBoldMicro(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelBoldMicro(_ label: UILabel) { + self.styleLabelBoldMicro(label, genericScaling: true) + } + + class func styleLabelRegularMicro(_ label: UILabel, genericScaling: Bool) { + label.font = MFStyler.fontRegularMicro(genericScaling) + label.textColor = UIColor.black + } + + class func styleLabelRegularMicro(_ label: UILabel) { + self.styleLabelRegularMicro(label, genericScaling: true) + } + + class func styleMVA3Label(_ label: UILabel, withStyle style: String?, genericScaling: Bool) -> Bool { + if (style == "Title2XLarge") { + self.styleLabelTitle2XLarge(label, genericScaling: genericScaling) + return true + } else if (style == "TitleXLarge") { + self.styleLabelTitleXLarge(label, genericScaling: genericScaling) + return true + } else if (style == "BoldTitleLarge") { + self.styleLabelBoldTitleLarge(label, genericScaling: genericScaling) + return true + } else if (style == "RegularTitleLarge") { + self.styleLabelRegularTitleLarge(label, genericScaling: genericScaling) + return true + } else if (style == "BoldTitleMedium") { + self.styleLabelBoldTitleMedium(label, genericScaling: genericScaling) + return true + } else if (style == "RegularTitleMedium") { + self.styleLabelRegularTitleMedium(label, genericScaling: genericScaling) + return true + } else if (style == "BoldBodyLarge") { + self.styleLabelBoldBodyLarge(label, genericScaling: genericScaling) + return true + } else if (style == "RegularBodyLarge") { + self.styleLabelRegularBodyLarge(label, genericScaling: genericScaling) + return true + } else if (style == "BoldBodySmall") { + self.styleLabelBoldBodySmall(label, genericScaling: genericScaling) + return true + } else if (style == "RegularBodySmall") { + self.styleLabelRegularBodySmall(label, genericScaling: genericScaling) + return true + } else if (style == "BoldMicro") { + self.styleLabelBoldMicro(label, genericScaling: genericScaling) + return true + } else if (style == "RegularMicro") { + self.styleLabelRegularMicro(label, genericScaling: genericScaling) + return true + } else { + return false + } + } + //-------------------------------------------------- // MARK: - Styles //--------------------------------------------------