Move FLEXUtility font methods to a UIFont category

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.m

@@ -40,7 +40,7 @@
         
         self.valueLabel = [UILabel new];
         self.valueLabel.backgroundColor = self.backgroundColor;
-        self.valueLabel.font = [FLEXUtility defaultFontOfSize:14.0];
+        self.valueLabel.font = [UIFont systemFontOfSize:14.0];
         self.valueLabel.textAlignment = NSTextAlignmentRight;
         [self addSubview:self.valueLabel];
         
@@ -173,7 +173,7 @@
         self.hexLabel = [UILabel new];
         self.hexLabel.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
         self.hexLabel.textAlignment = NSTextAlignmentCenter;
-        self.hexLabel.font = [FLEXUtility defaultFontOfSize:12.0];
+        self.hexLabel.font = [UIFont systemFontOfSize:12.0];
         [self addSubview:self.hexLabel];
         
         self.alphaInput = [FLEXColorComponentInputView new];

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.m

@@ -148,7 +148,7 @@
 
 + (UIFont *)inputFont
 {
-    return [FLEXUtility defaultFontOfSize:14.0];
+    return [UIFont systemFontOfSize:14.0];
 }
 
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.m

@@ -99,7 +99,7 @@
 
 + (UIFont *)titleFont
 {
-    return [FLEXUtility defaultFontOfSize:12.0];
+    return [UIFont systemFontOfSize:12.0];
 }
 
 + (CGFloat)titleBottomPadding

Classes/Editing/FLEXFieldEditorView.m

@@ -145,7 +145,7 @@
 
 + (UIFont *)labelFont
 {
-    return [FLEXUtility defaultFontOfSize:14.0];
+    return [UIFont systemFontOfSize:14.0];
 }
 
 + (CGFloat)dividerLineHeight

Classes/GlobalStateExplorers/FLEXClassesTableViewController.m

@@ -130,7 +130,7 @@
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        cell.textLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        cell.textLabel.font = UIFont.flex_defaultTableCellFont;
     }
     
     cell.textLabel.text = self.filteredClassNames[indexPath.row];

Classes/GlobalStateExplorers/FLEXCookiesTableViewController.m

@@ -52,8 +52,8 @@
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier];
-        cell.textLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
-        cell.detailTextLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        cell.textLabel.font = UIFont.flex_defaultTableCellFont;
+        cell.detailTextLabel.font = UIFont.flex_defaultTableCellFont;
         cell.detailTextLabel.textColor = UIColor.grayColor;
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }

Classes/GlobalStateExplorers/FLEXInstancesTableViewController.m

@@ -207,7 +207,7 @@
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        UIFont *cellFont = [FLEXUtility defaultTableViewCellLabelFont];
+        UIFont *cellFont = UIFont.flex_defaultTableCellFont;
         cell.textLabel.font = cellFont;
         cell.detailTextLabel.font = cellFont;
         cell.detailTextLabel.textColor = UIColor.grayColor;

Classes/GlobalStateExplorers/FLEXLibrariesTableViewController.m

@@ -156,7 +156,7 @@
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        cell.textLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        cell.textLabel.font = UIFont.flex_defaultTableCellFont;
     }
     
     NSString *executablePath;

Classes/GlobalStateExplorers/FileBrowser/FLEXFileBrowserTableViewController.m

@@ -184,8 +184,8 @@
 
     if (!cell) {
         cell = [[FLEXFileBrowserTableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:cellIdentifier];
-        cell.textLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
-        cell.detailTextLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        cell.textLabel.font = UIFont.flex_defaultTableCellFont;
+        cell.detailTextLabel.font = UIFont.flex_defaultTableCellFont;
         cell.detailTextLabel.textColor = UIColor.grayColor;
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }

Classes/GlobalStateExplorers/Globals/FLEXGlobalsTableViewController.m

@@ -264,7 +264,7 @@ static __weak UIWindow *s_applicationWindow = nil;
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        cell.textLabel.font = [FLEXUtility defaultFontOfSize:14.0];
+        cell.textLabel.font = [UIFont systemFontOfSize:14.0];
     }
 
     cell.textLabel.text = [self titleForRowAtIndexPath:indexPath];

Classes/GlobalStateExplorers/Keychain/FLEXKeychainTableViewController.m

@@ -149,7 +149,7 @@
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        cell.textLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        cell.textLabel.font = UIFont.flex_defaultTableCellFont;
     }
     
     NSDictionary *item = self.keychainItems[indexPath.row];

Classes/Network/FLEXNetworkSettingsTableViewController.m

@@ -178,7 +178,7 @@
 
 + (UIFont *)cellTitleFont
 {
-    return [FLEXUtility defaultFontOfSize:14.0];
+    return [UIFont systemFontOfSize:14.0];
 }
 
 @end

