mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/kevin

Browse Source
This commit is contained in:
Christiano, Kevin 2019-05-14 12:37:18 -04:00
commit 42bc51373a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MVMCoreUI/Styles/MFStyler.h
View File

@ -157,6 +157,9 @@ B3 -> Legal
//75Bd 10pt only for support //75Bd 10pt only for support
+ (nullable UIFont *)fontForUnreadMessageOnSupport; + (nullable UIFont *)fontForUnreadMessageOnSupport;
//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. // Returns the fonts for these styles allowing to apply a generic scale by device or not.
+ (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling; + (nullable UIFont *)fontForBiggerHeadLine:(BOOL)genericScaling;
+ (nullable UIFont *)fontForPlan:(BOOL)genericScaling; + (nullable UIFont *)fontForPlan:(BOOL)genericScaling;

9
MVMCoreUI/Styles/MFStyler.m
View File

@ -347,6 +347,15 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFFonts mfFont75Bd:size]; return [MFFonts mfFont75Bd:size];
} }
+ (nullable UIFont *)font5GMessage:(BOOL)genericScaling {
CGFloat size = 16;
if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size];
}
return [MFFonts mfFont55Rg:size];
}
+ (nullable UIFont *)fontForHeadlineAlternative:(BOOL)genericScaling { + (nullable UIFont *)fontForHeadlineAlternative:(BOOL)genericScaling {
CGFloat size = 24; CGFloat size = 24;
if (genericScaling) { if (genericScaling) {