diff options
32 files changed, 27 insertions, 75 deletions
diff --git a/ios/MullvadVPN/Containers/Navigation/UINavigationBar+Appearance.swift b/ios/MullvadVPN/Containers/Navigation/UINavigationBar+Appearance.swift index ee9bd56c0c..519848a554 100644 --- a/ios/MullvadVPN/Containers/Navigation/UINavigationBar+Appearance.swift +++ b/ios/MullvadVPN/Containers/Navigation/UINavigationBar+Appearance.swift @@ -31,10 +31,7 @@ extension UINavigationBar { } private func makeNavigationBarAppearance(isTransparent: Bool) -> UINavigationBarAppearance { - let backIndicatorImage = UIImage.Buttons.back.withTintColor( - UIColor.NavigationBar.buttonColor, - renderingMode: .alwaysOriginal - ) + let backIndicatorImage = UIImage.Buttons.back let backIndicatorTransitionMask = UIImage.backTransitionMask let titleTextAttributes: [NSAttributedString.Key: Any] = [ diff --git a/ios/MullvadVPN/Containers/Root/HeaderBarView.swift b/ios/MullvadVPN/Containers/Root/HeaderBarView.swift index 9188a9cd50..17a595b8cf 100644 --- a/ios/MullvadVPN/Containers/Root/HeaderBarView.swift +++ b/ios/MullvadVPN/Containers/Root/HeaderBarView.swift @@ -9,8 +9,7 @@ import UIKit class HeaderBarView: UIView { - private let brandNameImage = UIImage(named: "LogoText")? - .withTintColor(UIColor.HeaderBar.brandNameColor, renderingMode: .alwaysOriginal) + private let brandNameImage = UIImage(named: "LogoText") private let logoImageView = UIImageView(image: UIImage(named: "LogoIcon")) @@ -88,9 +87,8 @@ class HeaderBarView: UIView { }() class func makeHeaderBarButton(with image: UIImage?) -> IncreasedHitButton { - let buttonImage = image?.withTintColor(UIColor.HeaderBar.buttonColor, renderingMode: .alwaysOriginal) let barButton = IncreasedHitButton(type: .system) - barButton.setBackgroundImage(buttonImage, for: .normal) + barButton.setBackgroundImage(image, for: .normal) barButton.configureForAutoLayout() return barButton diff --git a/ios/MullvadVPN/Coordinators/Settings/APIAccess/Cells/BasicCell.swift b/ios/MullvadVPN/Coordinators/Settings/APIAccess/Cells/BasicCell.swift index 1c568a4a06..9fe9dca8fc 100644 --- a/ios/MullvadVPN/Coordinators/Settings/APIAccess/Cells/BasicCell.swift +++ b/ios/MullvadVPN/Coordinators/Settings/APIAccess/Cells/BasicCell.swift @@ -38,10 +38,7 @@ class BasicCell: UITableViewCell, DynamicBackgroundConfiguration, CustomCellDisc didSet { accessoryType = .none - guard let image = disclosureType.image?.withTintColor( - UIColor.Cell.disclosureIndicatorColor, - renderingMode: .alwaysOriginal - ) else { + guard let image = disclosureType.image else { accessoryView = nil return } diff --git a/ios/MullvadVPN/Notifications/UI/NotificationBannerView.swift b/ios/MullvadVPN/Notifications/UI/NotificationBannerView.swift index ff7f5f016b..15a0859110 100644 --- a/ios/MullvadVPN/Notifications/UI/NotificationBannerView.swift +++ b/ios/MullvadVPN/Notifications/UI/NotificationBannerView.swift @@ -65,7 +65,6 @@ final class NotificationBannerView: UIView { private let actionButton: IncreasedHitButton = { let button = IncreasedHitButton(type: .system) - button.tintColor = UIColor.InAppNotificationBanner.actionButtonColor return button }() @@ -92,7 +91,7 @@ final class NotificationBannerView: UIView { let image = action?.image let showsAction = image != nil - actionButton.setBackgroundImage(image, for: .normal) + actionButton.setBackgroundImage(image?.withRenderingMode(.alwaysOriginal), for: .normal) actionButton.widthAnchor.constraint(equalToConstant: 24).isActive = true actionButton.heightAnchor.constraint(equalTo: actionButton.widthAnchor).isActive = true actionButton.isHidden = !showsAction diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/Contents.json index 74ccdff7bf..be59fba27c 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/Contents.json index 7817cf8114..d3cc910f53 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/Contents.json index c3bbb71217..9c04369633 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/Contents.json index aad6a70216..c1f3f7e944 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/Contents.json @@ -11,7 +11,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconInfo.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconInfo.imageset/Contents.json index ef3a764cba..9d31e6f170 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconInfo.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconInfo.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/Contents.json index 38876653b5..91623ba1a6 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/Contents.json index 7b4ca873dd..a3e8ebf519 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/Contents.json @@ -11,6 +11,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/Contents.json index a77e9155b0..9e497d7795 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/Contents.json index a77e9155b0..9e497d7795 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/Contents.json b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/Contents.json index 6f731b0f2d..b457a3e126 100644 --- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/Contents.json +++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/Contents.json @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/ios/MullvadVPN/UI appearance/UIColor+Palette.swift b/ios/MullvadVPN/UI appearance/UIColor+Palette.swift index faee4c4ce0..053b240338 100644 --- a/ios/MullvadVPN/UI appearance/UIColor+Palette.swift +++ b/ios/MullvadVPN/UI appearance/UIColor+Palette.swift @@ -75,7 +75,6 @@ extension UIColor { // Navigation bars enum NavigationBar { - static let buttonColor = UIColor(white: 1.0, alpha: 0.8) static let backButtonTitleColor = UIColor.white static let titleColor = UIColor.white static let promptColor = UIColor.white @@ -104,8 +103,6 @@ extension UIColor { static let titleTextColor = UIColor.white static let detailTextColor = UIColor(white: 1.0, alpha: 0.8) - - static let disclosureIndicatorColor = UIColor(white: 1.0, alpha: 0.8) static let textFieldTextColor = UIColor.white static let textFieldPlaceholderColor = UIColor(white: 1.0, alpha: 0.6) @@ -124,8 +121,6 @@ extension UIColor { static let unsecuredBackgroundColor = dangerColor static let securedBackgroundColor = successColor static let dividerColor = secondaryColor - static let brandNameColor = UIColor(white: 1.0, alpha: 0.8) - static let buttonColor = UIColor(white: 1.0, alpha: 0.8) static let disabledButtonColor = UIColor(white: 1.0, alpha: 0.5) } @@ -136,7 +131,6 @@ extension UIColor { static let titleColor = UIColor.white static let bodyColor = UIColor(white: 1.0, alpha: 0.6) - static let actionButtonColor = UIColor(white: 1.0, alpha: 0.8) } enum SegmentedControl { @@ -144,10 +138,6 @@ extension UIColor { static let selectedColor = successColor } - enum AlertController { - static let tintColor = UIColor(red: 0.0, green: 0.59, blue: 1.0, alpha: 1) - } - // Common colors static let primaryColor = UIColor(red: 0.16, green: 0.30, blue: 0.45, alpha: 1.0) static let secondaryColor = UIColor(red: 0.10, green: 0.18, blue: 0.27, alpha: 1.0) diff --git a/ios/MullvadVPN/View controllers/Account/AccountExpiryRow.swift b/ios/MullvadVPN/View controllers/Account/AccountExpiryRow.swift index 00ebb6b16e..5a1f6b72de 100644 --- a/ios/MullvadVPN/View controllers/Account/AccountExpiryRow.swift +++ b/ios/MullvadVPN/View controllers/Account/AccountExpiryRow.swift @@ -71,7 +71,6 @@ class AccountExpiryRow: UIView { let activityIndicator: SpinnerActivityIndicatorView = { let activityIndicator = SpinnerActivityIndicatorView(style: .small) activityIndicator.translatesAutoresizingMaskIntoConstraints = false - activityIndicator.tintColor = .white activityIndicator.setContentHuggingPriority(.defaultHigh, for: .horizontal) activityIndicator.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) return activityIndicator diff --git a/ios/MullvadVPN/View controllers/Account/AccountNumberRow.swift b/ios/MullvadVPN/View controllers/Account/AccountNumberRow.swift index 6dbc787f58..3763e96416 100644 --- a/ios/MullvadVPN/View controllers/Account/AccountNumberRow.swift +++ b/ios/MullvadVPN/View controllers/Account/AccountNumberRow.swift @@ -47,8 +47,7 @@ class AccountNumberRow: UIView { }() private let showHideButton: UIButton = { - let button = UIButton(type: .system) - button.tintColor = .white + let button = UIButton(type: .custom) button.adjustsImageSizeForAccessibilityContentSizeCategory = true button.setContentHuggingPriority(.defaultHigh, for: .horizontal) return button @@ -57,7 +56,6 @@ class AccountNumberRow: UIView { private let copyButton: UIButton = { let button = UIButton(type: .system) button.adjustsImageSizeForAccessibilityContentSizeCategory = true - button.tintColor = .white button.setContentHuggingPriority(.defaultHigh, for: .horizontal) return button }() @@ -215,7 +213,7 @@ class AccountNumberRow: UIView { private func showCheckmark(_ showCheckmark: Bool) { if showCheckmark { - let tickIcon = UIImage.tick + let tickIcon = UIImage.tick.withRenderingMode(.alwaysTemplate) copyButton.setImage(tickIcon, for: .normal) copyButton.tintColor = .successColor diff --git a/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift b/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift index 87c85913bb..9faabe96d1 100644 --- a/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift +++ b/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift @@ -35,8 +35,8 @@ class RestorePurchasesView: UIView { private lazy var infoButton: UIButton = { let button = IncreasedHitButton(type: .custom) button.isExclusiveTouch = true - button.setBackgroundImage(UIImage.Buttons.info, for: .normal) - button.tintColor = .white + button.setBackgroundImage(UIImage.Buttons.info.withRenderingMode(.alwaysOriginal), for: .normal) + button.adjustsImageSizeForAccessibilityContentSizeCategory = true button.addTarget(self, action: #selector(didTapInfoButton), for: .touchUpInside) button.heightAnchor.constraint(equalToConstant: UIMetrics.Button.accountInfoSize).isActive = true button.widthAnchor.constraint(equalTo: button.heightAnchor, multiplier: 1).isActive = true diff --git a/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift b/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift index 6772016fba..e552d7940b 100644 --- a/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift +++ b/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift @@ -155,7 +155,6 @@ class AccountDeletionContentView: UIView { private let activityIndicator: SpinnerActivityIndicatorView = { let activityIndicator = SpinnerActivityIndicatorView(style: .medium) activityIndicator.translatesAutoresizingMaskIntoConstraints = false - activityIndicator.tintColor = .white activityIndicator.setContentHuggingPriority(.defaultHigh, for: .horizontal) activityIndicator.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) return activityIndicator diff --git a/ios/MullvadVPN/View controllers/Alert/AlertViewController.swift b/ios/MullvadVPN/View controllers/Alert/AlertViewController.swift index 33fd20a7f1..fe8db67b40 100644 --- a/ios/MullvadVPN/View controllers/Alert/AlertViewController.swift +++ b/ios/MullvadVPN/View controllers/Alert/AlertViewController.swift @@ -33,9 +33,9 @@ enum AlertIcon { case .alert: return UIImage.Buttons.alert.withTintColor(.dangerColor) case .warning: - return UIImage.Buttons.alert.withTintColor(.white) + return UIImage.Buttons.alert case .info: - return UIImage.Buttons.info.withTintColor(.white) + return UIImage.Buttons.info default: return nil } diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift index 3bc8e317bc..0916e03fa2 100644 --- a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift +++ b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift @@ -69,7 +69,6 @@ final class WelcomeContentView: UIView, Sendable { let button = UIButton(type: .system) button.setAccessibilityIdentifier(.copyButton) button.adjustsImageSizeForAccessibilityContentSizeCategory = true - button.tintColor = .white button.setContentHuggingPriority(.defaultHigh, for: .horizontal) return button }() @@ -89,9 +88,8 @@ final class WelcomeContentView: UIView, Sendable { let button = IncreasedHitButton(type: .system) button.setAccessibilityIdentifier(.infoButton) button.adjustsImageSizeForAccessibilityContentSizeCategory = true - button.tintColor = .white button.translatesAutoresizingMaskIntoConstraints = false - button.setImage(UIImage.Buttons.info, for: .normal) + button.setImage(UIImage.Buttons.info.withRenderingMode(.alwaysOriginal), for: .normal) button.setContentHuggingPriority(.defaultHigh, for: .horizontal) button.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) return button diff --git a/ios/MullvadVPN/View controllers/InAppPurchase/InAppPurchaseViewController.swift b/ios/MullvadVPN/View controllers/InAppPurchase/InAppPurchaseViewController.swift index 03cd30bf64..0ec1d04a74 100644 --- a/ios/MullvadVPN/View controllers/InAppPurchase/InAppPurchaseViewController.swift +++ b/ios/MullvadVPN/View controllers/InAppPurchase/InAppPurchaseViewController.swift @@ -113,7 +113,6 @@ class InAppPurchaseViewController: UIViewController, StorePaymentObserver { preferredStyle: UIDevice.current.userInterfaceIdiom == .pad ? .alert : .actionSheet ) sheetController.overrideUserInterfaceStyle = .dark - sheetController.view.tintColor = .AlertController.tintColor products.sortedByPrice().forEach { product in guard let title = product.customLocalizedTitle else { return } let action = UIAlertAction(title: title, style: .default, handler: { _ in diff --git a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportSubmissionOverlayView.swift b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportSubmissionOverlayView.swift index 2c341f0557..219e025413 100644 --- a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportSubmissionOverlayView.swift +++ b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportSubmissionOverlayView.swift @@ -148,7 +148,6 @@ class ProblemReportSubmissionOverlayView: UIView { let activityIndicator: SpinnerActivityIndicatorView = { let indicator = SpinnerActivityIndicatorView(style: .large) - indicator.tintColor = .white return indicator }() diff --git a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift index 16dceaf257..52b97298ff 100644 --- a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift +++ b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift @@ -81,7 +81,6 @@ final class RedeemVoucherContentView: UIView { private let activityIndicator: SpinnerActivityIndicatorView = { let activityIndicator = SpinnerActivityIndicatorView(style: .medium) - activityIndicator.tintColor = .white activityIndicator.setContentHuggingPriority(.defaultHigh, for: .horizontal) activityIndicator.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) return activityIndicator diff --git a/ios/MullvadVPN/View controllers/RelayFilter/ChipViewCell.swift b/ios/MullvadVPN/View controllers/RelayFilter/ChipViewCell.swift index fda13fdb48..a1b4b01898 100644 --- a/ios/MullvadVPN/View controllers/RelayFilter/ChipViewCell.swift +++ b/ios/MullvadVPN/View controllers/RelayFilter/ChipViewCell.swift @@ -37,7 +37,7 @@ class ChipViewCell: UIView, UIContentView { private let closeButton: IncreasedHitButton = { let button = IncreasedHitButton() var buttonConfiguration = UIButton.Configuration.plain() - buttonConfiguration.image = UIImage.Buttons.closeSmall.withTintColor(.white.withAlphaComponent(0.6)) + buttonConfiguration.image = UIImage.Buttons.closeSmall buttonConfiguration.contentInsets = .zero button.setAccessibilityIdentifier(.relayFilterChipCloseButton) button.configuration = buttonConfiguration diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift index a8e1d03cb9..026861a826 100644 --- a/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift +++ b/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift @@ -34,9 +34,8 @@ class LocationCell: UITableViewCell { }() private let tickImageView: UIImageView = { - let imageView = UIImageView(image: UIImage.tick) + let imageView = UIImageView(image: UIImage.tick.withRenderingMode(.alwaysOriginal)) imageView.adjustsImageSizeForAccessibilityContentSizeCategory = true - imageView.tintColor = .white return imageView }() @@ -57,7 +56,6 @@ class LocationCell: UITableViewCell { let button = UIButton(type: .custom) button.isAccessibilityElement = false button.adjustsImageSizeForAccessibilityContentSizeCategory = true - button.tintColor = .white return button }() diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderFooterView.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderFooterView.swift index dcce16c689..f9e2026892 100644 --- a/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderFooterView.swift +++ b/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderFooterView.swift @@ -41,9 +41,9 @@ class LocationSectionHeaderFooterView: UIView, UIContentView { }() private let actionButton: UIButton = { - let button = UIButton(type: .system) + let button = UIButton(type: .custom) button.setImage(UIImage(systemName: "ellipsis"), for: .normal) - button.tintColor = UIColor(white: 1, alpha: 0.6) + button.tintColor = .white return button }() diff --git a/ios/MullvadVPN/View controllers/Settings/SelectableSettingsCell.swift b/ios/MullvadVPN/View controllers/Settings/SelectableSettingsCell.swift index b458219f77..923762d703 100644 --- a/ios/MullvadVPN/View controllers/Settings/SelectableSettingsCell.swift +++ b/ios/MullvadVPN/View controllers/Settings/SelectableSettingsCell.swift @@ -12,7 +12,6 @@ class SelectableSettingsCell: SettingsCell { let tickImageView: UIImageView = { let imageView = UIImageView(image: UIImage.tick) imageView.contentMode = .center - imageView.tintColor = .white imageView.alpha = 0 return imageView }() diff --git a/ios/MullvadVPN/View controllers/Settings/SettingsCell.swift b/ios/MullvadVPN/View controllers/Settings/SettingsCell.swift index b2cb09788f..8955643d0a 100644 --- a/ios/MullvadVPN/View controllers/Settings/SettingsCell.swift +++ b/ios/MullvadVPN/View controllers/Settings/SettingsCell.swift @@ -43,10 +43,7 @@ class SettingsCell: UITableViewCell, CustomCellDisclosureHandling { didSet { accessoryType = .none - let image = disclosureType.image?.withTintColor( - UIColor.Cell.disclosureIndicatorColor, - renderingMode: .alwaysOriginal - ) + let image = disclosureType.image if let image { disclosureImageView.image = image @@ -85,7 +82,6 @@ class SettingsCell: UITableViewCell, CustomCellDisclosureHandling { private let infoButton: UIButton = { let button = UIButton(type: .custom) button.setAccessibilityIdentifier(.infoButton) - button.tintColor = .white button.setImage(UIImage.Buttons.info, for: .normal) button.adjustsImageSizeForAccessibilityContentSizeCategory = true button.isHidden = true diff --git a/ios/MullvadVPN/View controllers/Settings/SettingsHeaderView.swift b/ios/MullvadVPN/View controllers/Settings/SettingsHeaderView.swift index 4ad7da0ee1..b02e1bd48a 100644 --- a/ios/MullvadVPN/View controllers/Settings/SettingsHeaderView.swift +++ b/ios/MullvadVPN/View controllers/Settings/SettingsHeaderView.swift @@ -26,7 +26,6 @@ class SettingsHeaderView: UITableViewHeaderFooterView { let button = UIButton(type: .custom) button.setAccessibilityIdentifier(.infoButton) button.adjustsImageSizeForAccessibilityContentSizeCategory = true - button.tintColor = .white button.setImage(UIImage.Buttons.info, for: .normal) return button }() @@ -35,7 +34,6 @@ class SettingsHeaderView: UITableViewHeaderFooterView { let button = UIButton(type: .custom) button.adjustsImageSizeForAccessibilityContentSizeCategory = true button.setAccessibilityIdentifier(.expandButton) - button.tintColor = .white return button }() diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift index 6c3c0332a9..54a0afe3f5 100644 --- a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift +++ b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift @@ -30,7 +30,6 @@ class TunnelViewController: UIViewController, RootContainment { let activityIndicator: SpinnerActivityIndicatorView = { let activityIndicator = SpinnerActivityIndicatorView(style: .large) activityIndicator.translatesAutoresizingMaskIntoConstraints = false - activityIndicator.tintColor = .white activityIndicator.setContentHuggingPriority(.defaultHigh, for: .horizontal) activityIndicator.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) return activityIndicator diff --git a/ios/MullvadVPN/Views/StatusActivityView.swift b/ios/MullvadVPN/Views/StatusActivityView.swift index 911b080e92..a490a5a488 100644 --- a/ios/MullvadVPN/Views/StatusActivityView.swift +++ b/ios/MullvadVPN/Views/StatusActivityView.swift @@ -29,7 +29,6 @@ class StatusActivityView: UIView { private let activityIndicator: SpinnerActivityIndicatorView = { let view = SpinnerActivityIndicatorView(style: .large) - view.tintColor = .white view.translatesAutoresizingMaskIntoConstraints = false return view }() |