Classes/Network/FLEXNetworkTransactionDetailTableViewController.m

@@ -245,7 +245,7 @@ typedef UIViewController *(^FLEXNetworkDetailRowSelectionFuture)(void);
 {
     NSDictionary<NSString *, id> *titleAttributes = @{ NSFontAttributeName : [UIFont fontWithName:@"HelveticaNeue-Medium" size:12.0],
                                                        NSForegroundColorAttributeName : [UIColor colorWithWhite:0.5 alpha:1.0] };
-    NSDictionary<NSString *, id> *detailAttributes = @{ NSFontAttributeName : [FLEXUtility defaultTableViewCellLabelFont],
+    NSDictionary<NSString *, id> *detailAttributes = @{ NSFontAttributeName : UIFont.flex_defaultTableCellFont,
                                                         NSForegroundColorAttributeName : [FLEXColor primaryTextColor] };
 
     NSString *title = [NSString stringWithFormat:@"%@: ", row.title];

Classes/Network/FLEXNetworkTransactionTableViewCell.m

@@ -32,11 +32,11 @@ NSString *const kFLEXNetworkTransactionCellIdentifier = @"kFLEXNetworkTransactio
         self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 
         self.nameLabel = [UILabel new];
-        self.nameLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        self.nameLabel.font = UIFont.flex_defaultTableCellFont;
         [self.contentView addSubview:self.nameLabel];
 
         self.pathLabel = [UILabel new];
-        self.pathLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        self.pathLabel.font = UIFont.flex_defaultTableCellFont;
         self.pathLabel.textColor = [UIColor colorWithWhite:0.4 alpha:1.0];
         [self.contentView addSubview:self.pathLabel];
 
@@ -47,7 +47,7 @@ NSString *const kFLEXNetworkTransactionCellIdentifier = @"kFLEXNetworkTransactio
         [self.contentView addSubview:self.thumbnailImageView];
 
         self.transactionDetailsLabel = [UILabel new];
-        self.transactionDetailsLabel.font = [FLEXUtility defaultFontOfSize:10.0];
+        self.transactionDetailsLabel.font = [UIFont systemFontOfSize:10.0];
         self.transactionDetailsLabel.textColor = [UIColor colorWithWhite:0.65 alpha:1.0];
         [self.contentView addSubview:self.transactionDetailsLabel];
     }

Classes/ObjectExplorers/FLEXObjectExplorerViewController.m

@@ -151,7 +151,7 @@
     if (self.explorer.objectIsInstance) {
         _descriptionSection = [FLEXSingleRowSection
              title:@"Description" reuse:kFLEXMultilineCell cell:^(FLEXTableViewCell *cell) {
-                 cell.titleLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+                 cell.titleLabel.font = UIFont.flex_defaultTableCellFont;
                  cell.titleLabel.text = explorer.objectDescription;
              }
         ];
@@ -304,7 +304,7 @@
     FLEXExplorerSection *section = self.sections[indexPath.section];
     if (section == self.descriptionSection) {
         NSString *text = self.explorer.objectDescription;
-        NSAttributedString *attributedText = [[NSAttributedString alloc] initWithString:text attributes:@{ NSFontAttributeName : [FLEXUtility defaultTableViewCellLabelFont] }];
+        NSAttributedString *attributedText = [[NSAttributedString alloc] initWithString:text attributes:@{ NSFontAttributeName : UIFont.flex_defaultTableCellFont }];
         return [FLEXMultilineTableViewCell preferredHeightWithAttributedText:attributedText inTableViewWidth:self.tableView.frame.size.width style:tableView.style showsAccessory:NO];
     }
 

Classes/ObjectExplorers/Views/FLEXTableViewCell.m

@@ -28,7 +28,7 @@
 {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
-        UIFont *cellFont = [FLEXUtility defaultTableViewCellLabelFont];
+        UIFont *cellFont = UIFont.flex_defaultTableCellFont;
         self.titleLabel.font = cellFont;
         self.subtitleLabel.font = cellFont;
         self.subtitleLabel.textColor = [FLEXColor deemphasizedTextColor];

Classes/Toolbar/FLEXToolbarItem.m

@@ -25,7 +25,7 @@
     toolbarItem.title = title;
     toolbarItem.backgroundColor = [self defaultBackgroundColor];
     toolbarItem.image = image;
-    toolbarItem.titleLabel.font = [FLEXUtility defaultFontOfSize:12.0];
+    toolbarItem.titleLabel.font = [UIFont systemFontOfSize:12.0];
     [toolbarItem setTitle:title forState:UIControlStateNormal];
     [toolbarItem setImage:image forState:UIControlStateNormal];
     [toolbarItem setTitleColor:[FLEXColor primaryTextColor] forState:UIControlStateNormal];
@@ -39,7 +39,7 @@
 
 + (NSDictionary<NSString *, id> *)titleAttributes
 {
-    return @{NSFontAttributeName : [FLEXUtility defaultFontOfSize:12.0]};
+    return @{NSFontAttributeName : [UIFont systemFontOfSize:12.0]};
 }
 
 + (UIColor *)highlightedBackgroundColor

Classes/Utility/Categories/UIFont+FLEX.h

@@ -0,0 +1,17 @@
+//
+//  UIFont+FLEX.h
+//  FLEX
+//
+//  Created by Tanner Bennett on 12/20/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIFont (FLEX)
+
+@property (nonatomic, readonly, class) UIFont *flex_defaultTableCellFont;
+@property (nonatomic, readonly, class) UIFont *flex_codeFont;
+@property (nonatomic, readonly, class) UIFont *flex_smallCodeFont;
+
+@end

Classes/Utility/Categories/UIFont+FLEX.m

@@ -0,0 +1,32 @@
+//
+//  UIFont+FLEX.m
+//  FLEX
+//
+//  Created by Tanner Bennett on 12/20/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "UIFont+FLEX.h"
+
+@implementation UIFont (FLEX)
+
++ (UIFont *)flex_defaultTableCellFont
+{
+    static UIFont *defaultTableCellFont = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        defaultTableCellFont = [UIFont systemFontOfSize:12.0];
+    });
+
+    return defaultTableCellFont;
+}
+
++ (UIFont *)flex_codeFont {
+    return [self fontWithName:@"Menlo-Regular" size:self.systemFontSize];
+}
+
++ (UIFont *)flex_smallCodeFont {
+    return [self fontWithName:@"Menlo-Regular" size:self.smallSystemFontSize];
+}
+
+@end

Classes/Utility/FLEXUtility.h

@@ -13,6 +13,7 @@
 #import <objc/runtime.h>
 #import "FLEXAlert.h"
 #import "NSArray+Functional.h"
+#import "UIFont+FLEX.h"
 
 #define FLEXFloor(x) (floor(UIScreen.mainScreen.scale * (x)) / UIScreen.mainScreen.scale)
 
@@ -39,8 +40,6 @@
 + (NSString *)applicationImageName;
 + (NSString *)applicationName;
 + (NSString *)addressOfObject:(id)object;
-+ (UIFont *)defaultFontOfSize:(CGFloat)size;
-+ (UIFont *)defaultTableViewCellLabelFont;
 + (NSString *)stringByEscapingHTMLEntitiesInString:(NSString *)originalString;
 + (UIInterfaceOrientationMask)infoPlistSupportedInterfaceOrientationsMask;
 + (UIImage *)thumbnailedImageWithMaxPixelDimension:(NSInteger)dimension fromImageData:(NSData *)data;

Classes/Utility/FLEXUtility.m

@@ -128,22 +128,6 @@
     return [NSString stringWithFormat:@"%p", object];
 }
 
