From 3cc9750333d0c5213e707d9596063e34484f4eae Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 10:39:02 -0400 Subject: [PATCH] remove 1.0 fonts --- MVMCoreUI/Atoms/Views/MFLabel.h | 32 +++-- MVMCoreUI/Atoms/Views/MFLabel.m | 115 ++++++++---------- MVMCoreUI/Molecules/TopLabelsView.m | 2 +- MVMCoreUI/Styles/MFStyler.h | 34 +----- MVMCoreUI/Styles/MFStyler.m | 95 +-------------- .../Utility/MVMCoreUICommonViewsUtility.h | 4 +- .../Utility/MVMCoreUICommonViewsUtility.m | 16 +-- 7 files changed, 91 insertions(+), 207 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index c6288c09..d1dd36bc 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -27,41 +27,49 @@ - (BOOL)hasText; #pragma mark - 2.0 - -+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale; +//75Bd 40pt + (nonnull MFLabel *)commonLabelH1:(BOOL)scale; +//75Bd 25pt + (nonnull MFLabel *)commonLabelH2:(BOOL)scale; +//75Bd 18pt + (nonnull MFLabel *)commonLabelH3:(BOOL)scale; +//75Bd 13pt + (nonnull MFLabel *)commonLabelB1:(BOOL)scale; +//55Rg 13pt ++ (nonnull MFLabel *)commonLabelB2:(BOOL)scale; +//55Rg 11pt gray + (nonnull MFLabel *)commonLabelB3:(BOOL)scale; +//75Bd 32pt ++ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale; +//55Rg 20pt + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; +//55Rg 11pt + (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale; #pragma mark - 1.0 // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -+ (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale; +//75Bd 15pt + (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale; +//75Bd 16pt + (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale; // Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; + (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData; -- (void)styleB2:(BOOL)scale; -- (void)styleBodyWithSize:(CGFloat)size scale:(BOOL)scale; -- (void)styleBodyLarge:(BOOL)scale; + - (void)styleH1:(BOOL)scale; - (void)styleH2:(BOOL)scale; -- (void)styleHeadlineLarge:(BOOL)scale; -- (void)styleHeadlineSmall:(BOOL)scale; -- (void)styleHeadlineWithSize:(CGFloat)size scale:(BOOL)scale; - (void)styleH3:(BOOL)scale; +- (void)styleB1:(BOOL)scale; +- (void)styleB2:(BOOL)scale; - (void)styleB3:(BOOL)scale; - (void)styleFeedHeadline:(BOOL)scale; +- (void)styleFeedMessage:(BOOL)scale; +- (void)styleFeedSubMessage:(BOOL)scale; + - (void)styleFeedTitle:(BOOL)scale; -- (void)styleB1:(BOOL)scale; +- (void)styleHeadlineSmall:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 7a02ad78..513326a9 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -100,28 +100,11 @@ } } -#pragma mark - Getters - - (BOOL)hasText { return self.text.length > 0 || self.attributedText.length > 0; } -+ (nonnull MFLabel *)label { - return [[MFLabel alloc] initWithFrame:CGRectZero]; -} - -+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleB2:scale]; - return label; -} - - -+ (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleBodyLarge:scale]; - return label; -} +#pragma mark - 2.0 + (nonnull MFLabel *)commonLabelH1:(BOOL)scale { MFLabel *label = [MFLabel label]; @@ -135,30 +118,36 @@ return label; } -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleHeadlineSmall:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleHeadlineWithSize:size scale:scale]; - return label; -} - + (nonnull MFLabel *)commonLabelH3:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleH3:scale]; return label; } ++ (nonnull MFLabel *)commonLabelB1:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleB1:scale]; + return label; +} + ++ (nonnull MFLabel *)commonLabelB2:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleB2:scale]; + return label; +} + + (nonnull MFLabel *)commonLabelB3:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleB3:scale]; return label; } ++ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleFeedHeadline:scale]; + return label; +} + + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleFeedMessage:scale]; @@ -171,15 +160,21 @@ return label; } -+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale { +#pragma mark - 1.0 + ++ (nonnull MFLabel *)label { + return [[MFLabel alloc] initWithFrame:CGRectZero]; +} + ++ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale { MFLabel *label = [MFLabel label]; - [label styleFeedHeadline:scale]; + [label styleHeadlineSmall:scale]; return label; } -+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale { ++ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale { MFLabel *label = [MFLabel label]; - [label styleB1:scale]; + [label styleFeedTitle:scale]; return label; } @@ -263,21 +258,6 @@ self.originalAttributedString = self.attributedText; } -- (void)styleB2:(BOOL)scale { - [MFStyler styleLabelB2:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleBodyWithSize:(CGFloat)size scale:(BOOL)scale { - [MFStyler styleLabelB2:self size:size genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleBodyLarge:(BOOL)scale { - [MFStyler styleLabelBodyLarge:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)styleH1:(BOOL)scale { [MFStyler styleLabelH1:self genericScaling:NO]; [self setScale:scale]; @@ -288,30 +268,31 @@ [self setScale:scale]; } -- (void)styleHeadlineLarge:(BOOL)scale { - [MFStyler styleLabelHeadlineLarge:self genericScaling:NO]; - [self setScale:scale]; -} -- (void)styleHeadlineSmall:(BOOL)scale { - [MFStyler styleLabelHeadlineSmall:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleHeadlineWithSize:(CGFloat)size scale:(BOOL)scale { - [MFStyler styleLabelH2:self size:size genericScaling:NO]; - [self setScale:scale]; -} - - (void)styleH3:(BOOL)scale { [MFStyler styleLabelH3:self genericScaling:NO]; [self setScale:scale]; } +- (void)styleB1:(BOOL)scale { + [MFStyler styleLabelB1:self genericScaling:NO]; + [self setScale:scale]; +} + +- (void)styleB2:(BOOL)scale { + [MFStyler styleLabelB2:self genericScaling:NO]; + [self setScale:scale]; +} + - (void)styleB3:(BOOL)scale { [MFStyler styleLabelB3:self genericScaling:NO]; [self setScale:scale]; } +- (void)styleFeedHeadline:(BOOL)scale { + [MFStyler styleLabelHeadlineFeed:self genericScaling:NO]; + [self setScale:scale]; +} + - (void)styleFeedMessage:(BOOL)scale { [MFStyler styleLabelFeedMessage:self genericScaling:NO]; [self setScale:scale]; @@ -322,13 +303,13 @@ [self setScale:scale]; } -- (void)styleFeedHeadline:(BOOL)scale { - [MFStyler styleLabelHeadlineFeed:self genericScaling:NO]; +- (void)styleHeadlineSmall:(BOOL)scale { + [MFStyler styleLabelHeadlineSmall:self genericScaling:NO]; [self setScale:scale]; } -- (void)styleB1:(BOOL)scale { - [MFStyler styleLabelB1:self genericScaling:NO]; +- (void)styleFeedTitle:(BOOL)scale { + [MFStyler styleFeedCardTitleLabel:self genericScaling:NO]; [self setScale:scale]; } diff --git a/MVMCoreUI/Molecules/TopLabelsView.m b/MVMCoreUI/Molecules/TopLabelsView.m index 04c9b758..08bd4007 100644 --- a/MVMCoreUI/Molecules/TopLabelsView.m +++ b/MVMCoreUI/Molecules/TopLabelsView.m @@ -180,7 +180,7 @@ #pragma mark - Common styles - (void)setAsLargeHeadline { - [MFStyler styleLabelHeadlineLarge:self.headlineLabel]; + [MFStyler styleLabelH1:self.headlineLabel]; [self layoutIfNeeded]; if (self.tableView) { [self.tableView showHeader]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index d2c02a9a..cf8f878a 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -118,6 +118,10 @@ B3 -> Legal + (nullable UIFont *)fontB4:(BOOL)genericScaling; + (nullable UIFont *)fontB4; +//55Rg 20pt ++ (nullable UIFont *)fontForFeedMessage; +//55Rg 11pt ++ (nullable UIFont *)fontForFeedSubMessage; #pragma mark - 1.0 fonts @@ -125,29 +129,20 @@ B3 -> Legal + (nullable UIFont *)fontForPlan; //75Bd 48pt + (nullable UIFont *)fontForBiggerHeadline; -//75Bd 26pt -+ (nullable UIFont *)fontForLoyaltySignUpHeadLine; //75Bd 40pt + (nullable UIFont *)fontForFeedHeadline; -//55Rg 20pt -+ (nullable UIFont *)fontForFeedMessage; -//55Rg 11pt -+ (nullable UIFont *)fontForFeedSubMessage; + //75Bd 15pt + (nullable UIFont *)fontForHeadlineSmall; //75Bd 11pt + (nullable UIFont *)fontForHeadlineTiny; //75Bd 16pt + (nullable UIFont *)fontForHeadlineSmall2; -//75Bd 32pt -+ (nullable UIFont *)fontForHeadlineLarge; //55Rg 14pt + (nullable UIFont *)fontforChatText; //55Rg 16pt + (nullable UIFont *)fontForAccountLandingGreeting; -//55Rg 20pt -+ (nullable UIFont *)fontForBodyLarge; //55Rg 10pt + (nullable UIFont *)fontForProgressBarBottomLabel; @@ -169,8 +164,6 @@ B3 -> Legal + (nullable UIFont *)fontForSupportDateStamp; //65Md 10pt + (nullable UIFont *)fontForProgressBarTopLabel; -//75Bd 20pt -+ (nullable UIFont *)fontH3; //75Bd 60pt + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle; //75Bd 42pt @@ -181,21 +174,18 @@ B3 -> Legal + (nullable UIFont *)fontForUnreadMessageOnSupport; // Returns the fonts for these styles allowing to apply a generic scale by device or not. -+ (nullable UIFont *)fontForHeadlineWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedSubMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; -+ (nullable UIFont *)fontForHeadlineLarge:(BOOL)genericScaling; + (nullable UIFont *)fontB1ForWidth:(CGFloat)size; + (nullable UIFont *)fontForBodyWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling; + (nullable UIFont *)fontB2ForWidth:(CGFloat)size; + (nullable UIFont *)fontForBodyWithSize:(CGFloat)size forWidth:(CGFloat)width; + (nullable UIFont *)fontforChatText:(BOOL)genericScaling; + (nullable UIFont *)fontForAccountLandingGreeting:(BOOL)genericScaling; -+ (nullable UIFont *)fontForBodyLarge:(BOOL)genericScaling; + (nullable UIFont *)fontForPrimaryButton:(BOOL)genericScaling; + (nullable UIFont *)fontForPrimaryButtonForWidth:(CGFloat)size; @@ -252,12 +242,10 @@ B3 -> Legal #pragma mark - 1.0 styles -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label; + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; + (void)styleLabelFeedMessage:(nonnull UILabel *)label; + (void)styleLabelFeedSubMessage:(nonnull UILabel *)label; + (void)styleLabelB2:(nonnull UILabel *)label; -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; @@ -267,30 +255,19 @@ B3 -> Legal + (void)styleStandardSeparatorView:(nonnull UIView *)view; + (void)styleLabelHeadlineSmall:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelFeedSubMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelH2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling; -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTagLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; //------------------------------------------------- -// Sets the text with strings attributed with these styles. - -+ (void)styleSetLabelTextWithH2:(nonnull UILabel *)label text:(nullable NSString *)text; -+ (void)styleSetLabelTextWithHeadlineLarge:(nonnull UILabel *)label text:(nullable NSString *)text; -+ (void)styleSetLabelTextWithH3:(nonnull UILabel *)label text:(nullable NSString *)text; -+ (void)styleSetLabelTextWithB2:(nonnull UILabel *)label text:(nullable NSString *)text; -+ (void)styleSetLabelTextWithB3:(nonnull UILabel *)label text:(nullable NSString *)text; #pragma mark - Attributed Strings + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color; + (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetHeadlineLargeAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string; @@ -306,6 +283,7 @@ B3 -> Legal //------------------------------------------------- // Returns colors for Gradient Text presets + + (nonnull NSArray *)gradientSpecialTicketGold; + (nonnull NSArray *)gradientSpecialTicketGoldCGColor; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index ad1aee01..c37e9746 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -128,13 +128,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; #pragma mark - Fonts -+ (nullable UIFont *)fontForHeadlineWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling { - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)fontForPlan:(BOOL)genericScaling { CGFloat size = 100; if (genericScaling) { @@ -151,14 +144,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } -+ (nullable UIFont *)fontForLoyaltySignUpHeadLine:(BOOL)genericScaling { - CGFloat size = 26; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling { CGFloat size = 32; if (genericScaling) { @@ -205,14 +190,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:pointSize]; } -+ (nullable UIFont *)fontForHeadlineLarge:(BOOL)genericScaling { - CGFloat size = 40; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)commonLabelB1:(BOOL)genericScaling { CGFloat size = 13; if (genericScaling) { @@ -269,14 +246,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont55Rg:size]; } -+ (nullable UIFont *)fontForBodyLarge:(BOOL)genericScaling { - CGFloat size = 20; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - + (nullable UIFont *)fontB3:(BOOL)genericScaling { CGFloat size = 11; if (genericScaling) { @@ -469,10 +438,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForBiggerHeadLine:YES]; } -+ (nullable UIFont *)fontForLoyaltySignUpHeadLine { - return [self fontForLoyaltySignUpHeadLine:YES]; -} - + (nullable UIFont *)fontForFeedHeadline { return [self fontForFeedHeadline:YES]; } @@ -497,10 +462,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForHeadlineSmall2:YES]; } -+ (nullable UIFont *)fontForHeadlineLarge { - return [self fontForHeadlineLarge:YES]; -} - + (nullable UIFont *)fontB2 { return [self fontB2:YES]; } @@ -513,10 +474,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForAccountLandingGreeting:YES]; } -+ (nullable UIFont *)fontForBodyLarge { - return [self fontForBodyLarge:YES]; -} - + (nullable UIFont *)fontB3 { return [self fontB3:YES]; } @@ -680,11 +637,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; #pragma mark - 1.0 Styles -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label { - label.font = [MFStyler fontForHeadlineLarge]; - label.textColor = [UIColor blackColor]; -} - + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label { label.font = [MFStyler fontForFeedHeadline]; label.textColor = [UIColor mfRedColor]; @@ -695,13 +647,13 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label { - label.font = [MFStyler fontForBodyLarge]; ++ (void)styleLabelB1:(nonnull UILabel *)label { + label.font = [MFStyler fontB1]; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelB1:(nonnull UILabel *)label { - label.font = [MFStyler fontB1]; ++ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label { + label.font = [MFStyler fontForFeedCardTitle]; label.textColor = [UIColor blackColor]; } @@ -719,11 +671,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForHeadlineLarge:genericScaling]; - label.textColor = [UIColor mfRedColor]; -} - + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForFeedHeadline:genericScaling]; label.textColor = [UIColor blackColor]; @@ -738,13 +685,9 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.font = [MFStyler fontForFeedSubMessage:genericScaling]; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelH2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForHeadlineWithSize:size genericScaling:genericScaling]; - label.textColor = [UIColor mfRedColor]; -} -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForBodyLarge:genericScaling]; ++ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + label.font = [MFStyler fontForFeedCardTitle:genericScaling]; label.textColor = [UIColor blackColor]; } @@ -753,28 +696,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfBrownishGrey]; } -#pragma mark - Set Text With Styles - -+ (void)styleSetLabelTextWithH2:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelH2:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithHeadlineLarge:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelHeadlineLarge:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithB2:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelB2:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithB3:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelB3:label]; - label.text = text; -} - #pragma mark - Attributed Strings + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color { @@ -795,10 +716,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor mfRedColor]]; } -+ (nonnull NSAttributedString *)styleGetHeadlineLargeAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineLarge] color:[UIColor mfRedColor]]; -} - + (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]]; } diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index aab5bd76..9e3e2ad8 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -20,6 +20,7 @@ #pragma mark - 2.0 labels ++ (nonnull UILabel *)commonLabelH1; + (nonnull UILabel *)commonLabelH2; + (nonnull UILabel *)commonLabelH3; + (nonnull UILabel *)commonLabelB1; @@ -31,9 +32,8 @@ // Creates and returns common labels + (nonnull UILabel *)label; -+ (nonnull UILabel *)commonLabelHeadlineLarge; + (nonnull UILabel *)commonLabelHeadlineFeed; -+ (nonnull UILabel *)commonLabelBodyLarge; ++ (nonnull UILabel *)commonLabelFeedHeadline; + (nonnull UILabel *)commonLabelFeedTitle; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 1feb3e30..a22c8e68 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -53,18 +53,18 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelHeadlineLarge { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineLarge:label]; - return label; -} - + (nonnull UILabel *)commonLabelHeadlineFeed { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelHeadlineFeed:label]; return label; } ++ (nonnull UILabel *)commonLabelH1 { + UILabel *label = [MVMCoreUICommonViewsUtility label]; + [MFStyler styleLabelH1:label]; + return label; +} + + (nonnull UILabel *)commonLabelH2 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelH2:label]; @@ -83,9 +83,9 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelBodyLarge { ++ (nonnull UILabel *)commonLabelFeedHeadline { UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyLarge:label]; + [MFStyler styleLabelHeadlineFeed:label]; return label; }