diff options
| author | Jon Petersson <jon.petersson@kvadrat.se> | 2024-05-08 16:08:40 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-05-16 14:33:13 +0200 |
| commit | d382e99aaabab701426d235cd9a7b7aff19a2f92 (patch) | |
| tree | db868a8ac5f7cfa296c36110ba49110261e5585e /ios | |
| parent | 970fb0722806ee9422103c08d24b37ab7df5aa7f (diff) | |
| download | mullvadvpn-d382e99aaabab701426d235cd9a7b7aff19a2f92.tar.xz mullvadvpn-d382e99aaabab701426d235cd9a7b7aff19a2f92.zip | |
Fix cell colors in location view
Diffstat (limited to 'ios')
3 files changed, 7 insertions, 10 deletions
diff --git a/ios/MullvadVPN/UI appearance/UIColor+Palette.swift b/ios/MullvadVPN/UI appearance/UIColor+Palette.swift index bc53819d10..b702e2303c 100644 --- a/ios/MullvadVPN/UI appearance/UIColor+Palette.swift +++ b/ios/MullvadVPN/UI appearance/UIColor+Palette.swift @@ -87,10 +87,10 @@ extension UIColor { // Cells enum Cell { enum Background { - static let indentationLevelZero = primaryColor - static let indentationLevelOne = UIColor(red: 0.15, green: 0.23, blue: 0.33, alpha: 1.0) - static let indentationLevelTwo = UIColor(red: 0.13, green: 0.20, blue: 0.30, alpha: 1.0) - static let indentationLevelThree = UIColor(red: 0.11, green: 0.17, blue: 0.27, alpha: 1.0) + static let indentationLevelZero = UIColor(red: 0.14, green: 0.25, blue: 0.38, alpha: 1.0) + static let indentationLevelOne = UIColor(red: 0.12, green: 0.23, blue: 0.34, alpha: 1.0) + static let indentationLevelTwo = UIColor(red: 0.11, green: 0.20, blue: 0.31, alpha: 1.0) + static let indentationLevelThree = UIColor(red: 0.11, green: 0.19, blue: 0.29, alpha: 1.0) static let normal = indentationLevelZero static let disabled = normal.darkened(by: 0.3)! diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift index a51cebf59c..68c70b04cc 100644 --- a/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift +++ b/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift @@ -134,10 +134,7 @@ class LocationCell: UITableViewCell { contentView.backgroundColor = .clear backgroundView = UIView() - backgroundView?.backgroundColor = UIColor.Cell.Background.normal - selectedBackgroundView = UIView() - selectedBackgroundView?.backgroundColor = UIColor.Cell.Background.selected checkboxButton.addTarget(self, action: #selector(toggleCheckboxButton(_:)), for: .touchUpInside) collapseButton.addTarget(self, action: #selector(handleCollapseButton(_:)), for: .touchUpInside) diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderView.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderView.swift index c84fea9097..11889bb590 100644 --- a/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderView.swift +++ b/ios/MullvadVPN/View controllers/SelectLocation/LocationSectionHeaderView.swift @@ -66,9 +66,9 @@ class LocationSectionHeaderView: UIView, UIContentView { nameLabel.text = configuration.name actionButton.isHidden = isActionHidden actionButton.accessibilityIdentifier = nil - actualConfiguration.primaryAction.flatMap { [weak self] action in - self?.actionButton.accessibilityIdentifier = .openCustomListsMenuButton - self?.actionButton.addAction(action, for: .touchUpInside) + actualConfiguration.primaryAction.flatMap { action in + actionButton.accessibilityIdentifier = .openCustomListsMenuButton + actionButton.addAction(action, for: .touchUpInside) } } |