From ca1c77bc104e1b8db1c0a42b921b4615a3475406 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 17:13:20 -0400 Subject: [PATCH] remove plan card title --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- MVMCoreUI/Atoms/Views/MFLabel.m | 11 ----------- MVMCoreUI/Styles/MFStyler.h | 7 ++----- MVMCoreUI/Styles/MFStyler.m | 30 ------------------------------ 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 5cd9e730..d3025b13 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -48,7 +48,6 @@ + (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 @@ -68,7 +67,6 @@ - (void)styleB3:(BOOL)scale; - (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedTitle:(BOOL)scale; -- (void)stylePlanCardTitle:(BOOL)scale; - (void)styleB1:(BOOL)scale; - (void)styleTableRow:(BOOL)scale; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index a89473d5..7b40f0d5 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -195,12 +195,6 @@ return label; } -+ (nonnull MFLabel *)commonLabelPlanCardTitle:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label stylePlanCardTitle:scale]; - return label; -} - + (nonnull MFLabel *)commonLabelB1:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleB1:scale]; @@ -373,11 +367,6 @@ [self setScale:scale]; } -- (void)stylePlanCardTitle:(BOOL)scale { - self.font = [MFStyler fontForPlanCardTitle:NO]; - [self setScale:scale]; -} - - (void)styleB1:(BOOL)scale { [MFStyler styleLabelB1:self genericScaling:NO]; [self setScale:scale]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 74fc1cab..eef4125b 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -174,9 +174,7 @@ B3 -> Legal //65Md 10pt + (nullable UIFont *)fontForProgressBarTopLabel; //75Bd 20pt -+ (nullable UIFont *)fontForPlanCardTitle; -//75Bd 18pt -+ (nullable UIFont *)fontForAccesseriesHeadline; ++ (nullable UIFont *)fontH3; //75Bd 60pt + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle; //75Bd 42pt @@ -218,8 +216,7 @@ B3 -> Legal + (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 *)fontH3:(BOOL)genericScaling; + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyTitleSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyMessage:(BOOL)genericScaling; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index a556c3db..369079c2 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -432,22 +432,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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) { @@ -610,14 +594,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; } @@ -804,12 +780,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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];