Skip to content

Commit 89ec667

Browse files
author
Jangles
committed
this is getting ridiculous
1 parent 22fa78a commit 89ec667

9 files changed

+26
-26
lines changed

‎netfox/Core/NFXGenericController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class NFXGenericController: NFXViewController
4444
let matchesBodyHeaders = regexBodyHeaders.matches(in: string, options: NSRegularExpression.MatchingOptions.withoutAnchoringBounds, range: NSMakeRange(0, l)) as Array<NSTextCheckingResult>
4545

4646
for match in matchesBodyHeaders {
47-
tempMutableString.addAttribute(NSFontAttributeName, value: NFXFont.NFXFontBold(14), range: match.range)
47+
tempMutableString.addAttribute(NSFontAttributeName, value: NFXFont.NFXFontBold(size: 14), range: match.range)
4848
tempMutableString.addAttribute(NSForegroundColorAttributeName, value: NFXColor.NFXOrangeColor(), range: match.range)
4949
}
5050

‎netfox/Core/NFXHelper.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@ extension NFXColor
9898
extension NFXFont
9999
{
100100
#if os(iOS)
101-
class func NFXFont(_ size: CGFloat) -> UIFont
101+
class func NFXFont(size: CGFloat) -> UIFont
102102
{
103103
return UIFont(name: "HelveticaNeue", size: size)!
104104
}
105105

106-
class func NFXFontBold(_ size: CGFloat) -> UIFont
106+
class func NFXFontBold(size: CGFloat) -> UIFont
107107
{
108108
return UIFont(name: "HelveticaNeue-Bold", size: size)!
109109
}
110110

111111
#elseif os(OSX)
112-
class func NFXFont(_ size: CGFloat) -> NSFont
112+
class func NFXFont(size: CGFloat) -> NSFont
113113
{
114114
return NSFont(name: "HelveticaNeue", size: size)!
115115
}
116116

117-
class func NFXFontBold(_ size: CGFloat) -> NSFont
117+
class func NFXFontBold(size: CGFloat) -> NSFont
118118
{
119119
return NSFont(name: "HelveticaNeue-Bold", size: size)!
120120
}

‎netfox/Core/NFXRawBodyDetailsController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class NFXRawBodyDetailsController: NFXGenericBodyDetailsController
2626
self.bodyView.textColor = UIColor.NFXGray44Color()
2727
self.bodyView.textAlignment = .left
2828
self.bodyView.isEditable = false
29-
self.bodyView.font = UIFont.NFXFont(13)
29+
self.bodyView.font = UIFont.NFXFont(size: 13)
3030

3131
switch bodyType {
3232
case .request:

‎netfox/OSX/NFXListCell_OSX.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class NFXListCell_OSX: NSTableCellView
3333
self.circleView.layer?.cornerRadius = 4
3434
self.circleView.alphaValue = 0.2
3535

36-
self.requestTimeLabel.font = NSFont.NFXFontBold(13)
37-
self.timeIntervalLabel.font = NSFont.NFXFont(12)
38-
self.URLLabel.font = NSFont.NFXFont(12)
39-
self.methodLabel.font = NSFont.NFXFont(12)
40-
self.typeLabel.font = NSFont.NFXFont(12)
36+
self.requestTimeLabel.font = NSFont.NFXFontBold(size: 13)
37+
self.timeIntervalLabel.font = NSFont.NFXFont(size: 12)
38+
self.URLLabel.font = NSFont.NFXFont(size: 12)
39+
self.methodLabel.font = NSFont.NFXFont(size: 12)
40+
self.typeLabel.font = NSFont.NFXFont(size: 12)
4141

4242
}
4343

‎netfox/iOS/NFXDetailsController_iOS.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle
8181
tempButton.setTitle(title, for: UIControlState())
8282
tempButton.setTitleColor(UIColor.init(netHex: 0x6d6d6d), for: UIControlState())
8383
tempButton.setTitleColor(UIColor.init(netHex: 0xf3f3f4), for: .selected)
84-
tempButton.titleLabel?.font = UIFont.NFXFont(15)
84+
tempButton.titleLabel?.font = UIFont.NFXFont(size: 15)
8585
tempButton.addTarget(self, action: selector, for: .touchUpInside)
8686
return tempButton
8787
}
@@ -98,7 +98,7 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle
9898
var textLabel: UILabel
9999
textLabel = UILabel()
100100
textLabel.frame = CGRect(x: 20, y: 20, width: scrollView.frame.width - 40, height: scrollView.frame.height - 20);
101-
textLabel.font = UIFont.NFXFont(13)
101+
textLabel.font = UIFont.NFXFont(size: 13)
102102
textLabel.textColor = UIColor.NFXGray44Color()
103103
textLabel.numberOfLines = 0
104104
textLabel.attributedText = content

