Merge branch 'feature/font' into 'develop'
add 2.0 font back for march release See merge request BPHV_MIPS/mvm_core_ui!292
This commit is contained in:
Pfeil, Scott Robert
commit
13a8c58f27
@ -115,6 +115,8 @@
|
||||
8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */; };
|
||||
8D24041523E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */; };
|
||||
8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */; };
|
||||
942C372E241149170066E45E /* NHaasGroteskDSStd-75Bd.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */; };
|
||||
942C372F241149170066E45E /* NHaasGroteskDSStd-55Rg.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */; };
|
||||
9432A79F23DB47BA00719041 /* EntryFieldContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */; };
|
||||
943784F5236B77BB006A1E82 /* GraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F3236B77BB006A1E82 /* GraphView.swift */; };
|
||||
943784F6236B77BB006A1E82 /* GraphViewAnimationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */; };
|
||||
@ -464,6 +466,8 @@
|
||||
8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretModel.swift; sourceTree = "<group>"; };
|
||||
8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinksModel.swift; sourceTree = "<group>"; };
|
||||
9402C34F23A2CEA3004B974C /* LeftRightLabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftRightLabelModel.swift; sourceTree = "<group>"; };
|
||||
942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-75Bd.otf"; sourceTree = "<group>"; };
|
||||
942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-55Rg.otf"; sourceTree = "<group>"; };
|
||||
9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryFieldContainer.swift; sourceTree = "<group>"; };
|
||||
943784F3236B77BB006A1E82 /* GraphView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphView.swift; sourceTree = "<group>"; };
|
||||
943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphViewAnimationHandler.swift; sourceTree = "<group>"; };
|
||||
@ -1485,6 +1489,8 @@
|
||||
94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */,
|
||||
94CA227824058533002D6750 /* VerizonNHGeTX-Bold.otf */,
|
||||
94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */,
|
||||
942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */,
|
||||
942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */,
|
||||
D29DF31721ECECC0003B2FB9 /* OCRAExtended.ttf */,
|
||||
);
|
||||
path = Fonts;
|
||||
@ -1694,6 +1700,8 @@
|
||||
0A21DB86235E06EF00C160A2 /* MFTextField.xib in Resources */,
|
||||
94CA227D24058534002D6750 /* VerizonNHGeDS-Regular.otf in Resources */,
|
||||
D29DF32E21EE8C3D003B2FB9 /* Media.xcassets in Resources */,
|
||||
942C372E241149170066E45E /* NHaasGroteskDSStd-75Bd.otf in Resources */,
|
||||
942C372F241149170066E45E /* NHaasGroteskDSStd-55Rg.otf in Resources */,
|
||||
94CA227E24058534002D6750 /* VerizonNHGeDS-Bold.otf in Resources */,
|
||||
D29DF31B21ECECC0003B2FB9 /* OCRAExtended.ttf in Resources */,
|
||||
);
|
||||
|
||||
BIN
MVMCoreUI/SupportingFiles/Fonts/NHaasGroteskDSStd-55Rg.otf
Normal file
BIN
MVMCoreUI/SupportingFiles/Fonts/NHaasGroteskDSStd-55Rg.otf
Normal file
Binary file not shown.
BIN
MVMCoreUI/SupportingFiles/Fonts/NHaasGroteskDSStd-75Bd.otf
Normal file
BIN
MVMCoreUI/SupportingFiles/Fonts/NHaasGroteskDSStd-75Bd.otf
Normal file
Binary file not shown.
@ -14,6 +14,9 @@ extern NSString * _Nonnull const DSBold;
|
||||
extern NSString * _Nonnull const DSRegular;
|
||||
extern NSString * _Nonnull const TXBold;
|
||||
extern NSString * _Nonnull const TXRegular;
|
||||
//2.0 font
|
||||
extern NSString * _Nonnull const DS75Bd;
|
||||
extern NSString * _Nonnull const DS55Rg;
|
||||
|
||||
@interface MFFonts : NSObject
|
||||
|
||||
|
||||
@ -17,6 +17,10 @@ NSString * const DSRegular = @"VerizonNHGeDS-Regular";
|
||||
NSString * const TXBold = @"VerizonNHGeTX-Bold";
|
||||
NSString * const TXRegular = @"VerizonNHGeTX-Regular";
|
||||
|
||||
//2.0 font
|
||||
NSString * const DS75Bd = @"NHaasGroteskDSStd-75Bd";
|
||||
NSString * const DS55Rg = @"NHaasGroteskDSStd-55Rg";
|
||||
|
||||
|
||||
@implementation MFFonts
|
||||
|
||||
@ -27,6 +31,8 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
|
||||
[MFFonts loadFont:DSRegular type:@"otf"];
|
||||
[MFFonts loadFont:TXBold type:@"otf"];
|
||||
[MFFonts loadFont:TXRegular type:@"otf"];
|
||||
[MFFonts loadFont:DS75Bd type:@"otf"];
|
||||
[MFFonts loadFont:DS55Rg type:@"otf"];
|
||||
[MFFonts loadFont:@"OCRAExtended" type:@"ttf"];
|
||||
});
|
||||
}
|
||||
@ -49,50 +55,44 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
|
||||
}
|
||||
|
||||
+ (nonnull UIFont *)mfFontDSBold:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font = [UIFont fontWithName:DSBold size:size];
|
||||
[self validFont:font fontName:DSBold];
|
||||
return font ?: [UIFont boldSystemFontOfSize:size];
|
||||
}
|
||||
|
||||
+ (nonnull UIFont *)mfFontDSRegular:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font = [UIFont fontWithName:DSRegular size:size];
|
||||
[self validFont:font fontName:DSRegular];
|
||||
return font ?: [UIFont systemFontOfSize:size];
|
||||
}
|
||||
|
||||
+ (nonnull UIFont *)mfFontTXBold:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font = [UIFont fontWithName:TXBold size:size];
|
||||
[self validFont:font fontName:TXBold];
|
||||
return font ?: [UIFont boldSystemFontOfSize:size];
|
||||
}
|
||||
|
||||
+ (nonnull UIFont *)mfFontTXRegular:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font = [UIFont fontWithName:TXRegular size:size];
|
||||
[self validFont:font fontName:TXRegular];
|
||||
return font ?: [UIFont systemFontOfSize:size];
|
||||
}
|
||||
|
||||
|
||||
+ (UIFont *)mfFont75Bd:(CGFloat)size {
|
||||
+ (nonnull UIFont *)mfFont75Bd:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font;
|
||||
if (size >= 15) {
|
||||
font = [self mfFontDSBold:size];
|
||||
} else {
|
||||
font = [self mfFontTXBold:size];
|
||||
}
|
||||
return font;
|
||||
UIFont *font = [UIFont fontWithName:DS75Bd size:size];
|
||||
return font ?: [UIFont boldSystemFontOfSize:size];
|
||||
}
|
||||
|
||||
+ (UIFont *)mfFont55Rg:(CGFloat)size {
|
||||
+ (nonnull UIFont *)mfFont55Rg:(CGFloat)size {
|
||||
[self loadMVMFonts];
|
||||
UIFont *font;
|
||||
if (size >= 15) {
|
||||
font = [self mfFontDSRegular:size];
|
||||
} else {
|
||||
font = [self mfFontTXRegular:size];
|
||||
}
|
||||
return font;
|
||||
UIFont *font = [UIFont fontWithName:DS55Rg size:size];
|
||||
return font ?: [UIFont systemFontOfSize:size];
|
||||
}
|
||||
|
||||
+ (nullable UIFont *)mfFontOcratxt:(CGFloat)size {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user