From 315ea87c10d71e30647b52a2edf7dc90c0c6b56c Mon Sep 17 00:00:00 2001 From: "Chowdhury, Shohrab" Date: Mon, 13 May 2019 15:51:21 -0400 Subject: [PATCH 1/5] add new font method for 5g --- MVMCoreUI/Styles/MFStyler.h | 3 +++ MVMCoreUI/Styles/MFStyler.m | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index 49f02db0..ddafe4c9 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -157,6 +157,9 @@ B3 -> Legal //75Bd 10pt only for support + (nullable UIFont *)fontForUnreadMessageOnSupport; +//55Rg 16pt ++(nullable UIFont *)fontFiveGMessage:(BOOL)genericScaling; + // 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; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index ca0fcd2e..45a881a0 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -347,6 +347,15 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } ++(nullable UIFont *)fontFiveGMessage:(BOOL)genericScaling { + CGFloat size = 16; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; +} + + + (nullable UIFont *)fontForHeadlineAlternative:(BOOL)genericScaling { CGFloat size = 24; if (genericScaling) { From bad190a3aba01748be52076b1f1ac9e5fe07e416 Mon Sep 17 00:00:00 2001 From: "Chowdhury, Shohrab" Date: Mon, 13 May 2019 15:59:10 -0400 Subject: [PATCH 2/5] update font name --- MVMCoreUI/Styles/MFStyler.h | 4 ++-- MVMCoreUI/Styles/MFStyler.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index ddafe4c9..09299a82 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -157,8 +157,8 @@ B3 -> Legal //75Bd 10pt only for support + (nullable UIFont *)fontForUnreadMessageOnSupport; -//55Rg 16pt -+(nullable UIFont *)fontFiveGMessage:(BOOL)genericScaling; +//55Rg 16pt for 5G flow ++ (nullable UIFont *)font5GMessage:(BOOL)genericScaling; // Returns the fonts for these styles allowing to apply a generic scale by device or not. + (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling; diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index 45a881a0..f31cb88c 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -356,7 +356,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } -+ (nullable UIFont *)fontForHeadlineAlternative:(BOOL)genericScaling { ++ (nullable UIFont *)font5GMessage:(BOOL)genericScaling; { CGFloat size = 24; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; From e4d8e3695ba2fc5eebb6964bd9ccf4d147cb6083 Mon Sep 17 00:00:00 2001 From: "Chowdhury, Shohrab" Date: Mon, 13 May 2019 16:02:04 -0400 Subject: [PATCH 3/5] update name method --- MVMCoreUI/Styles/MFStyler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index f31cb88c..e0fc8217 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -347,7 +347,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } -+(nullable UIFont *)fontFiveGMessage:(BOOL)genericScaling { ++(nullable UIFont *)font5GMessage:(BOOL)genericScaling { CGFloat size = 16; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; From 629c531d21dc3bc3b9f57cc329fdec36f8f0f962 Mon Sep 17 00:00:00 2001 From: "Chowdhury, Shohrab" Date: Mon, 13 May 2019 16:03:59 -0400 Subject: [PATCH 4/5] update name --- MVMCoreUI/Styles/MFStyler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index e0fc8217..d8eab822 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -356,7 +356,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } -+ (nullable UIFont *)font5GMessage:(BOOL)genericScaling; { ++ (nullable UIFont *)fontForHeadlineAlternative:(BOOL)genericScaling { CGFloat size = 24; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size]; From e949f6ec2fe72e9c74e7ba58cdc283855f528f23 Mon Sep 17 00:00:00 2001 From: "Chowdhury, Shohrab" Date: Mon, 13 May 2019 16:07:17 -0400 Subject: [PATCH 5/5] add space in method name --- MVMCoreUI/Styles/MFStyler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index d8eab822..a1e60db6 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -347,7 +347,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; return [MFFonts mfFont75Bd:size]; } -+(nullable UIFont *)font5GMessage:(BOOL)genericScaling { ++ (nullable UIFont *)font5GMessage:(BOOL)genericScaling { CGFloat size = 16; if (genericScaling) { size = [self sizeFontGenericForCurrentDevice:size];