From 8f3957f8f3b2c80ce4966ffea9e1aff6247384d0 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 7 Mar 2019 10:57:24 -0500 Subject: [PATCH 1/2] label_refactor --- MVMCoreUI/Atoms/Views/MFLabel.h | 4 ++-- MVMCoreUI/Atoms/Views/MFLabel.m | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 411f8aa9..924bc594 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -40,9 +40,9 @@ #pragma mark - 1.0 // Getters -+ (nonnull MFLabel *)label; ++ (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); // This is for swift files. Swift is not able to find MFLabel.label() -+ (nonnull MFLabel *)standardLabel; +//+ (nonnull MFLabel *)standardLabel; + (nonnull MFLabel *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 522b5ed5..e9b99860 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -33,7 +33,6 @@ self.numberOfLines = 0; self.lineBreakMode = NSLineBreakByWordWrapping; self.translatesAutoresizingMaskIntoConstraints = NO; - [self styleB2:YES]; } - (instancetype)init { @@ -110,12 +109,6 @@ return [[MFLabel alloc] initWithFrame:CGRectZero]; } -// This is for swift files. Swift is not able to find MFLabel.label() -+ (nonnull MFLabel *)standardLabel { - MFLabel *label = [MFLabel label]; - return label; -} - + (nonnull MFLabel *)commonLabelB2:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleB2:scale]; From 6a4f0b46ac84e5e378c5c6185fff118da8b9ba3a Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 12 Mar 2019 14:32:39 -0400 Subject: [PATCH 2/2] remove comments --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 924bc594..8d1d284f 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -41,8 +41,6 @@ // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -// This is for swift files. Swift is not able to find MFLabel.label() -//+ (nonnull MFLabel *)standardLabel; + (nonnull MFLabel *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale;