From 4240b6a2f4aa3952bd619d947ed195278b26f107 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 16:35:55 -0400 Subject: [PATCH] change body bold to b1 --- MVMCoreUI/Atoms/Views/MFLabel.m | 5 --- MVMCoreUI/Styles/MFStyler.h | 8 +---- MVMCoreUI/Styles/MFStyler.m | 31 ++----------------- .../Utility/MVMCoreUICommonViewsUtility.m | 6 ---- 4 files changed, 3 insertions(+), 47 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index feda5c15..28808106 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -314,11 +314,6 @@ [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]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 2020d5c6..69e5bb55 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -154,8 +154,6 @@ B3 -> Legal + (nullable UIFont *)fontForAccountLandingGreeting; //55Rg 20pt + (nullable UIFont *)fontForBodyLarge; -//Bold System 13 -+ (nullable UIFont *)fontForBodyBold; //55Rg 10pt + (nullable UIFont *)fontForProgressBarBottomLabel; @@ -209,7 +207,6 @@ B3 -> Legal + (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; @@ -276,7 +273,6 @@ B3 -> Legal + (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; @@ -297,7 +293,6 @@ B3 -> Legal + (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; @@ -312,7 +307,6 @@ B3 -> Legal + (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 @@ -323,7 +317,7 @@ B3 -> Legal + (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 *)styleGetB1AttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetDisabledBodyAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetLegalAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 4367b37e..a83340f9 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -302,14 +302,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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) { @@ -578,10 +570,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForBodyLarge:YES]; } -+ (nullable UIFont *)fontForBodyBold { - return [self fontForBodyBold:YES]; -} - + (nullable UIFont *)fontB3 { return [self fontB3:YES]; } @@ -783,11 +771,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; @@ -870,11 +853,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; @@ -916,11 +894,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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; @@ -966,8 +939,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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 *)styleGetB1AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfCharcoalColor]]; } + (nonnull NSAttributedString *)styleGetLegalAttributedString:(nullable NSString *)string { diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 0f887033..f55c417f 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -101,12 +101,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelBodyLighter { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyLighter:label]; - return label; -} - + (nonnull UILabel *)commonLabelFeedTitle { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleFeedCardTitleLabel:label];