Removed ImageTintColor extension

Changed functions that were using backport.

6 files changed, 7 insertions, 31 deletions

diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index 1c03e58b7c..52a8242e96 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -452,7 +452,6 @@
 		58554F7A280B125F00013055 /* RESTAccountsProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RESTAccountsProxy.swift; sourceTree = "<group>"; };
 		58554F7C280D6FE000013055 /* RESTURLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RESTURLSession.swift; sourceTree = "<group>"; };
 		58561C98239A5D1500BD6B5E /* IPEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPEndpoint.swift; sourceTree = "<group>"; };
-		5856D13627450A8A00DFD627 /* UIImage+TintColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+TintColor.swift"; sourceTree = "<group>"; };
 		5857F24224C8662600CF6F47 /* SelectLocationHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationHeaderView.swift; sourceTree = "<group>"; };
 		5857F24624C882D700CF6F47 /* SelectLocationNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationNavigationController.swift; sourceTree = "<group>"; };
 		585CA70E25F8C44600B47C62 /* UIMetrics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIMetrics.swift; sourceTree = "<group>"; };
@@ -1006,7 +1005,6 @@
 				587CBFE222807F530028DED3 /* UIColor+Helpers.swift */,
 				58CCA0152242560B004F3011 /* UIColor+Palette.swift */,
 				58289081286B590900478596 /* UIFont+Monospaced.swift */,
-				5856D13627450A8A00DFD627 /* UIImage+TintColor.swift */,
 				585CA70E25F8C44600B47C62 /* UIMetrics.swift */,
 				58F7CA872692E34000FC59FD /* WireguardKeysContentView.swift */,
 				58E511E028DDB7F100B0BCDE /* WrappingError.swift */,
@@ -1416,7 +1414,6 @@
 				58F2E146276A2C9900A79513 /* StopTunnelOperation.swift in Sources */,
 				E1187ABC289BBB850024E748 /* OutOfTimeViewController.swift in Sources */,
 				58DF5B762852108E00E92647 /* InputInjectionBuilder.swift in Sources */,
-				5856D13727450A8A00DFD627 /* UIImage+TintColor.swift in Sources */,
 				58CB0EE024B86751001EF0D8 /* RESTAPIProxy.swift in Sources */,
 				58095C532760EEC700890776 /* RESTNetworkOperation.swift in Sources */,
 				58293FB125124117005D0BB5 /* CustomTextField.swift in Sources */,
diff --git a/ios/MullvadVPN/CustomNavigationBar.swift b/ios/MullvadVPN/CustomNavigationBar.swift
index 50c7df8530..6ab2d082f4 100644
--- a/ios/MullvadVPN/CustomNavigationBar.swift
+++ b/ios/MullvadVPN/CustomNavigationBar.swift
@@ -19,10 +19,8 @@ class CustomNavigationBar: UINavigationBar {
     ]
 
     private let customBackIndicatorImage = UIImage(named: "IconBack")?
-        .backport_withTintColor(
-            UIColor.NavigationBar.backButtonIndicatorColor,
-            renderingMode: .alwaysOriginal
-        )
+        .withTintColor(UIColor.NavigationBar.backButtonIndicatorColor, renderingMode: .alwaysOriginal)
+
     private let customBackIndicatorTransitionMask = UIImage(named: "IconBackTransitionMask")
 
     // Returns the distance from the title label to the bottom of navigation bar
diff --git a/ios/MullvadVPN/DeviceRowView.swift b/ios/MullvadVPN/DeviceRowView.swift
index c35f2f78db..ac638f47ab 100644
--- a/ios/MullvadVPN/DeviceRowView.swift
+++ b/ios/MullvadVPN/DeviceRowView.swift
@@ -28,7 +28,7 @@ class DeviceRowView: UIView {
 
     let removeButton: UIButton = {
         let image = UIImage(named: "IconClose")?
-            .backport_withTintColor(
+            .withTintColor(
                 .white.withAlphaComponent(0.4),
                 renderingMode: .alwaysOriginal
             )
diff --git a/ios/MullvadVPN/HeaderBarView.swift b/ios/MullvadVPN/HeaderBarView.swift
index 426b3756be..467bdb37da 100644
--- a/ios/MullvadVPN/HeaderBarView.swift
+++ b/ios/MullvadVPN/HeaderBarView.swift
@@ -11,7 +11,7 @@ import UIKit
 
 class HeaderBarView: UIView {
     private let brandNameImage = UIImage(named: "LogoText")?
-        .backport_withTintColor(UIColor.HeaderBar.brandNameColor, renderingMode: .alwaysOriginal)
+        .withTintColor(UIColor.HeaderBar.brandNameColor, renderingMode: .alwaysOriginal)
 
     let logoImageView: UIImageView = {
         let imageView = UIImageView(image: UIImage(named: "LogoIcon"))
@@ -30,9 +30,9 @@ class HeaderBarView: UIView {
 
     class func makeSettingsButton() -> HeaderBarButton {
         let settingsImage = UIImage(named: "IconSettings")?
-            .backport_withTintColor(UIColor.HeaderBar.buttonColor, renderingMode: .alwaysOriginal)
+            .withTintColor(UIColor.HeaderBar.buttonColor, renderingMode: .alwaysOriginal)
         let disabledSettingsImage = UIImage(named: "IconSettings")?
-            .backport_withTintColor(
+            .withTintColor(
                 UIColor.HeaderBar.disabledButtonColor,
                 renderingMode: .alwaysOriginal
             )
diff --git a/ios/MullvadVPN/SettingsCell.swift b/ios/MullvadVPN/SettingsCell.swift
index 6dbaa66cc8..b642549d5a 100644
--- a/ios/MullvadVPN/SettingsCell.swift
+++ b/ios/MullvadVPN/SettingsCell.swift
@@ -37,7 +37,7 @@ class SettingsCell: UITableViewCell {
         didSet {
             accessoryType = .none
 
-            let image = disclosureType.image?.backport_withTintColor(
+            let image = disclosureType.image?.withTintColor(
                 UIColor.Cell.disclosureIndicatorColor,
                 renderingMode: .alwaysOriginal
             )
diff --git a/ios/MullvadVPN/UIImage+TintColor.swift b/ios/MullvadVPN/UIImage+TintColor.swift
deleted file mode 100644
index 923a401973..0000000000
--- a/ios/MullvadVPN/UIImage+TintColor.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  UIImage+TintColor.swift
-//  MullvadVPN
-//
-//  Created by pronebird on 17/11/2021.
-//  Copyright © 2021 Mullvad VPN AB. All rights reserved.
-//
-
-import UIKit
-
-extension UIImage {
-    func backport_withTintColor(_ tintColor: UIColor) -> UIImage {
-        return backport_withTintColor(tintColor, renderingMode: renderingMode)
-    }
-
-    func backport_withTintColor(_ tintColor: UIColor, renderingMode: RenderingMode) -> UIImage {
-        withTintColor(tintColor, renderingMode: renderingMode)
-    }
-}