‎netfox/iOS/NFXInfoController_iOS.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class NFXInfoController_iOS: NFXInfoController {
2929

3030
self.textLabel = UILabel()
3131
self.textLabel.frame = CGRect(x: 20, y: 20, width: scrollView.frame.width - 40, height: scrollView.frame.height - 20);
32-
self.textLabel.font = UIFont.NFXFont(13)
32+
self.textLabel.font = UIFont.NFXFont(size: 13)
3333
self.textLabel.textColor = UIColor.NFXGray44Color()
3434
self.textLabel.attributedText = self.generateInfoString("Retrieving IP address..")
3535
self.textLabel.numberOfLines = 0

‎netfox/iOS/NFXListCell_iOS.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,29 @@ class NFXListCell: UITableViewCell
3939
self.requestTimeLabel = UILabel(frame: CGRect.zero)
4040
self.requestTimeLabel.textAlignment = .center
4141
self.requestTimeLabel.textColor = UIColor.white
42-
self.requestTimeLabel.font = UIFont.NFXFontBold(13)
42+
self.requestTimeLabel.font = UIFont.NFXFontBold(size: 13)
4343
contentView.addSubview(self.requestTimeLabel)
4444

4545
self.timeIntervalLabel = UILabel(frame: CGRect.zero)
4646
self.timeIntervalLabel.textAlignment = .center
47-
self.timeIntervalLabel.font = UIFont.NFXFont(12)
47+
self.timeIntervalLabel.font = UIFont.NFXFont(size: 12)
4848
contentView.addSubview(self.timeIntervalLabel)
4949

5050
self.URLLabel = UILabel(frame: CGRect.zero)
5151
self.URLLabel.textColor = UIColor.NFXBlackColor()
52-
self.URLLabel.font = UIFont.NFXFont(12)
52+
self.URLLabel.font = UIFont.NFXFont(size: 12)
5353
self.URLLabel.numberOfLines = 2
5454
contentView.addSubview(self.URLLabel)
5555

5656
self.methodLabel = UILabel(frame: CGRect.zero)
5757
self.methodLabel.textAlignment = .left
5858
self.methodLabel.textColor = UIColor.NFXGray44Color()
59-
self.methodLabel.font = UIFont.NFXFont(12)
59+
self.methodLabel.font = UIFont.NFXFont(size: 12)
6060
contentView.addSubview(self.methodLabel)
6161

6262
self.typeLabel = UILabel(frame: CGRect.zero)
6363
self.typeLabel.textColor = UIColor.NFXGray44Color()
64-
self.typeLabel.font = UIFont.NFXFont(12)
64+
self.typeLabel.font = UIFont.NFXFont(size: 12)
6565
contentView.addSubview(self.typeLabel)
6666

6767
self.circleView = UIView(frame: CGRect.zero)

‎netfox/iOS/NFXSettingsController_iOS.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class NFXSettingsController_iOS: NFXSettingsController, UITableViewDelegate, UIT
4747
var nfxVersionLabel: UILabel
4848
nfxVersionLabel = UILabel(frame: CGRect(x: 10, y: self.view.frame.height - 60, width: self.view.frame.width - 2*10, height: 30))
4949
nfxVersionLabel.autoresizingMask = [.flexibleTopMargin, .flexibleWidth]
50-
nfxVersionLabel.font = UIFont.NFXFont(14)
50+
nfxVersionLabel.font = UIFont.NFXFont(size: 14)
5151
nfxVersionLabel.textColor = UIColor.NFXOrangeColor()
5252
nfxVersionLabel.textAlignment = .center
5353
nfxVersionLabel.text = nfxVersionString
@@ -56,7 +56,7 @@ class NFXSettingsController_iOS: NFXSettingsController, UITableViewDelegate, UIT
5656
var nfxURLButton: UIButton
5757
nfxURLButton = UIButton(frame: CGRect(x: 10, y: self.view.frame.height - 40, width: self.view.frame.width - 2*10, height: 30))
5858
nfxURLButton.autoresizingMask = [.flexibleTopMargin, .flexibleWidth]
59-
nfxURLButton.titleLabel?.font = UIFont.NFXFont(12)
59+
nfxURLButton.titleLabel?.font = UIFont.NFXFont(size: 12)
6060
nfxURLButton.setTitleColor(UIColor.NFXGray44Color(), for: UIControlState())
6161
nfxURLButton.titleLabel?.textAlignment = .center
6262
nfxURLButton.setTitle(nfxURL, for: UIControlState())
@@ -109,7 +109,7 @@ class NFXSettingsController_iOS: NFXSettingsController, UITableViewDelegate, UIT
109109
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
110110
{
111111
let cell = UITableViewCell()
112-
cell.textLabel?.font = UIFont.NFXFont(14)
112+
cell.textLabel?.font = UIFont.NFXFont(size: 14)
113113
cell.tintColor = UIColor.NFXOrangeColor()
114114

115115
switch (indexPath as NSIndexPath).section
@@ -133,14 +133,14 @@ class NFXSettingsController_iOS: NFXSettingsController, UITableViewDelegate, UIT
133133
cell.textLabel?.textAlignment = .center
134134
cell.textLabel?.text = "Share Session Logs"
135135
cell.textLabel?.textColor = UIColor.NFXGreenColor()
136-
cell.textLabel?.font = UIFont.NFXFont(16)
136+
cell.textLabel?.font = UIFont.NFXFont(size: 16)
137137
return cell
138138

139139
case 3:
140140
cell.textLabel?.textAlignment = .center
141141
cell.textLabel?.text = "Clear data"
142142
cell.textLabel?.textColor = UIColor.NFXRedColor()
143-
cell.textLabel?.font = UIFont.NFXFont(16)
143+
cell.textLabel?.font = UIFont.NFXFont(size: 16)
144144

145145
return cell
146146

@@ -175,7 +175,7 @@ class NFXSettingsController_iOS: NFXSettingsController, UITableViewDelegate, UIT
175175
filtersInfoLabel = UILabel(frame: headerView.bounds)
176176
filtersInfoLabel.backgroundColor = UIColor.clear
177177
filtersInfoLabel.autoresizingMask = [.flexibleWidth, .flexibleHeight]
178-
filtersInfoLabel.font = UIFont.NFXFont(13)
178+
filtersInfoLabel.font = UIFont.NFXFont(size: 13)
179179
filtersInfoLabel.textColor = UIColor.NFXGray44Color()
180180
filtersInfoLabel.textAlignment = .center
181181
filtersInfoLabel.text = "\nSelect the types of responses that you want to see"

‎netfox/iOS/NFXStatisticsController_iOS.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class NFXStatisticsController_iOS: NFXStatisticsController {
3131

3232
self.textLabel = UILabel()
3333
self.textLabel.frame = CGRect(x: 20, y: 20, width: scrollView.frame.width - 40, height: scrollView.frame.height - 20);
34-
self.textLabel.font = UIFont.NFXFont(13)
34+
self.textLabel.font = UIFont.NFXFont(size: 13)
3535
self.textLabel.textColor = UIColor.NFXGray44Color()
3636
self.textLabel.numberOfLines = 0
3737
self.textLabel.attributedText = getReportString()

0 commit comments

Comments
 (0)