diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 193fe4fe..22308465 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -27,59 +27,37 @@ - (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 32pt ++ (nonnull MFLabel *)commonLabelH32:(BOOL)scale; +//75Bd 13pt + (nonnull MFLabel *)commonLabelB1:(BOOL)scale; +//55Rg 13pt ++ (nonnull MFLabel *)commonLabelB2:(BOOL)scale; +//55Rg 11pt gray + (nonnull MFLabel *)commonLabelB3:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale; - -#pragma mark - 1.0 +//55Rg 20pt ++ (nonnull MFLabel *)commonLabelB20:(BOOL)scale; // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -+ (nonnull MFLabel *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelHeadlineBlackWithSize:(CGFloat)size scale:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelSubheadBold:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelSubheadBoldLarge:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelPlanCardTitle:(BOOL)scale; -+ (nonnull MFLabel *)commonLabelTopAlert:(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)styleBodyBold:(BOOL)scale; -- (void)styleBodyLighter:(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)styleHeadlineBlackWithSize:(CGFloat)size scale:(BOOL)scale; - (void)styleH3:(BOOL)scale; -- (void)styleSubheadBold:(BOOL)scale; -- (void)styleSubheadBoldLarge:(BOOL)scale; -- (void)styleB3:(BOOL)scale; -- (void)styleFeedHeadline:(BOOL)scale; -- (void)styleFeedTitle:(BOOL)scale; -- (void)stylePlanCardTitle:(BOOL)scale; +- (void)styleH32:(BOOL)scale; - (void)styleB1:(BOOL)scale; -- (void)styleTableRow:(BOOL)scale; - -// Without color -- (void)setFontH1:(BOOL)scale; +- (void)styleB2:(BOOL)scale; +- (void)styleB3:(BOOL)scale; +- (void)styleB20:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index eb9ed1c6..66b434e5 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -100,45 +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 *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleBodyWithSize:size scale:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleBodyBold:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleBodyLighter: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]; @@ -152,75 +118,14 @@ 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 *)commonLabelHeadlineBlackWithSize:(CGFloat)size scale:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleHeadlineBlackWithSize:size scale:scale]; - return label; -} - + (nonnull MFLabel *)commonLabelH3:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleH3:scale]; return label; } - -+ (nonnull MFLabel *)commonLabelSubheadBold:(BOOL)scale { ++ (nonnull MFLabel *)commonLabelH32:(BOOL)scale { MFLabel *label = [MFLabel label]; - [label styleSubheadBold:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelSubheadBoldLarge:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleSubheadBoldLarge:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleB3:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedMessage:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedSubMessage:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedHeadline:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedTitle:scale]; - return label; -} - -+ (nonnull MFLabel *)commonLabelPlanCardTitle:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label stylePlanCardTitle:scale]; + [label styleH32:scale]; return label; } @@ -230,12 +135,28 @@ return label; } -+ (nonnull MFLabel *)commonLabelTopAlert:(BOOL)scale { ++ (nonnull MFLabel *)commonLabelB2:(BOOL)scale { MFLabel *label = [MFLabel label]; - [label styleTopAlert:scale]; + [label styleB2:scale]; return label; } ++ (nonnull MFLabel *)commonLabelB3:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleB3:scale]; + return label; +} + ++ (nonnull MFLabel *)commonLabelB20:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleB20:scale]; + return label; +} + ++ (nonnull MFLabel *)label { + return [[MFLabel alloc] initWithFrame:CGRectZero]; +} + #pragma mark - Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { @@ -316,31 +237,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)styleBodyBold:(BOOL)scale { - [MFStyler styleLabelBodyBold:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleBodyLighter:(BOOL)scale { - [MFStyler styleLabelBodyLighter:self 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]; @@ -351,68 +247,13 @@ [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)styleHeadlineBlackWithSize:(CGFloat)size scale:(BOOL)scale { - [MFStyler styleLabelHeadlineBlack:self size:size genericScaling:NO]; - [self setScale:scale]; -} - - (void)styleH3:(BOOL)scale { [MFStyler styleLabelH3:self genericScaling:NO]; [self setScale:scale]; } -- (void)styleSubheadBold:(BOOL)scale { - [MFStyler styleLabelSubheadBold:self genericScaling:NO]; - [self setScale:scale]; -} - - -- (void)styleSubheadBoldLarge:(BOOL)scale { - [MFStyler styleLabelSubheadBoldLarge:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleB3:(BOOL)scale { - [MFStyler styleLabelB3:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleFeedMessage:(BOOL)scale { - [MFStyler styleLabelFeedMessage:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleFeedSubMessage:(BOOL)scale { - [MFStyler styleLabelFeedSubMessage:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleFeedHeadline:(BOOL)scale { - [MFStyler styleLabelHeadlineFeed:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleFeedTitle:(BOOL)scale { - [MFStyler styleFeedCardTitleLabel:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)stylePlanCardTitle:(BOOL)scale { - self.font = [MFStyler fontForPlanCardTitle:NO]; +- (void)styleH32:(BOOL)scale { + [MFStyler styleLabelH32:self genericScaling:NO]; [self setScale:scale]; } @@ -421,18 +262,18 @@ [self setScale:scale]; } -- (void)styleTableRow:(BOOL)scale { - [MFStyler styleLabelB1:self genericScaling:NO]; +- (void)styleB2:(BOOL)scale { + [MFStyler styleLabelB2:self genericScaling:NO]; [self setScale:scale]; } -- (void)styleTopAlert:(BOOL)scale { - self.font = [MFStyler fontB1:NO]; +- (void)styleB3:(BOOL)scale { + [MFStyler styleLabelB3:self genericScaling:NO]; [self setScale:scale]; } -- (void)setFontH1:(BOOL)scale { - self.font = [MFStyler fontH1:NO]; +- (void)styleB20:(BOOL)scale { + [MFStyler styleLabelB20: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 2020d5c6..488a0648 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -104,6 +104,9 @@ B3 -> Legal //75Bd 18pt + (nullable UIFont *)fontH3:(BOOL)genericScaling; + (nullable UIFont *)fontH3; +//75Bd 32pt ++ (nullable UIFont *)fontH32:(BOOL)genericScaling; ++ (nullable UIFont *)fontH32; //75Bd 13pt + (nullable UIFont *)fontB1:(BOOL)genericScaling; @@ -114,10 +117,9 @@ B3 -> Legal //55Rg 11pt + (nullable UIFont *)fontB3:(BOOL)genericScaling; + (nullable UIFont *)fontB3; -//55Rg 14pt -+ (nullable UIFont *)fontB4:(BOOL)genericScaling; -+ (nullable UIFont *)fontB4; - +//55Rg 20pt ++ (nullable UIFont *)fontB20:(BOOL)genericScaling; ++ (nullable UIFont *)fontB20; #pragma mark - 1.0 fonts @@ -125,91 +127,48 @@ 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; -//75Bd 36pt -+ (nullable UIFont *)fontForHeadlineExtraLarge; -//75Bd 14pt -+ (nullable UIFont *)fontForSubheadBold; -//75Md 20pt -+ (nullable UIFont *)fontForSubheadBoldLarge; - //55Rg 14pt + (nullable UIFont *)fontforChatText; //55Rg 16pt + (nullable UIFont *)fontForAccountLandingGreeting; -//55Rg 20pt -+ (nullable UIFont *)fontForBodyLarge; -//Bold System 13 -+ (nullable UIFont *)fontForBodyBold; - //55Rg 10pt + (nullable UIFont *)fontForProgressBarBottomLabel; //55Rg 14pt + (nullable UIFont *)fontForPrimaryButton; -//55Rg 12pt +//75Bd 11pt + (nullable UIFont *)fontForSmallButton; -//45Lt 20pt +//55Rg 16pt + (nullable UIFont *)fontForTextField; //55Rg 12pt + (nullable UIFont *)fontForTextFieldUnderLabel; -//45Lt 24pt +//55Rg 24pt + (nullable UIFont *)fontForHeadlineAlternative; -//65Md 16pt +//75Bd 16pt + (nullable UIFont *)fontForFeedCardTitle; -//65Md 18pt -+ (nullable UIFont *)fontForSupportQuestionMark; -//65Md 11pt -+ (nullable UIFont *)fontForSupportDateStamp; -//65Md 10pt -+ (nullable UIFont *)fontForProgressBarTopLabel; -//75Bd 20pt -+ (nullable UIFont *)fontForPlanCardTitle; -//75Bd 18pt -+ (nullable UIFont *)fontForAccesseriesHeadline; //75Bd 60pt + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle; //75Bd 42pt + (nullable UIFont *)fontForLoyaltyTitleSmall; //55Rg 20pt + (nullable UIFont *)fontForLoyaltyMessage; -//45Lt 24pt only for support +//75Bd 10pt only for support + (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 *)fontForBiggerHeadLine:(BOOL)genericScaling; ++ (nullable UIFont *)fontForPlan:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling; ++ (nullable UIFont *)fontForHeadlineSmall2; + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; -+ (nullable UIFont *)fontForHeadlineLarge:(BOOL)genericScaling; -+ (nullable UIFont *)fontForHeadlineExtraLarge:(BOOL)genericScaling; + (nullable UIFont *)fontB1ForWidth:(CGFloat)size; -+ (nullable UIFont *)fontForSubheadBold:(BOOL)genericScaling; -+ (nullable UIFont *)fontForSubheadBoldLarge:(BOOL)genericScaling; + (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 *)fontForBodyBold:(BOOL)genericScaling; + (nullable UIFont *)fontForPrimaryButton:(BOOL)genericScaling; + (nullable UIFont *)fontForPrimaryButtonForWidth:(CGFloat)size; @@ -221,11 +180,6 @@ B3 -> Legal + (nullable UIFont *)fontForHeadlineAlternativeForWidth:(CGFloat)size; + (nullable UIFont *)fontForFeedCardTitle:(BOOL)genericScaling; -+ (nullable UIFont *)fontForSupportQuestionMark:(BOOL)genericScaling; -+ (nullable UIFont *)fontForSupportDateStamp:(BOOL)genericScaling; -+ (nullable UIFont *)fontForProgressBarTopLabel:(BOOL)genericScaling; -+ (nullable UIFont *)fontForPlanCardTitle:(BOOL)genericScaling; -+ (nullable UIFont *)fontForAccesseriesHeadline:(BOOL)genericScaling; + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyTitleSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyMessage:(BOOL)genericScaling; @@ -251,83 +205,52 @@ B3 -> Legal + (void)styleLabelH3:(nonnull UILabel *)label; + (void)styleLabelH3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; ++ (void)styleLabelH32:(nonnull UILabel *)label; ++ (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + + (void)styleLabelB1:(nonnull UILabel *)label; + (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; ++ (void)styleLabelB2:(nonnull UILabel *)label; + (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelB2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling; + (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelB3:(nonnull UILabel *)label; -+ (void)styleLabelB4:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelB4:(nonnull UILabel *)label; ++ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; ++ (void)styleLabelB20:(nonnull UILabel *)label; + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelTextStyle2:(nonnull UILabel *)label; #pragma mark - 1.0 styles -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label; -+ (void)styleLabelHeadlineExtraLarge:(nonnull UILabel *)label; -+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; -+ (void)styleLabelFeedMessage:(nonnull UILabel *)label; -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label; -+ (void)styleLabelSubheadBold:(nonnull UILabel *)label; -+ (void)styleLabelB2:(nonnull UILabel *)label; -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label; -+ (void)styleLabelBodyBold:(nonnull UILabel *)label; -+ (void)styleLabelBodyLighter:(nonnull UILabel *)label; - - + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; + (void)styleFeedCardTagLabel:(nonnull UILabel *)label; - + (void)styleStandardSeparatorView:(nonnull UIView *)view; + (void)styleLabelHeadlineSmall:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelHeadlineExtraLarge:(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)styleLabelHeadlineBlack:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling; -+ (void)styleLabelSubheadBold:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelSubheadBoldLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelBodyBold:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelBodyLighter:(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)styleSetLabelTextWithHeadlineExtraLarge:(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)styleSetLabelTextWithBodyBold:(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 *)styleGetHeadlineExtraLargeAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetBodyBoldAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetDisabledBodyAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetLegalAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetH1AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetH2AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetH3AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string; + ++ (nonnull NSAttributedString *)styleGetDisabledB2AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetDisabledB1AttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftString:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color; + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftStringRightTop:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color; + (void)styleGetAlignCenteredAttrituedString:(nullable NSMutableAttributedString *)string; @@ -336,6 +259,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 4367b37e..36d04e51 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -126,15 +126,68 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontH3:YES]; } -#pragma mark - Fonts - -+ (nullable UIFont *)fontForHeadlineWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling { ++ (nullable UIFont *)fontH32:(BOOL)genericScaling { + CGFloat size = 32; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; } return [MFFonts mfFont75Bd:size]; } ++ (nullable UIFont *)fontH32 { + return [self fontH32:YES]; +} + ++ (nullable UIFont *)fontB1:(BOOL)genericScaling { + CGFloat size = 13; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont75Bd:size]; +} + ++ (nullable UIFont *)fontB1 { + return [self fontB1:YES]; +} + ++ (nullable UIFont *)fontB2:(BOOL)genericScaling { + CGFloat size = 13; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; +} + ++ (nullable UIFont *)fontB2 { + return [self fontB2:YES]; +} + ++ (nullable UIFont *)fontB3:(BOOL)genericScaling { + CGFloat size = 11; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; +} + ++ (nullable UIFont *)fontB3 { + return [self fontB3:YES]; +} + ++ (nullable UIFont *)fontB20:(BOOL)genericScaling { + CGFloat size = 20; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; +} + ++ (nullable UIFont *)fontB20 { + return [self fontB20:YES]; +} + +#pragma mark - 1.0 Fonts + + (nullable UIFont *)fontForPlan:(BOOL)genericScaling { CGFloat size = 100; if (genericScaling) { @@ -143,6 +196,10 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } ++ (nullable UIFont *)fontForPlan { + return [self fontForPlan:YES]; +} + + (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling { CGFloat size = 48; if (genericScaling) { @@ -151,36 +208,8 @@ 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) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling { - CGFloat size = 20; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - -+ (nullable UIFont *)fontForFeedSubMessage:(BOOL)genericScaling { - CGFloat size = 11; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; ++ (nullable UIFont *)fontForBiggerHeadline { + return [self fontForBiggerHeadLine:YES]; } + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling { @@ -205,61 +234,12 @@ 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 *)fontForHeadlineExtraLarge:(BOOL)genericScaling { - CGFloat size = 36; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)commonLabelB1:(BOOL)genericScaling { - CGFloat size = 13; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)fontB1ForWidth:(CGFloat)size { CGFloat pointSize = 13; pointSize = [[MFStyler sizeObjectGenericForCurrentDevice:pointSize] getValueBasedOnSize:size]; return [MFFonts mfFont75Bd:pointSize]; } -+ (nullable UIFont *)fontForSubheadBold:(BOOL)genericScaling { - CGFloat size = 14; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - - -+ (nullable UIFont *)fontForSubheadBoldLarge:(BOOL)genericScaling { - CGFloat size = 20; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontB2:(BOOL)genericScaling { - CGFloat size = 13; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - + (nullable UIFont *)fontForBodyWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling { if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; @@ -294,30 +274,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 *)fontForBodyBold:(BOOL)genericScaling { - CGFloat size = 13; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontB3:(BOOL)genericScaling { - CGFloat size = 11; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - + (nullable UIFont *)fontForProgressBarBottomLabel:(BOOL)genericScaling { CGFloat size = 10; if (genericScaling) { @@ -326,14 +282,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont55Rg:size]; } -+ (nullable UIFont *)fontB1:(BOOL)genericScaling { - CGFloat size = 13; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)fontForPrimaryButton:(BOOL)genericScaling { CGFloat size = 14; if (genericScaling) { @@ -416,54 +364,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } -+ (nullable UIFont *)fontB4:(BOOL)genericScaling { - CGFloat size = 14; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - -+ (nullable UIFont *)fontForSupportQuestionMark:(BOOL)genericScaling { - CGFloat size = 18; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForSupportDateStamp:(BOOL)genericScaling { - CGFloat size = 11; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForProgressBarTopLabel:(BOOL)genericScaling { - CGFloat size = 10; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForPlanCardTitle:(BOOL)genericScaling { - CGFloat size = 20; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForAccesseriesHeadline:(BOOL)genericScaling { - CGFloat size = 18.0; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle:(BOOL)genericScaling { CGFloat size = 60; if (genericScaling) { @@ -510,62 +410,14 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFontOcratxt:size]; } -+ (nullable UIFont *)fontForPlan { - return [self fontForPlan:YES]; -} - -+ (nullable UIFont *)fontForBiggerHeadline { - return [self fontForBiggerHeadLine:YES]; -} - -+ (nullable UIFont *)fontForLoyaltySignUpHeadLine { - return [self fontForLoyaltySignUpHeadLine:YES]; -} - -+ (nullable UIFont *)fontForFeedHeadline { - return [self fontForFeedHeadline:YES]; -} - -+ (nullable UIFont *)fontForFeedMessage { - return [self fontForFeedMessage:YES]; -} - -+ (nullable UIFont *)fontForFeedSubMessage { - return [self fontForFeedSubMessage:YES]; -} - + (nullable UIFont *)fontForHeadlineSmall { return [self fontForHeadlineSmall:YES]; } -+ (nullable UIFont *)fontForHeadlineTiny { - return [MFFonts mfFont75Bd:11]; -} - + (nullable UIFont *)fontForHeadlineSmall2 { return [self fontForHeadlineSmall2:YES]; } -+ (nullable UIFont *)fontForHeadlineLarge { - return [self fontForHeadlineLarge:YES]; -} - -+ (nullable UIFont *)fontForHeadlineExtraLarge { - return [self fontForHeadlineExtraLarge:YES]; -} - -+ (nullable UIFont *)fontForSubheadBold { - return [self fontForSubheadBold:YES]; -} - -+ (nullable UIFont *)fontForSubheadBoldLarge { - return [self fontForSubheadBoldLarge:YES]; -} - -+ (nullable UIFont *)fontB2 { - return [self fontB2:YES]; -} - + (nullable UIFont *)fontforChatText { return [self fontforChatText:NO]; } @@ -574,26 +426,10 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForAccountLandingGreeting:YES]; } -+ (nullable UIFont *)fontForBodyLarge { - return [self fontForBodyLarge:YES]; -} - -+ (nullable UIFont *)fontForBodyBold { - return [self fontForBodyBold:YES]; -} - -+ (nullable UIFont *)fontB3 { - return [self fontB3:YES]; -} - + (nullable UIFont *)fontForProgressBarBottomLabel { return [self fontForProgressBarBottomLabel:YES]; } -+ (nullable UIFont *)fontB1 { - return [self fontB1:YES]; -} - + (nullable UIFont *)fontForPrimaryButton { return [self fontForPrimaryButton:YES]; } @@ -618,30 +454,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForFeedCardTitle:YES]; } -+ (nullable UIFont *)fontB4 { - return [self fontB4:YES]; -} - -+ (nullable UIFont *)fontForSupportQuestionMark { - return [self fontForSupportQuestionMark:YES]; -} - -+ (nullable UIFont *)fontForSupportDateStamp { - return [self fontForSupportDateStamp:YES]; -} - -+ (nullable UIFont *)fontForProgressBarTopLabel { - return [self fontForProgressBarTopLabel:YES]; -} - -+ (nullable UIFont *)fontForPlanCardTitle { - return [self fontForPlanCardTitle:YES]; -} - -+ (nullable UIFont *)fontForAccesseriesHeadline { - return [self fontForAccesseriesHeadline:YES]; -} - + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle { return [self fontForLargeLoyaltyHeaderTitle:YES]; } @@ -686,29 +498,44 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; [self styleLabelH2:label genericScaling:YES]; } -+ (void)styleLabelH3:(nonnull UILabel *)label { - label.font = [MFStyler fontH3]; - label.textColor = [UIColor blackColor]; -} - + (void)styleLabelH3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontH3:genericScaling]; label.textColor = [UIColor blackColor]; } ++ (void)styleLabelH3:(nonnull UILabel *)label { + [self styleLabelH3:label genericScaling:YES]; +} + ++ (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + label.font = [MFStyler fontH32:genericScaling]; + label.textColor = [UIColor blackColor]; +} + ++ (void)styleLabelH32:(nonnull UILabel *)label { + [self styleLabelH32:label genericScaling:YES]; +} + + (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB1:genericScaling]; label.textColor = [UIColor blackColor]; } ++ (void)styleLabelB1:(nonnull UILabel *)label { + [self styleLabelB1:label genericScaling:YES]; +} + + (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB2:genericScaling]; label.textColor = [UIColor blackColor]; } ++ (void)styleLabelB2:(nonnull UILabel *)label { + [self styleLabelB2:label genericScaling:YES]; +} + + (void)styleLabelB2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForBodyWithSize:size genericScaling:genericScaling]; - label.textColor = [UIColor blackColor]; } + (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -717,18 +544,16 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (void)styleLabelB3:(nonnull UILabel *)label { - label.font = [MFStyler fontB3]; - label.textColor = [UIColor mfBattleshipGrey]; + [self styleLabelB3:label genericScaling:YES]; } -+ (void)styleLabelB4:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontB4:genericScaling]; ++ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + label.font = [MFStyler fontB20:genericScaling]; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelB4:(nonnull UILabel *)label { - label.font = [MFStyler fontB4]; - label.textColor = [UIColor blackColor]; ++ (void)styleLabelB20:(nonnull UILabel *)label { + [self styleLabelB20:label genericScaling:YES]; } + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -737,67 +562,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (void)styleLabelTextStyle2:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor mfBattleshipGrey]; + [self styleLabelTextStyle2:label genericScaling:YES]; } -+ (void)styleLabelFeedMessage:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedMessage]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedMessage]; - label.textColor = [UIColor blackColor]; -} #pragma mark - 1.0 Styles -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label { - label.font = [MFStyler fontForHeadlineLarge]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelHeadlineExtraLarge:(nonnull UILabel *)label { - label.font = [MFStyler fontForHeadlineExtraLarge]; - label.textColor = [UIColor mfRedColor]; -} - -+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedHeadline]; - label.textColor = [UIColor mfRedColor]; -} - -+ (void)styleLabelSubheadBold:(nonnull UILabel *)label { - label.font = [MFStyler fontForSubheadBold]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelB2:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label { - label.font = [MFStyler fontForBodyLarge]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelBodyBold:(nonnull UILabel *)label { - label.font = [MFStyler fontForBodyBold]; - label.textColor = [UIColor mfCharcoalColor]; -} - -+ (void)styleLabelBodyLighter:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor mfGrayColor]; -} - -+ (void)styleLabelB1:(nonnull UILabel *)label { - label.font = [MFStyler fontB1]; - label.textColor = [UIColor blackColor]; -} - + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label { label.font = [MFStyler fontForFeedCardTitle]; label.textColor = [UIColor blackColor]; @@ -808,78 +578,15 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfBrownishGrey]; } - + (void)styleStandardSeparatorView:(nonnull UIView *)view { [view setBackgroundColor:[UIColor mfBackgroundGray]]; } - + (void)styleLabelHeadlineSmall:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForHeadlineSmall:genericScaling]; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForHeadlineLarge:genericScaling]; - label.textColor = [UIColor mfRedColor]; -} - -+ (void)styleLabelHeadlineExtraLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForHeadlineExtraLarge:genericScaling]; - label.textColor = [UIColor mfRedColor]; -} - -+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForFeedHeadline:genericScaling]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForFeedMessage:genericScaling]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - 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)styleLabelHeadlineBlack:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForHeadlineWithSize:size genericScaling:genericScaling]; - label.textColor = [UIColor blackColor]; -} - - -+ (void)styleLabelSubheadBold:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForSubheadBold:genericScaling]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelSubheadBoldLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForSubheadBoldLarge:genericScaling]; - label.textColor = [UIColor blackColor]; -} - - -+ (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForBodyLarge:genericScaling]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelBodyBold:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForBodyBold:genericScaling]; - label.textColor = [UIColor mfCharcoalColor]; -} - -+ (void)styleLabelBodyLighter:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontB2:genericScaling]; - label.textColor = [UIColor mfGrayColor]; -} - + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForFeedCardTitle:genericScaling]; label.textColor = [UIColor blackColor]; @@ -890,42 +597,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)styleSetLabelTextWithHeadlineExtraLarge:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelHeadlineExtraLarge:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithH3:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelH3:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithB2:(nonnull UILabel *)label text:(nullable NSString *)text { - [MFStyler styleLabelB2:label]; - label.text = text; -} - -+ (void)styleSetLabelTextWithBodyBold:(UILabel *)label text:(NSString *)text { - [MFStyler styleLabelBodyBold: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 { @@ -942,46 +613,38 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return attributedString; } -+ (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor mfRedColor]]; ++ (nonnull NSAttributedString *)styleGetH1AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontH1] color:[UIColor blackColor]]; } -+ (nonnull NSAttributedString *)styleGetHeadlineLargeAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineLarge] color:[UIColor mfRedColor]]; ++ (nonnull NSAttributedString *)styleGetH2AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor blackColor]]; } -+ (nonnull NSAttributedString *)styleGetHeadlineExtraLargeAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineExtraLarge] color:[UIColor mfRedColor]]; -} - -+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetH3AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]]; } -+ (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor blackColor]]; -} - -+ (nonnull NSAttributedString *)styleGetDisabledBodyAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor mfLighterGrayColor]]; -} - -+ (nonnull NSAttributedString *)styleGetBodyBoldAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontForBodyBold] color:[UIColor mfCharcoalColor]]; -} - -+ (nonnull NSAttributedString *)styleGetLegalAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfGrayColor]]; -} - -+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor blackColor]]; } -+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor blackColor]]; +} + ++ (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfBattleshipGrey]]; +} + ++ (nonnull NSAttributedString *)styleGetDisabledB1AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfLighterGrayColor]]; } ++ (nonnull NSAttributedString *)styleGetDisabledB2AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor mfLighterGrayColor]]; +} + + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftString:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color { if (left == nil){ left = @""; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 3d212499..cc1df5e6 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -20,25 +20,18 @@ #pragma mark - 2.0 labels ++ (nonnull UILabel *)commonLabelH1; + (nonnull UILabel *)commonLabelH2; + (nonnull UILabel *)commonLabelH3; ++ (nonnull UILabel *)commonLabelH32; + (nonnull UILabel *)commonLabelB1; + (nonnull UILabel *)commonLabelB2; + (nonnull UILabel *)commonLabelB3; -+ (nonnull UILabel *)commonLabelB4; #pragma mark - Labels // Creates and returns common labels + (nonnull UILabel *)label; -+ (nonnull UILabel *)commonLabelHeadlineLarge; -+ (nonnull UILabel *)commonLabelHeadlineExtraLarge; -+ (nonnull UILabel *)commonLabelHeadlineFeed; -+ (nonnull UILabel *)commonLabelSubheadBold; -+ (nonnull UILabel *)commonLabelBodyBold; -+ (nonnull UILabel *)commonLabelBodyLarge; -+ (nonnull UILabel *)commonLabelBodyLighter; -+ (nonnull UILabel *)commonLabelFeedTitle; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index a8a90a50..affbc470 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -53,21 +53,9 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelHeadlineLarge { ++ (nonnull UILabel *)commonLabelH1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineLarge:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelHeadlineExtraLarge { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineExtraLarge:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelHeadlineFeed { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; + [MFStyler styleLabelH1:label]; return label; } @@ -83,39 +71,9 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelSubheadBold { ++ (nonnull UILabel *)commonLabelH32 { UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelSubheadBold:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelBody { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelB2:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelBodyBold { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyBold:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelBodyLarge { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyLarge:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelBodyLighter { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyLighter:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelFeedTitle { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleFeedCardTitleLabel:label]; + [MFStyler styleLabelH32:label]; return label; } @@ -137,12 +95,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelB4 { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelB4:label]; - return label; -} - #pragma mark - Text Field + (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id )delegate {