From 124069c0be1402f871e531e534e3cab768f2ae4a Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 15:59:28 -0400 Subject: [PATCH 01/19] change body bold to b1 --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- MVMCoreUI/Atoms/Views/MFLabel.m | 12 ------------ MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h | 1 - MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m | 6 ------ 4 files changed, 21 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 193fe4fe..6e1b27dd 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -41,8 +41,6 @@ // 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; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index eb9ed1c6..feda5c15 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -116,18 +116,6 @@ 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]; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 3d212499..9b640c85 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -35,7 +35,6 @@ + (nonnull UILabel *)commonLabelHeadlineExtraLarge; + (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelSubheadBold; -+ (nonnull UILabel *)commonLabelBodyBold; + (nonnull UILabel *)commonLabelBodyLarge; + (nonnull UILabel *)commonLabelBodyLighter; + (nonnull UILabel *)commonLabelFeedTitle; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index a8a90a50..0f887033 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -95,12 +95,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelBodyBold { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelBodyBold:label]; - return label; -} - + (nonnull UILabel *)commonLabelBodyLarge { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelBodyLarge:label]; From 4240b6a2f4aa3952bd619d947ed195278b26f107 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 16:35:55 -0400 Subject: [PATCH 02/19] 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]; From 23f75ab2cc08aaa30b77f305dbf2bb7a81410d30 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 16:52:14 -0400 Subject: [PATCH 03/19] remove BodyLighter font and label --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- MVMCoreUI/Atoms/Views/MFLabel.m | 10 ---------- MVMCoreUI/Styles/MFStyler.h | 3 --- MVMCoreUI/Styles/MFStyler.m | 10 ---------- MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h | 1 - 5 files changed, 26 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 6e1b27dd..1ab5f5b6 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -41,7 +41,6 @@ // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -+ (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale; + (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; + (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale; @@ -59,7 +58,6 @@ - (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; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 28808106..af868946 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -116,11 +116,6 @@ 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]; @@ -314,11 +309,6 @@ [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]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 69e5bb55..c8f44aaa 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -273,7 +273,6 @@ B3 -> Legal + (void)styleLabelSubheadBold:(nonnull UILabel *)label; + (void)styleLabelB2:(nonnull UILabel *)label; + (void)styleLabelBodyLarge:(nonnull UILabel *)label; -+ (void)styleLabelBodyLighter:(nonnull UILabel *)label; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; @@ -293,8 +292,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)styleLabelBodyLighter:(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 a83340f9..8e403bdd 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -771,11 +771,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (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]; @@ -853,11 +848,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (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]; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 9b640c85..0fc001b3 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -36,7 +36,6 @@ + (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelSubheadBold; + (nonnull UILabel *)commonLabelBodyLarge; -+ (nonnull UILabel *)commonLabelBodyLighter; + (nonnull UILabel *)commonLabelFeedTitle; #pragma mark - Text Field From 6c7e7453586b570ff8833dd42abf8716db5af146 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 16:57:13 -0400 Subject: [PATCH 04/19] remove HeadlineExtraLarge --- MVMCoreUI/Atoms/Views/MFLabel.h | 1 - MVMCoreUI/Styles/MFStyler.h | 7 ---- MVMCoreUI/Styles/MFStyler.m | 35 ------------------- .../Utility/MVMCoreUICommonViewsUtility.h | 1 - .../Utility/MVMCoreUICommonViewsUtility.m | 6 ---- 5 files changed, 50 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 1ab5f5b6..4cd26fed 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -57,7 +57,6 @@ + (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)styleBodyLarge:(BOOL)scale; - (void)styleH1:(BOOL)scale; - (void)styleH2:(BOOL)scale; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index c8f44aaa..21e8f726 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -141,8 +141,6 @@ B3 -> Legal + (nullable UIFont *)fontForHeadlineSmall2; //75Bd 32pt + (nullable UIFont *)fontForHeadlineLarge; -//75Bd 36pt -+ (nullable UIFont *)fontForHeadlineExtraLarge; //75Bd 14pt + (nullable UIFont *)fontForSubheadBold; //75Md 20pt @@ -197,7 +195,6 @@ B3 -> Legal + (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; @@ -266,7 +263,6 @@ B3 -> Legal #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; @@ -283,7 +279,6 @@ B3 -> Legal + (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; @@ -301,7 +296,6 @@ B3 -> Legal + (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)styleSetLabelTextWithB3:(nonnull UILabel *)label text:(nullable NSString *)text; @@ -311,7 +305,6 @@ B3 -> Legal + (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 *)styleGetB1AttributedString:(nullable NSString *)string; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 8e403bdd..a556c3db 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -213,14 +213,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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) { @@ -542,10 +534,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForHeadlineLarge:YES]; } -+ (nullable UIFont *)fontForHeadlineExtraLarge { - return [self fontForHeadlineExtraLarge:YES]; -} - + (nullable UIFont *)fontForSubheadBold { return [self fontForSubheadBold:YES]; } @@ -746,11 +734,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; @@ -802,11 +785,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; @@ -869,15 +847,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; [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]; @@ -913,10 +882,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineLarge] color:[UIColor mfRedColor]]; } -+ (nonnull NSAttributedString *)styleGetHeadlineExtraLargeAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineExtraLarge] 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 0fc001b3..08392de6 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -32,7 +32,6 @@ // Creates and returns common labels + (nonnull UILabel *)label; + (nonnull UILabel *)commonLabelHeadlineLarge; -+ (nonnull UILabel *)commonLabelHeadlineExtraLarge; + (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelSubheadBold; + (nonnull UILabel *)commonLabelBodyLarge; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index f55c417f..52bff2f7 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -59,12 +59,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelHeadlineExtraLarge { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineExtraLarge:label]; - return label; -} - + (nonnull UILabel *)commonLabelHeadlineFeed { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelHeadlineFeed:label]; From 883c4b6ea2195ec3360761f826d598a7bd8b3fe5 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 17:02:17 -0400 Subject: [PATCH 05/19] remove headlineblack --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- MVMCoreUI/Atoms/Views/MFLabel.m | 11 ----------- MVMCoreUI/Styles/MFStyler.h | 1 - 3 files changed, 14 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 4cd26fed..5cd9e730 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -44,7 +44,6 @@ + (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; @@ -63,7 +62,6 @@ - (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; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index af868946..a89473d5 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -147,12 +147,6 @@ 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]; @@ -338,11 +332,6 @@ [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]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 21e8f726..74fc1cab 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -283,7 +283,6 @@ B3 -> Legal + (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; From ca1c77bc104e1b8db1c0a42b921b4615a3475406 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 17:13:20 -0400 Subject: [PATCH 06/19] 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]; From 5fa9bd15720f36ca35158526a9cfeb04b473cd00 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 27 Mar 2019 17:40:37 -0400 Subject: [PATCH 07/19] remove SubheadBold and SubheadBoldlarge --- MVMCoreUI/Atoms/Views/MFLabel.h | 9 --- MVMCoreUI/Atoms/Views/MFLabel.m | 55 ------------------- MVMCoreUI/Styles/MFStyler.h | 10 ---- MVMCoreUI/Styles/MFStyler.m | 53 ------------------ .../Utility/MVMCoreUICommonViewsUtility.h | 1 - .../Utility/MVMCoreUICommonViewsUtility.m | 6 -- 6 files changed, 134 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index d3025b13..c6288c09 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -44,11 +44,8 @@ + (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale; + (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; + (nonnull MFLabel *)commonLabelHeadlineWithSize:(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 *)commonLabelTopAlert:(BOOL)scale; // Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; @@ -62,15 +59,9 @@ - (void)styleHeadlineSmall:(BOOL)scale; - (void)styleHeadlineWithSize:(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)styleB1:(BOOL)scale; -- (void)styleTableRow:(BOOL)scale; - -// Without color -- (void)setFontH1:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 7b40f0d5..7a02ad78 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -153,18 +153,6 @@ return label; } -+ (nonnull MFLabel *)commonLabelSubheadBold:(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]; @@ -189,24 +177,12 @@ return label; } -+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedTitle:scale]; - return label; -} - + (nonnull MFLabel *)commonLabelB1:(BOOL)scale { MFLabel *label = [MFLabel label]; [label styleB1:scale]; return label; } -+ (nonnull MFLabel *)commonLabelTopAlert:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleTopAlert:scale]; - return label; -} - #pragma mark - Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { @@ -331,17 +307,6 @@ [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]; @@ -362,31 +327,11 @@ [self setScale:scale]; } -- (void)styleFeedTitle:(BOOL)scale { - [MFStyler styleFeedCardTitleLabel:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)styleB1:(BOOL)scale { [MFStyler styleLabelB1:self genericScaling:NO]; [self setScale:scale]; } -- (void)styleTableRow:(BOOL)scale { - [MFStyler styleLabelB1:self genericScaling:NO]; - [self setScale:scale]; -} - -- (void)styleTopAlert:(BOOL)scale { - self.font = [MFStyler fontB1:NO]; - [self setScale:scale]; -} - -- (void)setFontH1:(BOOL)scale { - self.font = [MFStyler fontH1:NO]; - [self setScale:scale]; -} - - (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits { if (accessibilityTraits& UIAccessibilityTraitHeader) { diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index eef4125b..d2c02a9a 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -141,10 +141,6 @@ B3 -> Legal + (nullable UIFont *)fontForHeadlineSmall2; //75Bd 32pt + (nullable UIFont *)fontForHeadlineLarge; -//75Bd 14pt -+ (nullable UIFont *)fontForSubheadBold; -//75Md 20pt -+ (nullable UIFont *)fontForSubheadBoldLarge; //55Rg 14pt + (nullable UIFont *)fontforChatText; @@ -194,8 +190,6 @@ B3 -> Legal + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; + (nullable UIFont *)fontForHeadlineLarge:(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; @@ -216,7 +210,6 @@ B3 -> Legal + (nullable UIFont *)fontForSupportQuestionMark:(BOOL)genericScaling; + (nullable UIFont *)fontForSupportDateStamp:(BOOL)genericScaling; + (nullable UIFont *)fontForProgressBarTopLabel:(BOOL)genericScaling; -+ (nullable UIFont *)fontH3:(BOOL)genericScaling; + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyTitleSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForLoyaltyMessage:(BOOL)genericScaling; @@ -263,7 +256,6 @@ B3 -> Legal + (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; @@ -280,8 +272,6 @@ B3 -> Legal + (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)styleLabelSubheadBold:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; -+ (void)styleLabelSubheadBoldLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 369079c2..ad1aee01 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -227,23 +227,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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) { @@ -518,14 +501,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForHeadlineLarge:YES]; } -+ (nullable UIFont *)fontForSubheadBold { - return [self fontForSubheadBold:YES]; -} - -+ (nullable UIFont *)fontForSubheadBoldLarge { - return [self fontForSubheadBoldLarge:YES]; -} - + (nullable UIFont *)fontB2 { return [self fontB2:YES]; } @@ -715,11 +690,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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]; @@ -735,22 +705,15 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedCardTitle]; - label.textColor = [UIColor blackColor]; -} - + (void)styleFeedCardTagLabel:(nonnull UILabel *)label { label.font = [MFStyler fontB3]; 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]; @@ -780,27 +743,11 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfRedColor]; } -+ (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)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForFeedCardTitle:genericScaling]; - label.textColor = [UIColor blackColor]; -} - + (void)styleFeedCardTagLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB3:genericScaling]; label.textColor = [UIColor mfBrownishGrey]; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 08392de6..aab5bd76 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -33,7 +33,6 @@ + (nonnull UILabel *)label; + (nonnull UILabel *)commonLabelHeadlineLarge; + (nonnull UILabel *)commonLabelHeadlineFeed; -+ (nonnull UILabel *)commonLabelSubheadBold; + (nonnull UILabel *)commonLabelBodyLarge; + (nonnull UILabel *)commonLabelFeedTitle; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 52bff2f7..1feb3e30 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -77,12 +77,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelSubheadBold { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelSubheadBold:label]; - return label; -} - + (nonnull UILabel *)commonLabelBody { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelB2:label]; From 3cc9750333d0c5213e707d9596063e34484f4eae Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 10:39:02 -0400 Subject: [PATCH 08/19] 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; } From 6ee6170031651b2914dbcf448f27ddaad7f3ff13 Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 10:43:09 -0400 Subject: [PATCH 09/19] 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]; From b43690d10ebbbec16b6e5d1d9ba2e0bcf0dae2bc Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 11:19:18 -0400 Subject: [PATCH 10/19] clean up some fonts method --- MVMCoreUI/Atoms/Views/MFLabel.h | 3 - MVMCoreUI/Atoms/Views/MFLabel.m | 11 -- MVMCoreUI/Styles/MFStyler.h | 23 ++- MVMCoreUI/Styles/MFStyler.m | 150 +++++++----------- .../Utility/MVMCoreUICommonViewsUtility.h | 3 +- .../Utility/MVMCoreUICommonViewsUtility.m | 16 +- 6 files changed, 72 insertions(+), 134 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 45710013..4b2d6f37 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -50,8 +50,6 @@ + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); //75Bd 15pt + (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; -//75Bd 16pt -+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale; // Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; @@ -66,7 +64,6 @@ - (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale; -- (void)styleFeedTitle:(BOOL)scale; - (void)styleHeadlineSmall:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 4e6637a8..9714fc57 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -166,12 +166,6 @@ return label; } -+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleFeedTitle:scale]; - return label; -} - #pragma mark - Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { @@ -297,11 +291,6 @@ [self setScale:scale]; } -- (void)styleFeedTitle:(BOOL)scale { - [MFStyler styleFeedCardTitleLabel:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits { if (accessibilityTraits& UIAccessibilityTraitHeader) { diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index c60c853b..f58610ab 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -114,11 +114,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 *)fontForFeedMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedMessage; #pragma mark - 1.0 fonts @@ -127,9 +125,8 @@ B3 -> Legal + (nullable UIFont *)fontForPlan; //75Bd 48pt + (nullable UIFont *)fontForBiggerHeadline; -//75Bd 40pt +//75Bd 32pt + (nullable UIFont *)fontForFeedHeadline; - //75Bd 15pt + (nullable UIFont *)fontForHeadlineSmall; //75Bd 11pt @@ -172,8 +169,9 @@ B3 -> Legal + (nullable UIFont *)fontForUnreadMessageOnSupport; // Returns the fonts for these styles allowing to apply a generic scale by device or not. ++ (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling; ++ (nullable UIFont *)fontForPlan:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling; -+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; @@ -225,15 +223,13 @@ B3 -> Legal + (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)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelTextStyle2:(nonnull UILabel *)label; @@ -241,13 +237,10 @@ B3 -> Legal + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; + (void)styleLabelFeedMessage:(nonnull UILabel *)label; -+ (void)styleLabelB2:(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; @@ -264,10 +257,12 @@ B3 -> Legal + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color; + (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string; ++ (nonnull NSAttributedString *)styleGetB3AttributedString:(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 *)styleGetTopAlignedAttributeStringWithLeftString:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 170b16c0..00e8c55c 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -126,8 +126,56 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontH3: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]; +} + #pragma mark - Fonts ++ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling { + CGFloat size = 20; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; +} + ++ (nullable UIFont *)fontForFeedMessage { + return [self fontForFeedMessage:YES]; +} + + (nullable UIFont *)fontForPlan:(BOOL)genericScaling { CGFloat size = 100; if (genericScaling) { @@ -136,6 +184,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) { @@ -144,6 +196,10 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } ++ (nullable UIFont *)fontForBiggerHeadline { + return [self fontForBiggerHeadLine:YES]; +} + + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling { CGFloat size = 32; if (genericScaling) { @@ -152,12 +208,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } -+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling { - CGFloat size = 20; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont55Rg:size]; ++ (nullable UIFont *)fontForFeedHeadline { + return [self fontForFeedHeadline:YES]; } + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling { @@ -182,28 +234,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:pointSize]; } -+ (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 *)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]; @@ -238,14 +274,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont55Rg: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) { @@ -254,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) { @@ -344,14 +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) { @@ -422,22 +434,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFontOcratxt:size]; } -+ (nullable UIFont *)fontForPlan { - return [self fontForPlan:YES]; -} - -+ (nullable UIFont *)fontForBiggerHeadline { - return [self fontForBiggerHeadLine:YES]; -} - -+ (nullable UIFont *)fontForFeedHeadline { - return [self fontForFeedHeadline:YES]; -} - -+ (nullable UIFont *)fontForFeedMessage { - return [self fontForFeedMessage:YES]; -} - + (nullable UIFont *)fontForHeadlineSmall { return [self fontForHeadlineSmall:YES]; } @@ -450,10 +446,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForHeadlineSmall2:YES]; } -+ (nullable UIFont *)fontB2 { - return [self fontB2:YES]; -} - + (nullable UIFont *)fontforChatText { return [self fontforChatText:NO]; } @@ -462,18 +454,10 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForAccountLandingGreeting: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]; } @@ -498,10 +482,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForFeedCardTitle:YES]; } -+ (nullable UIFont *)fontB4 { - return [self fontB4:YES]; -} - + (nullable UIFont *)fontForSupportQuestionMark { return [self fontForSupportQuestionMark:YES]; } @@ -593,16 +573,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfBattleshipGrey]; } -+ (void)styleLabelB4:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontB4:genericScaling]; - label.textColor = [UIColor blackColor]; -} - -+ (void)styleLabelB4:(nonnull UILabel *)label { - label.font = [MFStyler fontB4]; - label.textColor = [UIColor blackColor]; -} - + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB2:genericScaling]; label.textColor = [UIColor mfBattleshipGrey]; @@ -698,7 +668,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]]; } -+ (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor blackColor]]; } @@ -710,7 +680,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfCharcoalColor]]; } -+ (nonnull NSAttributedString *)styleGetLegalAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfGrayColor]]; } diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 9e3e2ad8..5220205b 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -26,7 +26,6 @@ + (nonnull UILabel *)commonLabelB1; + (nonnull UILabel *)commonLabelB2; + (nonnull UILabel *)commonLabelB3; -+ (nonnull UILabel *)commonLabelB4; #pragma mark - Labels @@ -34,7 +33,7 @@ + (nonnull UILabel *)label; + (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelFeedHeadline; -+ (nonnull UILabel *)commonLabelFeedTitle; ++ (nonnull UILabel *)commonLabelHeadlineSmall; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index a22c8e68..e870f1e7 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -77,21 +77,15 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelBody { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelB2:label]; - return label; -} - + (nonnull UILabel *)commonLabelFeedHeadline { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelHeadlineFeed:label]; return label; } -+ (nonnull UILabel *)commonLabelFeedTitle { ++ (nonnull UILabel *)commonLabelHeadlineSmall { UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleFeedCardTitleLabel:label]; + [MFStyler styleLabelHeadlineSmall:label genericScaling:YES]; return label; } @@ -113,12 +107,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 { From 0db36c1405564d5a61689c3f3a07b694470ec29f Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 28 Mar 2019 12:01:57 -0400 Subject: [PATCH 11/19] reduce fonts --- MVMCoreUI/Atoms/Views/MFLabel.h | 6 ----- MVMCoreUI/Atoms/Views/MFLabel.m | 13 ---------- MVMCoreUI/Styles/MFStyler.h | 4 ---- .../Utility/MVMCoreUICommonViewsUtility.h | 2 -- .../Utility/MVMCoreUICommonViewsUtility.m | 24 +++++-------------- 5 files changed, 6 insertions(+), 43 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 4b2d6f37..a5ca49ab 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -44,12 +44,8 @@ //55Rg 20pt + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; -#pragma mark - 1.0 - // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -//75Bd 15pt -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; // Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; @@ -64,6 +60,4 @@ - (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale; -- (void)styleHeadlineSmall:(BOOL)scale; - @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 9714fc57..0370e23f 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -154,18 +154,10 @@ return label; } -#pragma mark - 1.0 - + (nonnull MFLabel *)label { return [[MFLabel alloc] initWithFrame:CGRectZero]; } -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleHeadlineSmall:scale]; - return label; -} - #pragma mark - Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { @@ -286,11 +278,6 @@ [self setScale:scale]; } -- (void)styleHeadlineSmall:(BOOL)scale { - [MFStyler styleLabelHeadlineSmall:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits { if (accessibilityTraits& UIAccessibilityTraitHeader) { diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index f58610ab..41177f14 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -125,14 +125,10 @@ B3 -> Legal + (nullable UIFont *)fontForPlan; //75Bd 48pt + (nullable UIFont *)fontForBiggerHeadline; -//75Bd 32pt -+ (nullable UIFont *)fontForFeedHeadline; //75Bd 15pt + (nullable UIFont *)fontForHeadlineSmall; //75Bd 11pt + (nullable UIFont *)fontForHeadlineTiny; -//75Bd 16pt -+ (nullable UIFont *)fontForHeadlineSmall2; //55Rg 14pt + (nullable UIFont *)fontforChatText; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 5220205b..d8d5c27d 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -31,9 +31,7 @@ // Creates and returns common labels + (nonnull UILabel *)label; -+ (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelFeedHeadline; -+ (nonnull UILabel *)commonLabelHeadlineSmall; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index e870f1e7..dfae6b26 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -53,12 +53,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelHeadlineFeed { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; - return label; -} - + (nonnull UILabel *)commonLabelH1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelH1:label]; @@ -77,18 +71,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelFeedHeadline { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelHeadlineSmall { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineSmall:label genericScaling:YES]; - return label; -} - + (nonnull UILabel *)commonLabelB1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelB1:label]; @@ -107,6 +89,12 @@ static const CGFloat VertialShadowOffset = 6; return label; } ++ (nonnull UILabel *)commonLabelFeedHeadline { + UILabel *label = [MVMCoreUICommonViewsUtility label]; + [MFStyler styleLabelHeadlineFeed:label]; + return label; +} + #pragma mark - Text Field + (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id )delegate { From 560ea1030d606dd2d66884415bd12030f0f2bbcd Mon Sep 17 00:00:00 2001 From: panxi Date: Mon, 1 Apr 2019 12:01:44 -0400 Subject: [PATCH 12/19] add actions into mflabel --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 ++ MVMCoreUI/Atoms/Views/MFLabel.m | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index a5ca49ab..7a73e1df 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -20,6 +20,8 @@ // Set this to use a custom sizing object during updateView instead of the standard. @property (nonatomic, strong, nullable) MFSizeObject *sizeObject; +@property (nonatomic, strong, nullable) NSDictionary *actions; + // Set the font and set to scale - (void)setFont:(nonnull UIFont *)font scale:(BOOL)scale; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 0370e23f..0bf52d22 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -17,6 +17,8 @@ @import MVMCore.MVMCoreGetterUtility; @import MVMCore.NSDictionary_MFConvenience; @import MVMCore.MVMCoreJSONConstants; +@import MVMCore.MVMCoreActionHandler; +@import MVMCore.UILabel_MFCustom; @interface MFLabel () @@ -198,6 +200,7 @@ NSArray *attributes = [json array:@"attributes"]; if (attributes) { NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:label.text attributes:@{NSFontAttributeName:label.font,NSForegroundColorAttributeName:label.textColor}]; + NSMutableDictionary *actions = [NSMutableDictionary new]; for (NSDictionary *attribute in attributes) { NSNumber *location = [attribute optionalNumberForKey:@"location"]; NSNumber *length = [attribute optionalNumberForKey:@"length"]; @@ -225,10 +228,18 @@ if (font) { [attributedString addAttribute:NSFontAttributeName value:font range:range]; } + } else if ([type isEqualToString:@"link"]) { + label.userInteractionEnabled = YES; + [actions setObject:attribute forKey:[NSValue valueWithRange:range]]; } } } label.attributedText = attributedString; + if ([label isKindOfClass:[MFLabel class]]) { + MFLabel *mflabel = (MFLabel *)label; + mflabel.actions = actions; + } + } } } @@ -289,4 +300,25 @@ } +#pragma mark - action + +- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { + NSDictionary *actionMap = [self areTouchesInActionString:touches]; + if (actionMap) { + [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:nil delegate:nil]; + } +} + +- (NSDictionary *)areTouchesInActionString:(NSSet *)touches { + CGPoint location = [[touches anyObject] locationInView:self]; + for (NSValue *valueOfRange in self.actions.allKeys) { + NSRange range = [valueOfRange rangeValue]; + CGRect rect = [self boundingRectForCharacterRange:range]; + if (CGRectContainsPoint(rect, location)){ + return [self.actions objectForKey:valueOfRange]; + } + } + return nil; +} + @end From b70f27f67afc05a37440da92f8334bcac946bd4f Mon Sep 17 00:00:00 2001 From: panxi Date: Mon, 1 Apr 2019 14:53:29 -0400 Subject: [PATCH 13/19] change feed headline to H32 --- MVMCoreUI/Atoms/Views/MFLabel.h | 6 +- MVMCoreUI/Atoms/Views/MFLabel.m | 21 +++--- MVMCoreUI/Styles/MFStyler.h | 10 ++- MVMCoreUI/Styles/MFStyler.m | 64 +++++++++---------- .../Utility/MVMCoreUICommonViewsUtility.h | 2 +- .../Utility/MVMCoreUICommonViewsUtility.m | 12 ++-- 6 files changed, 59 insertions(+), 56 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 7a73e1df..f6dd14e1 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -35,14 +35,14 @@ + (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; -//75Bd 32pt -+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale; //55Rg 20pt + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; @@ -56,10 +56,10 @@ - (void)styleH1:(BOOL)scale; - (void)styleH2:(BOOL)scale; - (void)styleH3:(BOOL)scale; +- (void)styleH32:(BOOL)scale; - (void)styleB1:(BOOL)scale; - (void)styleB2:(BOOL)scale; - (void)styleB3:(BOOL)scale; -- (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 0bf52d22..0f57c944 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -125,6 +125,11 @@ [label styleH3:scale]; return label; } ++ (nonnull MFLabel *)commonLabelH32:(BOOL)scale { + MFLabel *label = [MFLabel label]; + [label styleH32:scale]; + return label; +} + (nonnull MFLabel *)commonLabelB1:(BOOL)scale { MFLabel *label = [MFLabel label]; @@ -144,12 +149,6 @@ 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]; @@ -264,6 +263,11 @@ [self setScale:scale]; } +- (void)styleH32:(BOOL)scale { + [MFStyler styleLabelH32:self genericScaling:NO]; + [self setScale:scale]; +} + - (void)styleB1:(BOOL)scale { [MFStyler styleLabelB1:self genericScaling:NO]; [self setScale:scale]; @@ -279,11 +283,6 @@ [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]; diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 41177f14..3ef51144 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; @@ -167,8 +170,8 @@ B3 -> Legal // Returns the fonts for these styles allowing to apply a generic scale by device or not. + (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling; + (nullable UIFont *)fontForPlan:(BOOL)genericScaling; -+ (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling; ++ (nullable UIFont *)fontForHeadlineSmall2; + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; + (nullable UIFont *)fontB1ForWidth:(CGFloat)size; @@ -216,6 +219,9 @@ 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; @@ -231,7 +237,6 @@ B3 -> Legal #pragma mark - 1.0 styles -+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; + (void)styleLabelFeedMessage:(nonnull UILabel *)label; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; @@ -240,7 +245,6 @@ B3 -> Legal + (void)styleStandardSeparatorView:(nonnull UIView *)view; + (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)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 00e8c55c..edeeb625 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -126,6 +126,18 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontH3:YES]; } ++ (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) { @@ -200,18 +212,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForBiggerHeadLine:YES]; } -+ (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling { - CGFloat size = 32; - if (genericScaling) { - size = [self sizeFontGenericForCurrentDevice:size]; - } - return [MFFonts mfFont75Bd:size]; -} - -+ (nullable UIFont *)fontForFeedHeadline { - return [self fontForFeedHeadline:YES]; -} - + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling { CGFloat size = 15; if (genericScaling) { @@ -548,11 +548,31 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } ++ (void)styleLabelH32:(nonnull UILabel *)label { + label.font = [MFStyler fontH32]; + label.textColor = [UIColor blackColor]; +} + ++ (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + label.font = [MFStyler fontH32:genericScaling]; + label.textColor = [UIColor blackColor]; +} + ++ (void)styleLabelB1:(nonnull UILabel *)label { + label.font = [MFStyler fontB1]; + label.textColor = [UIColor blackColor]; +} + + (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB1:genericScaling]; label.textColor = [UIColor blackColor]; } ++ (void)styleLabelB2:(nonnull UILabel *)label { + label.font = [MFStyler fontB2]; + label.textColor = [UIColor blackColor]; +} + + (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB2:genericScaling]; label.textColor = [UIColor blackColor]; @@ -590,21 +610,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; #pragma mark - 1.0 Styles -+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedHeadline]; - label.textColor = [UIColor mfRedColor]; -} - -+ (void)styleLabelB2:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor blackColor]; -} - -+ (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]; @@ -624,11 +629,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (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]; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index d8d5c27d..cc1df5e6 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -23,6 +23,7 @@ + (nonnull UILabel *)commonLabelH1; + (nonnull UILabel *)commonLabelH2; + (nonnull UILabel *)commonLabelH3; ++ (nonnull UILabel *)commonLabelH32; + (nonnull UILabel *)commonLabelB1; + (nonnull UILabel *)commonLabelB2; + (nonnull UILabel *)commonLabelB3; @@ -31,7 +32,6 @@ // Creates and returns common labels + (nonnull UILabel *)label; -+ (nonnull UILabel *)commonLabelFeedHeadline; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index dfae6b26..affbc470 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -71,6 +71,12 @@ static const CGFloat VertialShadowOffset = 6; return label; } ++ (nonnull UILabel *)commonLabelH32 { + UILabel *label = [MVMCoreUICommonViewsUtility label]; + [MFStyler styleLabelH32:label]; + return label; +} + + (nonnull UILabel *)commonLabelB1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelB1:label]; @@ -89,12 +95,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelFeedHeadline { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; - return label; -} - #pragma mark - Text Field + (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id )delegate { From 1baa755cae3881a8d039af8d44ea106cb56cbf9a Mon Sep 17 00:00:00 2001 From: panxi Date: Mon, 1 Apr 2019 15:05:42 -0400 Subject: [PATCH 14/19] change font to B20 form feed message --- MVMCoreUI/Atoms/Views/MFLabel.h | 4 ++-- MVMCoreUI/Atoms/Views/MFLabel.m | 8 ++++---- MVMCoreUI/Styles/MFStyler.h | 12 ++++++------ MVMCoreUI/Styles/MFStyler.m | 29 +++++++++++++++-------------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index f6dd14e1..896d1dca 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -44,7 +44,7 @@ //55Rg 11pt gray + (nonnull MFLabel *)commonLabelB3:(BOOL)scale; //55Rg 20pt -+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; ++ (nonnull MFLabel *)commonLabelB20:(BOOL)scale; // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); @@ -60,6 +60,6 @@ - (void)styleB1:(BOOL)scale; - (void)styleB2:(BOOL)scale; - (void)styleB3:(BOOL)scale; -- (void)styleFeedMessage:(BOOL)scale; +- (void)styleB20:(BOOL)scale; @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 0f57c944..c9d10129 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -149,9 +149,9 @@ return label; } -+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale { ++ (nonnull MFLabel *)commonLabelB20:(BOOL)scale { MFLabel *label = [MFLabel label]; - [label styleFeedMessage:scale]; + [label styleB20:scale]; return label; } @@ -283,8 +283,8 @@ [self setScale:scale]; } -- (void)styleFeedMessage:(BOOL)scale { - [MFStyler styleLabelFeedMessage:self genericScaling:NO]; +- (void)styleB20:(BOOL)scale { + [MFStyler styleLabelB20:self genericScaling:NO]; [self setScale:scale]; } diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 3ef51144..ef3fc8fa 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -117,10 +117,9 @@ B3 -> Legal //55Rg 11pt + (nullable UIFont *)fontB3:(BOOL)genericScaling; + (nullable UIFont *)fontB3; - //55Rg 20pt -+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling; -+ (nullable UIFont *)fontForFeedMessage; ++ (nullable UIFont *)fontB20:(BOOL)genericScaling; ++ (nullable UIFont *)fontB20; #pragma mark - 1.0 fonts @@ -232,20 +231,21 @@ B3 -> Legal + (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelB3:(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)styleLabelFeedMessage:(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)styleLabelFeedMessage:(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 edeeb625..433b0ff8 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -174,9 +174,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontB3:YES]; } -#pragma mark - Fonts - -+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling { ++ (nullable UIFont *)fontB20:(BOOL)genericScaling { CGFloat size = 20; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; @@ -184,10 +182,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont55Rg:size]; } -+ (nullable UIFont *)fontForFeedMessage { - return [self fontForFeedMessage:YES]; ++ (nullable UIFont *)fontB20 { + return [self fontB20:YES]; } +#pragma mark - 1.0 Fonts + + (nullable UIFont *)fontForPlan:(BOOL)genericScaling { CGFloat size = 100; if (genericScaling) { @@ -593,6 +593,16 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfBattleshipGrey]; } ++ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + label.font = [MFStyler fontB20:genericScaling]; + label.textColor = [UIColor blackColor]; +} + ++ (void)styleLabelB20:(nonnull UILabel *)label { + label.font = [MFStyler fontB20]; + label.textColor = [UIColor blackColor]; +} + + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontB2:genericScaling]; label.textColor = [UIColor mfBattleshipGrey]; @@ -603,10 +613,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor mfBattleshipGrey]; } -+ (void)styleLabelFeedMessage:(nonnull UILabel *)label { - label.font = [MFStyler fontForFeedMessage]; - label.textColor = [UIColor blackColor]; -} #pragma mark - 1.0 Styles @@ -629,11 +635,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { - label.font = [MFStyler fontForFeedMessage:genericScaling]; - label.textColor = [UIColor blackColor]; -} - + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { label.font = [MFStyler fontForFeedCardTitle:genericScaling]; label.textColor = [UIColor blackColor]; From 1f837786801f9849b0867eb20144ecdc9fdf8edc Mon Sep 17 00:00:00 2001 From: panxi Date: Mon, 1 Apr 2019 15:22:17 -0400 Subject: [PATCH 15/19] remove useless font --- MVMCoreUI/Styles/MFStyler.h | 23 +++++---------------- MVMCoreUI/Styles/MFStyler.m | 40 ------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index ef3fc8fa..64e406e7 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -129,41 +129,31 @@ B3 -> Legal + (nullable UIFont *)fontForBiggerHeadline; //75Bd 15pt + (nullable UIFont *)fontForHeadlineSmall; -//75Bd 11pt -+ (nullable UIFont *)fontForHeadlineTiny; - //55Rg 14pt + (nullable UIFont *)fontforChatText; //55Rg 16pt + (nullable UIFont *)fontForAccountLandingGreeting; - //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 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. @@ -190,9 +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 *)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 433b0ff8..48da21f3 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -364,30 +364,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd: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 *)fontForLargeLoyaltyHeaderTitle:(BOOL)genericScaling { CGFloat size = 60; if (genericScaling) { @@ -438,10 +414,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForHeadlineSmall:YES]; } -+ (nullable UIFont *)fontForHeadlineTiny { - return [MFFonts mfFont75Bd:11]; -} - + (nullable UIFont *)fontForHeadlineSmall2 { return [self fontForHeadlineSmall2:YES]; } @@ -482,18 +454,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [self fontForFeedCardTitle:YES]; } -+ (nullable UIFont *)fontForSupportQuestionMark { - return [self fontForSupportQuestionMark:YES]; -} - -+ (nullable UIFont *)fontForSupportDateStamp { - return [self fontForSupportDateStamp:YES]; -} - -+ (nullable UIFont *)fontForProgressBarTopLabel { - return [self fontForProgressBarTopLabel:YES]; -} - + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle { return [self fontForLargeLoyaltyHeaderTitle:YES]; } From 7d7284bd8d50202a10704a9de24d96b6979f2fcc Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 3 Apr 2019 12:21:31 -0400 Subject: [PATCH 16/19] remove actions from mflabel --- MVMCoreUI/Atoms/Views/MFLabel.h | 2 -- MVMCoreUI/Atoms/Views/MFLabel.m | 24 ------------------------ 2 files changed, 26 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 896d1dca..22308465 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -20,8 +20,6 @@ // Set this to use a custom sizing object during updateView instead of the standard. @property (nonatomic, strong, nullable) MFSizeObject *sizeObject; -@property (nonatomic, strong, nullable) NSDictionary *actions; - // Set the font and set to scale - (void)setFont:(nonnull UIFont *)font scale:(BOOL)scale; diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index c9d10129..c689e980 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -199,7 +199,6 @@ NSArray *attributes = [json array:@"attributes"]; if (attributes) { NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:label.text attributes:@{NSFontAttributeName:label.font,NSForegroundColorAttributeName:label.textColor}]; - NSMutableDictionary *actions = [NSMutableDictionary new]; for (NSDictionary *attribute in attributes) { NSNumber *location = [attribute optionalNumberForKey:@"location"]; NSNumber *length = [attribute optionalNumberForKey:@"length"]; @@ -229,14 +228,12 @@ } } else if ([type isEqualToString:@"link"]) { label.userInteractionEnabled = YES; - [actions setObject:attribute forKey:[NSValue valueWithRange:range]]; } } } label.attributedText = attributedString; if ([label isKindOfClass:[MFLabel class]]) { MFLabel *mflabel = (MFLabel *)label; - mflabel.actions = actions; } } @@ -299,25 +296,4 @@ } -#pragma mark - action - -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { - NSDictionary *actionMap = [self areTouchesInActionString:touches]; - if (actionMap) { - [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:nil delegate:nil]; - } -} - -- (NSDictionary *)areTouchesInActionString:(NSSet *)touches { - CGPoint location = [[touches anyObject] locationInView:self]; - for (NSValue *valueOfRange in self.actions.allKeys) { - NSRange range = [valueOfRange rangeValue]; - CGRect rect = [self boundingRectForCharacterRange:range]; - if (CGRectContainsPoint(rect, location)){ - return [self.actions objectForKey:valueOfRange]; - } - } - return nil; -} - @end From 4e328eeb83e01a8b88ef1c4c8b50e78ab63e66e3 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 3 Apr 2019 15:46:06 -0400 Subject: [PATCH 17/19] update label and styler --- MVMCoreUI/Atoms/Views/MFLabel.m | 6 ------ MVMCoreUI/Styles/MFStyler.m | 34 +++++++++++++-------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index c689e980..72d0d359 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -226,16 +226,10 @@ if (font) { [attributedString addAttribute:NSFontAttributeName value:font range:range]; } - } else if ([type isEqualToString:@"link"]) { - label.userInteractionEnabled = YES; } } } label.attributedText = attributedString; - if ([label isKindOfClass:[MFLabel class]]) { - MFLabel *mflabel = (MFLabel *)label; - } - } } } diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 48da21f3..fc9b0c6c 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -498,19 +498,13 @@ 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)styleLabelH32:(nonnull UILabel *)label { - label.font = [MFStyler fontH32]; - label.textColor = [UIColor blackColor]; ++ (void)styleLabelH3:(nonnull UILabel *)label { + [self styleLabelH3:label genericScaling:YES]; } + (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -518,9 +512,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelB1:(nonnull UILabel *)label { - label.font = [MFStyler fontB1]; - label.textColor = [UIColor blackColor]; ++ (void)styleLabelH32:(nonnull UILabel *)label { + [self styleLabelH32:label genericScaling:YES]; } + (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -528,9 +521,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; label.textColor = [UIColor blackColor]; } -+ (void)styleLabelB2:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor blackColor]; ++ (void)styleLabelB1:(nonnull UILabel *)label { + [self styleLabelB1:label genericScaling:YES]; } + (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -538,9 +530,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; 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 { @@ -549,8 +544,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (void)styleLabelB3:(nonnull UILabel *)label { - label.font = [MFStyler fontB3]; - label.textColor = [UIColor mfBattleshipGrey]; + [self styleLabelB3:label genericScaling:YES]; } + (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -559,8 +553,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (void)styleLabelB20:(nonnull UILabel *)label { - label.font = [MFStyler fontB20]; - label.textColor = [UIColor blackColor]; + [self styleLabelB20:label genericScaling:YES]; } + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { @@ -569,8 +562,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (void)styleLabelTextStyle2:(nonnull UILabel *)label { - label.font = [MFStyler fontB2]; - label.textColor = [UIColor mfBattleshipGrey]; + [self styleLabelTextStyle2:label genericScaling:YES]; } From b58c191401071322f97be1615855fa86a944a779 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 3 Apr 2019 16:12:27 -0400 Subject: [PATCH 18/19] update stylegetattributestring function name to 2.0 change grayish color to mfgraycolor for body lighter --- MVMCoreUI/Styles/MFStyler.h | 11 +++++------ MVMCoreUI/Styles/MFStyler.m | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 64e406e7..488a0648 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -242,16 +242,15 @@ B3 -> Legal #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 *)styleGetSubheadAttributedString:(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 *)styleGetDisabledBodyAttributedString:(nullable NSString *)string; - -+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string; -+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(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; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index fc9b0c6c..36d04e51 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -613,38 +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 *)styleGetSubheadAttributedString:(nullable NSString *)string { ++ (nonnull NSAttributedString *)styleGetH2AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor blackColor]]; +} + ++ (nonnull NSAttributedString *)styleGetH3AttributedString:(nullable NSString *)string { return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]]; } ++ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string { + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor blackColor]]; +} + + (nonnull NSAttributedString *)styleGetB2AttributedString:(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 *)styleGetB1AttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfCharcoalColor]]; -} - + (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfGrayColor]]; + return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfBattleshipGrey]]; } -+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string { - return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor blackColor]]; -} - -+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(nullable NSString *)string { ++ (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 = @""; From 30fe1c6a086d8b8ae776540ca9f6a2c87ccbfbc3 Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 4 Apr 2019 08:26:58 -0400 Subject: [PATCH 19/19] remove import for actions in mflabel --- MVMCoreUI/Atoms/Views/MFLabel.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 72d0d359..66b434e5 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -17,8 +17,6 @@ @import MVMCore.MVMCoreGetterUtility; @import MVMCore.NSDictionary_MFConvenience; @import MVMCore.MVMCoreJSONConstants; -@import MVMCore.MVMCoreActionHandler; -@import MVMCore.UILabel_MFCustom; @interface MFLabel ()