-+ (UIFont *)defaultFontOfSize:(CGFloat)size
-{
-    return [UIFont fontWithName:@"HelveticaNeue" size:size];
-}
-
-+ (UIFont *)defaultTableViewCellLabelFont
-{
-    static UIFont *defaultTableViewCellLabelFont = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        defaultTableViewCellLabelFont = [self defaultFontOfSize:12.0];
-    });
-
-    return defaultTableViewCellLabelFont;
-}
-
 + (NSString *)stringByEscapingHTMLEntitiesInString:(NSString *)originalString
 {
     static NSDictionary<NSString *, NSString *> *escapingDictionary = nil;

Classes/ViewHierarchy/FLEXHierarchyTableViewCell.m

@@ -36,7 +36,7 @@
         [self.contentView addSubview:self.colorCircleImageView];
         
         self.textLabel.font = [UIFont fontWithName:@"HelveticaNeue-Medium" size:14.0];
-        self.detailTextLabel.font = [FLEXUtility defaultTableViewCellLabelFont];
+        self.detailTextLabel.font = UIFont.flex_defaultTableCellFont;
         self.accessoryType = UITableViewCellAccessoryDetailButton;
         
         self.viewBackgroundColorView = [UIView new];

FLEX.xcodeproj/project.pbxproj

@@ -204,6 +204,8 @@
 		C38EF26323A2FCD20047A7EC /* FLEXViewControllerShortcuts.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF26123A2FCD20047A7EC /* FLEXViewControllerShortcuts.h */; };
 		C38F3F31230C958F004E3731 /* FLEXAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = C38F3F2F230C958F004E3731 /* FLEXAlert.h */; };
 		C38F3F32230C958F004E3731 /* FLEXAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = C38F3F30230C958F004E3731 /* FLEXAlert.m */; };
