diff options
| author | Sajad Vishkai <sajaclvishkai@gmail.com> | 2022-09-26 14:26:46 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-09-26 16:31:21 +0200 |
| commit | aea71a7991244ed3fe01f393648da0fe815adad7 (patch) | |
| tree | 41311799dba00aea6e860db40f0a6e516c34cb1f | |
| parent | 8f3b7997057adee1408fb3eed53024564a065d52 (diff) | |
| download | mullvadvpn-aea71a7991244ed3fe01f393648da0fe815adad7.tar.xz mullvadvpn-aea71a7991244ed3fe01f393648da0fe815adad7.zip | |
Removed backport and extension for UIFont
Changed the functions that are using backport.
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/AccountContentView.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/AccountInputGroupView.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/ProblemReportReviewViewController.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/UIFont+Monospaced.swift | 16 |
5 files changed, 3 insertions, 23 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 52a8242e96..0f689956f1 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -57,7 +57,6 @@ 5820EDA9288FE064006BF4E4 /* DeviceManagementInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5820EDA8288FE064006BF4E4 /* DeviceManagementInteractor.swift */; }; 5820EDAB288FF0D2006BF4E4 /* DeviceRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5820EDAA288FF0D2006BF4E4 /* DeviceRowView.swift */; }; 5823FA5426CE49F700283BF8 /* TunnelObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5823FA5326CE49F600283BF8 /* TunnelObserver.swift */; }; - 58289082286B590900478596 /* UIFont+Monospaced.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58289081286B590900478596 /* UIFont+Monospaced.swift */; }; 58293FAE2510CA58005D0BB5 /* ProblemReportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58293FAC2510CA58005D0BB5 /* ProblemReportViewController.swift */; }; 58293FB125124117005D0BB5 /* CustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58293FB025124117005D0BB5 /* CustomTextField.swift */; }; 58293FB3251241B4005D0BB5 /* CustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58293FB2251241B3005D0BB5 /* CustomTextView.swift */; }; @@ -409,7 +408,6 @@ 58218E1628B65396000C624F /* ICMPHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ICMPHeader.h; sourceTree = "<group>"; }; 5823FA4F26CA690600283BF8 /* OSLogHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLogHandler.swift; sourceTree = "<group>"; }; 5823FA5326CE49F600283BF8 /* TunnelObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelObserver.swift; sourceTree = "<group>"; }; - 58289081286B590900478596 /* UIFont+Monospaced.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Monospaced.swift"; sourceTree = "<group>"; }; 58293FAC2510CA58005D0BB5 /* ProblemReportViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemReportViewController.swift; sourceTree = "<group>"; }; 58293FB025124117005D0BB5 /* CustomTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextField.swift; sourceTree = "<group>"; }; 58293FB2251241B3005D0BB5 /* CustomTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextView.swift; sourceTree = "<group>"; }; @@ -1004,7 +1002,6 @@ 5891BF5025E66B1E006D6FB0 /* UIBarButtonItem+KeyboardNavigation.swift */, 587CBFE222807F530028DED3 /* UIColor+Helpers.swift */, 58CCA0152242560B004F3011 /* UIColor+Palette.swift */, - 58289081286B590900478596 /* UIFont+Monospaced.swift */, 585CA70E25F8C44600B47C62 /* UIMetrics.swift */, 58F7CA872692E34000FC59FD /* WireguardKeysContentView.swift */, 58E511E028DDB7F100B0BCDE /* WrappingError.swift */, @@ -1375,7 +1372,6 @@ 58A1AA8C23F5584C009F7EA6 /* ConnectionPanelView.swift in Sources */, 582BB1B3229574F40055B6EF /* SettingsAccountCell.swift in Sources */, 588527B2276B3F0700BAA373 /* LoadTunnelConfigurationOperation.swift in Sources */, - 58289082286B590900478596 /* UIFont+Monospaced.swift in Sources */, 58F1311527E0B2AB007AC5BC /* Result+Extensions.swift in Sources */, 5872631B283F6EAB00E14ADF /* Intents.intentdefinition in Sources */, 585DA88426B0270700B8C587 /* ServerRelaysResponse.swift in Sources */, diff --git a/ios/MullvadVPN/AccountContentView.swift b/ios/MullvadVPN/AccountContentView.swift index be3490c5b1..13c78226e7 100644 --- a/ios/MullvadVPN/AccountContentView.swift +++ b/ios/MullvadVPN/AccountContentView.swift @@ -197,7 +197,7 @@ class AccountNumberRow: UIView { private let accountNumberLabel: UILabel = { let textLabel = UILabel() textLabel.translatesAutoresizingMaskIntoConstraints = false - textLabel.font = UIFont.backport_monospacedSystemFont(ofSize: 17, weight: .regular) + textLabel.font = UIFont.monospacedSystemFont(ofSize: 17, weight: .regular) textLabel.textColor = .white return textLabel }() diff --git a/ios/MullvadVPN/AccountInputGroupView.swift b/ios/MullvadVPN/AccountInputGroupView.swift index 4a2602224e..3644069c6c 100644 --- a/ios/MullvadVPN/AccountInputGroupView.swift +++ b/ios/MullvadVPN/AccountInputGroupView.swift @@ -406,7 +406,7 @@ class AccountInputGroupView: UIView { // MARK: - Private private static func accountNumberFont() -> UIFont { - return UIFont.backport_monospacedSystemFont(ofSize: 20, weight: .regular) + return UIFont.monospacedSystemFont(ofSize: 20, weight: .regular) } private func addTextFieldNotificationObservers() { diff --git a/ios/MullvadVPN/ProblemReportReviewViewController.swift b/ios/MullvadVPN/ProblemReportReviewViewController.swift index cbe2956746..9a4d69b5d8 100644 --- a/ios/MullvadVPN/ProblemReportReviewViewController.swift +++ b/ios/MullvadVPN/ProblemReportReviewViewController.swift @@ -43,7 +43,7 @@ class ProblemReportReviewViewController: UIViewController { textView.translatesAutoresizingMaskIntoConstraints = false textView.text = reportString textView.isEditable = false - textView.font = UIFont.backport_monospacedSystemFont( + textView.font = UIFont.monospacedSystemFont( ofSize: UIFont.systemFontSize, weight: .regular ) diff --git a/ios/MullvadVPN/UIFont+Monospaced.swift b/ios/MullvadVPN/UIFont+Monospaced.swift deleted file mode 100644 index 73ff6c51a2..0000000000 --- a/ios/MullvadVPN/UIFont+Monospaced.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// UIFont+Monospaced.swift -// MullvadVPN -// -// Created by pronebird on 28/06/2022. -// Copyright © 2022 Mullvad VPN AB. All rights reserved. -// - -import UIKit - -extension UIFont { - class func backport_monospacedSystemFont(ofSize size: CGFloat, weight: UIFont.Weight) -> UIFont - { - UIFont.monospacedSystemFont(ofSize: size, weight: weight) - } -} |
