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.

Sign up for GitHub

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

Lighter button fill in light mode #489

Merged
merged 4 commits into from
Oct 14, 2024
Merged

Lighter button fill in light mode #489

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fb4124
BSButton's fill color was too dark in light mode
krugerk Oct 6, 2024
77f78e3
BSButton's style updates on light/dark appearance
krugerk Oct 6, 2024
ad122c1
increase contrast of button when in light mode
krugerk Oct 6, 2024
3a486c4
Merge branch 'master' into lighter-button-fill-in-light-mode
krugerk Oct 13, 2024
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
43 changes: 41 additions & 2 deletions BeeKit/UI/BSButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,62 @@ public class BSButton : UIButton {

required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)

registerForTraitChanges(
[UITraitUserInterfaceStyle.self]) {
(self: Self, previousTraitCollection: UITraitCollection) in
self.resetStyle()
}

self.setUp()
}

override init(frame: CGRect) {
super.init(frame: frame)

registerForTraitChanges(
[UITraitUserInterfaceStyle.self]) {
(self: Self, previousTraitCollection: UITraitCollection) in
self.resetStyle()
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is duplicated in both init methods, perhaps it should instead live in setUp?


self.setUp()
}

private func setUp() {
self.titleLabel?.font = UIFont.beeminder.defaultBoldFont
self.setTitleColor(UIColor.Beeminder.yellow, for: UIControl.State())
self.tintColor = .black
self.setTitleColor(dynamicTitleColor, for: UIControl.State())
self.tintColor = dynamicTintFillColor
self.configuration = .filled()

self.layer.borderColor = UIColor.Beeminder.yellow.cgColor
self.layer.borderWidth = 1
self.layer.cornerRadius = 4
}

private func resetStyle() {
self.tintColor = dynamicTintFillColor
self.setTitleColor(dynamicTitleColor, for: UIControl.State())
}

private let dynamicTintFillColor = UIColor { traitCollection in
switch traitCollection.userInterfaceStyle {
case .dark:
return UIColor.black
default:
return UIColor(red: 235.0/255.0,
green: 235.0/255.0,
blue: 235.0/255.0,
alpha: 1.0)
}
}

private let dynamicTitleColor = UIColor { traitCollection in
switch traitCollection.userInterfaceStyle {
case .dark:
return UIColor.Beeminder.yellow
default:
return UIColor.black
}
}
}
Loading