+		C398625D23AD6E90007E6793 /* UIFont+FLEX.h in Headers */ = {isa = PBXBuildFile; fileRef = C398625B23AD6E90007E6793 /* UIFont+FLEX.h */; };
+		C398625E23AD6E90007E6793 /* UIFont+FLEX.m in Sources */ = {isa = PBXBuildFile; fileRef = C398625C23AD6E90007E6793 /* UIFont+FLEX.m */; };
 		C398682523AC359600E9E391 /* FLEXShortcutsFactory+Defaults.m in Sources */ = {isa = PBXBuildFile; fileRef = C398682323AC359600E9E391 /* FLEXShortcutsFactory+Defaults.m */; };
 		C398682623AC359600E9E391 /* FLEXShortcutsFactory+Defaults.h in Headers */ = {isa = PBXBuildFile; fileRef = C398682423AC359600E9E391 /* FLEXShortcutsFactory+Defaults.h */; };
 		C398682823AC36EC00E9E391 /* FLEXViewShortcuts.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F527C4231891F6009CBA07 /* FLEXViewShortcuts.m */; };
@@ -462,6 +464,8 @@
 		C38EF26123A2FCD20047A7EC /* FLEXViewControllerShortcuts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXViewControllerShortcuts.h; sourceTree = "<group>"; };
 		C38F3F2F230C958F004E3731 /* FLEXAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXAlert.h; sourceTree = "<group>"; };
 		C38F3F30230C958F004E3731 /* FLEXAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLEXAlert.m; sourceTree = "<group>"; };
+		C398625B23AD6E90007E6793 /* UIFont+FLEX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIFont+FLEX.h"; sourceTree = "<group>"; };
+		C398625C23AD6E90007E6793 /* UIFont+FLEX.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIFont+FLEX.m"; sourceTree = "<group>"; };
 		C398682323AC359600E9E391 /* FLEXShortcutsFactory+Defaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FLEXShortcutsFactory+Defaults.m"; sourceTree = "<group>"; };
 		C398682423AC359600E9E391 /* FLEXShortcutsFactory+Defaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FLEXShortcutsFactory+Defaults.h"; sourceTree = "<group>"; };
 		C39ED92622D63F3200B5773A /* FLEXAddressExplorerCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FLEXAddressExplorerCoordinator.h; sourceTree = "<group>"; };
@@ -901,6 +905,8 @@
 				C387C88222E0D24A00750E58 /* UIView+FLEX_Layout.m */,
 				C3F646BF239EAA8F00D4A011 /* UIPasteboard+FLEX.h */,
 				C3F646C0239EAA8F00D4A011 /* UIPasteboard+FLEX.m */,
+				C398625B23AD6E90007E6793 /* UIFont+FLEX.h */,
+				C398625C23AD6E90007E6793 /* UIFont+FLEX.m */,
 				C3BFD06E233C23ED0015FB82 /* NSArray+Functional.h */,
 				C3BFD06F233C23ED0015FB82 /* NSArray+Functional.m */,
 				C3F977812311B38F0032776D /* NSObject+Reflection.h */,
@@ -1030,6 +1036,7 @@
 				C3F646F223A045DB00D4A011 /* FLEXClassShortcuts.h in Headers */,
 				C387C87A22DFCD6A00750E58 /* FLEXCarouselCell.h in Headers */,
 				C3511B9122D7C99E0057BAB7 /* FLEXTableViewSection.h in Headers */,
+				C398625D23AD6E90007E6793 /* UIFont+FLEX.h in Headers */,
 				3A4C953A1B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.h in Headers */,
 				779B1ED01C0C4D7C001F5E49 /* FLEXMultiColumnTableView.h in Headers */,
 				3A4C94D31B5B21410088C3F2 /* FLEXObjectExplorerFactory.h in Headers */,
@@ -1302,6 +1309,7 @@
 				3A4C95271B5B21410088C3F2 /* FLEXGlobalsTableViewController.m in Sources */,
 				71E1C2172307FBB800F5032A /* FLEXKeychain.m in Sources */,
 				C3F646F323A045DB00D4A011 /* FLEXClassShortcuts.m in Sources */,
+				C398625E23AD6E90007E6793 /* UIFont+FLEX.m in Sources */,
 				C387C88422E0D24A00750E58 /* UIView+FLEX_Layout.m in Sources */,
 				C32A195F231732E800EB02AC /* FLEXCollectionContentSection.m in Sources */,
 				C36FBFCD230F3B98008D95D5 /* FLEXMethod.m in Sources */,