From fcc21ebf283657f0105fd544edfe32e082bdb700 Mon Sep 17 00:00:00 2001 From: "Xinlei(Ryan) Pan" Date: Wed, 26 Feb 2020 13:34:01 -0500 Subject: [PATCH] fix typo --- MVMCoreUI/Utility/MFFonts.h | 11 +++++------ MVMCoreUI/Utility/UIFont+FontWrapping.m | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Utility/MFFonts.h b/MVMCoreUI/Utility/MFFonts.h index 4bd1f532..46947581 100644 --- a/MVMCoreUI/Utility/MFFonts.h +++ b/MVMCoreUI/Utility/MFFonts.h @@ -17,17 +17,16 @@ extern NSString * _Nonnull const TXRegular; @interface MFFonts : NSObject -///return mfFontTXBold when size smaller than 15, otherwise, return mfFontDSBold -+ (nonnull UIFont *)mfFont75Bd:(CGFloat)size; -///return mfFontTXRegular when size smaller than 15, otherwise, return mfFontDSRegular -+ (nonnull UIFont *)mfFont55Rg:(CGFloat)size; - -//mva 3.0 font, should use mfFont75Bd/55Rg in most case. +//mva 3.0 font, should use MFStyler.getMVA3FontSize:bold: instead, in most case. + (nonnull UIFont *)mfFontDSBold:(CGFloat)size; + (nonnull UIFont *)mfFontDSRegular:(CGFloat)size; + (nonnull UIFont *)mfFontTXBold:(CGFloat)size; + (nonnull UIFont *)mfFontTXRegular:(CGFloat)size; +///return mfFontTXBold when size smaller than 15, otherwise, return mfFontDSBold ++ (nonnull UIFont *)mfFont75Bd:(CGFloat)size; +///return mfFontTXRegular when size smaller than 15, otherwise, return mfFontDSRegular ++ (nonnull UIFont *)mfFont55Rg:(CGFloat)size; + (nullable UIFont *)mfFontOcratxt:(CGFloat)size; + (nonnull UIFont *)mfFontWithName:(nonnull NSString *)name size:(CGFloat)size; diff --git a/MVMCoreUI/Utility/UIFont+FontWrapping.m b/MVMCoreUI/Utility/UIFont+FontWrapping.m index 8af7783d..a3fa2429 100644 --- a/MVMCoreUI/Utility/UIFont+FontWrapping.m +++ b/MVMCoreUI/Utility/UIFont+FontWrapping.m @@ -14,8 +14,10 @@ @implementation UIFont (FontWrapping) - (UIFont *)updateFontSize:(CGFloat)size { - if ([self.familyName isEqualToString:@"Verizon NHG eDS"] || [self.familyName isEqualToString:@"Verizon NHG eTX"]) { + if ([self.familyName isEqualToString:@"Verizon NHG eDS"]) { return [MFStyler getMVA3FontSize:size bold:[self.fontName isEqualToString:DSBold]]; + } else if ([self.familyName isEqualToString:@"Verizon NHG eTX"]) { + return [MFStyler getMVA3FontSize:size bold:[self.fontName isEqualToString:TXBold]]; } else { return [self fontWithSize:size]; }