Skip to content

Black on grey without border in light mode #492

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

Merged
theospears merged 2 commits into from
Oct 19, 2024
Merged

Black on grey without border in light mode #492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ed32c
less loud light button
krugerk Oct 14, 2024
6624f4b
clean code
krugerk Oct 14, 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
31 changes: 11 additions & 20 deletions BeeKit/UI/BSButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@ import UIKit
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()
fatalError("init(coder:) has not been implemented; neither xib nor storyboards in use")
}

override init(frame: CGRect) {
Expand All @@ -32,23 +24,22 @@ public class BSButton : UIButton {
self.resetStyle()
}

self.setUp()
self.resetStyle()
}

private func setUp() {
private func resetStyle() {
self.configuration = .filled()

self.titleLabel?.font = UIFont.beeminder.defaultBoldFont

self.setTitleColor(dynamicTitleColor, for: UIControl.State())
self.tintColor = dynamicTintFillColor
self.configuration = .filled()

self.backgroundColor = .clear

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())
self.layer.borderColor = traitCollection.userInterfaceStyle == .dark ? UIColor.Beeminder.yellow.cgColor : UIColor.clear.cgColor
self.layer.borderWidth = traitCollection.userInterfaceStyle == .dark ? 1 : 0
self.layer.cornerRadius = traitCollection.userInterfaceStyle == .dark ? 4 : 0
}

private let dynamicTintFillColor = UIColor { traitCollection in
Expand Down