Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cell colors in location view #6246

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ios/MullvadVPN/UI appearance/UIColor+Palette.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
Loading