From 0e5582beedc428ff16f2fd3ab29f5077a7e88995 Mon Sep 17 00:00:00 2001 From: "Christiano, Kevin" Date: Wed, 10 Apr 2019 16:33:47 -0400 Subject: [PATCH] Removing enum. won't bridge to objc correctly. --- MVMCoreUI/Atoms/Views/Label.swift | 89 +++++++------------------------ 1 file changed, 20 insertions(+), 69 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift index 2b491d07..b0b32fcc 100644 --- a/MVMCoreUI/Atoms/Views/Label.swift +++ b/MVMCoreUI/Atoms/Views/Label.swift @@ -87,110 +87,61 @@ class Label: UILabel, MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol { } //------------------------------------------------------ - // MARK: - Enum Generator + // MARK: - Functions //------------------------------------------------------ - - enum Style { - case B1(scale: Bool) - case B2(scale: Bool) - case B3(scale: Bool) - case B20(scale: Bool) - case H1(scale: Bool) - case H2(scale: Bool) - case H3(scale: Bool) - case H32(scale: Bool) - case none - - func create() -> Label { - - let label = Label() - - switch self { - case .B1(let scale): - label.styleB1(scale) - - case .B2(let scale): - label.styleB2(scale) - - case .B3(let scale): - label.styleB3(scale) - - case .B20(let scale): - label.styleB20(scale) - - case .H1(let scale): - label.styleH1(scale) - - case .H2(let scale): - label.styleH2(scale) - - case .H3(let scale): - label.styleH3(scale) - - case .H32(let scale): - label.styleH32(scale) - - case .none: - break; - } - - return label - } - } - - /* - class func commonLabelH1(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + + class func commonLabelH1(_ scale: Bool) -> Label { + let label = Label.label() label.styleH1(scale) return label } - class func commonLabelH2(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelH2(_ scale: Bool) -> Label { + let label = Label.label() label.styleH2(scale) return label } - class func commonLabelH3(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelH3(_ scale: Bool) -> Label { + let label = Label.label() label.styleH3(scale) return label } - class func commonLabelH32(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelH32(_ scale: Bool) -> Label { + let label = Label.label() label.styleH32(scale) return label } - class func commonLabelB1(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelB1(_ scale: Bool) -> Label { + let label = Label.label() label.styleB1(scale) return label } - class func commonLabelB2(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelB2(_ scale: Bool) -> Label { + let label = Label.label() label.styleB2(scale) return label } - class func commonLabelB3(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelB3(_ scale: Bool) -> Label { + let label = Label.label() label.styleB3(scale) return label } - class func commonLabelB20(_ scale: Bool) -> MFLabel { - let label = MFLabel.label() + class func commonLabelB20(_ scale: Bool) -> Label { + let label = Label.label() label.styleB20(scale) return label } - class func label() -> MFLabel { + class func label() -> Label { return Label(frame: CGRect.zero) } - */ + //------------------------------------------------------ // MARK: - Functions