From 6ee6170031651b2914dbcf448f27ddaad7f3ff13 Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 10:43:09 -0400 Subject: [PATCH] remove feedsubmessage --- MVMCoreUI/Atoms/Views/MFLabel.h | 3 --- MVMCoreUI/Atoms/Views/MFLabel.m | 11 ----------- MVMCoreUI/Styles/MFStyler.h | 5 ----- MVMCoreUI/Styles/MFStyler.m | 22 ---------------------- 4 files changed, 41 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index d1dd36bc..45710013 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -43,8 +43,6 @@ + (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale; //55Rg 20pt + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; -//55Rg 11pt -+ (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale; #pragma mark - 1.0 @@ -67,7 +65,6 @@ - (void)styleB3:(BOOL)scale; - (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale; -- (void)styleFeedSubMessage:(BOOL)scale; - (void)styleFeedTitle:(BOOL)scale; - (void)styleHeadlineSmall:(BOOL)scale; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 513326a9..4e6637a8 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -154,12 +154,6 @@ return label; } -+ (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedSubMessage:scale]; - return label; -} - #pragma mark - 1.0 + (nonnull MFLabel *)label { @@ -298,11 +292,6 @@ [self setScale:scale]; } -- (void)styleFeedSubMessage:(BOOL)scale { - [MFStyler styleLabelFeedSubMessage:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)styleHeadlineSmall:(BOOL)scale { [MFStyler styleLabelHeadlineSmall:self genericScaling:NO]; [self setScale:scale]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index cf8f878a..c60c853b 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -120,8 +120,6 @@ B3 -> Legal //55Rg 20pt + (nullable UIFont *)fontForFeedMessage; -//55Rg 11pt -+ (nullable UIFont *)fontForFeedSubMessage; #pragma mark - 1.0 fonts @@ -176,7 +174,6 @@ B3 -> Legal // Returns the fonts for these styles allowing to apply a generic scale by device or not. + (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; @@ -244,7 +241,6 @@ B3 -> Legal + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; + (void)styleLabelFeedMessage:(nonnull UILabel *)label; -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label; + (void)styleLabelB2:(nonnull UILabel *)label; @@ -257,7 +253,6 @@ B3 -> Legal + (void)styleLabelHeadlineSmall:(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)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTagLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index c37e9746..170b16c0 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -160,14 +160,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont55Rg:size]; } -+ (nullable UIFont *)fontForFeedSubMessage:(BOOL)genericScaling { - CGFloat size = 11; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; -} - + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling { CGFloat size = 15; if (genericScaling) { @@ -446,10 +438,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForFeedMessage:YES]; } -+ (nullable UIFont *)fontForFeedSubMessage { - return [self fontForFeedSubMessage:YES]; -} - + (nullable UIFont *)fontForHeadlineSmall { return [self fontForHeadlineSmall:YES]; } @@ -630,11 +618,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedMessage]; - label.textColor = [UIColor blackColor]; -} - #pragma mark - 1.0 Styles + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label { @@ -681,11 +664,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForFeedSubMessage:genericScaling]; - label.textColor = [UIColor blackColor]; -} - + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForFeedCardTitle:genericScaling]; label.textColor = [UIColor blackColor];