From c2c6fdd524c8939315035bc38005c8df7d87302f Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 20 Jun 2022 12:55:42 -0400 Subject: [PATCH] Revert --- MVMCoreUI/Styles/MFStyler.m | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m index da7077ad..e65fddc5 100644 --- a/MVMCoreUI/Styles/MFStyler.m +++ b/MVMCoreUI/Styles/MFStyler.m @@ -294,7 +294,11 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling { - return [self getFontForStyleString:@"BoldFeatureSmall" genericScaling:genericScaling]; + CGFloat size = 48; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont75Bd:size]; } + (nullable UIFont *)fontForBiggerHeadline { @@ -302,11 +306,19 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling { - return [self getFontForStyleString:@"BoldTitleSmall" genericScaling:genericScaling]; + CGFloat size = 15; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont75Bd:size]; } + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling { - return [self getFontForStyleString:@"BoldTitleSmall" genericScaling:genericScaling]; + CGFloat size = 16; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont75Bd:size]; } + (nullable UIFont *)fontB1ForWidth:(CGFloat)size { @@ -330,11 +342,19 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (nullable UIFont *)fontforChatText:(BOOL)genericScaling { - return [self getFontForStyleString:@"RegularBodyMedium" genericScaling:genericScaling]; + CGFloat size = 14; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; } + (nullable UIFont *)fontForAccountLandingGreeting:(BOOL)genericScaling { - return [self getFontForStyleString:@"RegularBodyLarge" genericScaling:genericScaling]; + CGFloat size = 16; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; } + (nullable UIFont *)fontForProgressBarBottomLabel:(BOOL)genericScaling { @@ -378,7 +398,11 @@ CGFloat const LabelWithInternalButtonLineSpace = 2; } + (nullable UIFont *)font5GMessage:(BOOL)genericScaling { - return [self getFontForStyleString:@"RegularBodyLarge" genericScaling:genericScaling]; + CGFloat size = 16; + if (genericScaling) { + size = [self sizeFontGenericForCurrentDevice:size]; + } + return [MFFonts mfFont55Rg:size]; } + (nullable UIFont *)font5GMessage {