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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/move_legacy

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-04-27 13:19:55 -04:00
commit 83adea0195
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MVMCoreUI/Utility/MFFonts.m
View File

@ -84,15 +84,19 @@ NSString * const DS55Rg = @"NHaasGroteskDSStd-55Rg";
+ (nonnull UIFont *)mfFont75Bd:(CGFloat)size { + (nonnull UIFont *)mfFont75Bd:(CGFloat)size {
[self loadMVMFonts]; if (size >= 15) {
UIFont *font = [UIFont fontWithName:DS75Bd size:size]; return [MFFonts mfFontDSBold:size];
return font ?: [UIFont boldSystemFontOfSize:size]; } else {
return [MFFonts mfFontTXBold:size];
}
} }
+ (nonnull UIFont *)mfFont55Rg:(CGFloat)size { + (nonnull UIFont *)mfFont55Rg:(CGFloat)size {
[self loadMVMFonts]; if (size >= 15) {
UIFont *font = [UIFont fontWithName:DS55Rg size:size]; return [MFFonts mfFontDSRegular:size];
return font ?: [UIFont systemFontOfSize:size]; } else {
return [MFFonts mfFontTXRegular:size];
}
} }
+ (nullable UIFont *)mfFontOcratxt:(CGFloat)size { + (nullable UIFont *)mfFontOcratxt:(CGFloat)size {