Skip to content

Show due by deltas in the gallery #548

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show due by deltas in the gallery #548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 41 additions & 0 deletions BeeSwift/GoalCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ class GoalCollectionViewCell: UICollectionViewCell {
let todaytaLabel: BSLabel = BSLabel()
let thumbnailImageView = GoalImageView(isThumbnail: true)
let safesumLabel: BSLabel = BSLabel()
lazy var dueByDeltasLabel: BSLabel = {
let label = BSLabel()
label.textAlignment = NSTextAlignment.center
label.font = UIFont.beeminder.defaultBoldFont.withSize(13)
label.numberOfLines = 0
return label
}()
let margin = 8
override init(frame: CGRect) {
super.init(frame: frame)
Expand All @@ -23,6 +30,7 @@ class GoalCollectionViewCell: UICollectionViewCell {
self.contentView.addSubview(self.todaytaLabel)
self.contentView.addSubview(self.thumbnailImageView)
self.contentView.addSubview(self.safesumLabel)
self.contentView.addSubview(self.dueByDeltasLabel)
self.contentView.backgroundColor = .systemBackground

self.slugLabel.font = UIFont.beeminder.defaultFontHeavy
Expand Down Expand Up @@ -64,6 +72,11 @@ class GoalCollectionViewCell: UICollectionViewCell {
make.centerY.equalTo(self.thumbnailImageView.snp.centerY)
make.right.equalTo(-self.margin)
}
self.dueByDeltasLabel.snp.makeConstraints { make in
make.left.equalTo(self.thumbnailImageView.snp.right).offset(5)
make.top.equalTo(self.safesumLabel.snp.bottom).offset(6)
make.right.equalTo(-self.margin)
}
}
required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) }
override func prepareForReuse() {
Expand All @@ -78,5 +91,33 @@ class GoalCollectionViewCell: UICollectionViewCell {
self.todaytaLabel.text = goal?.todayta == true ? "✓" : ""
self.safesumLabel.text = goal?.capitalSafesum()
self.safesumLabel.textColor = goal?.countdownColor ?? UIColor.Beeminder.gray
self.dueByDeltasLabel.attributedText = goal?.dueByTableAttributedString
self.dueByDeltasLabel.isHidden = goal == nil || goal?.dueByContainsSpecificAmounts == false
}
}

extension Goal {
fileprivate var dueByContainsSpecificAmounts: Bool {
self.dueBy.values.map { $0.formattedDelta }.joined(separator: " ").contains(where: { $0.isNumber })
}
fileprivate var dueByTableAttributedString: NSAttributedString {
let textAndColor: [(text: String, color: UIColor)] = dueBy.sorted(using: SortDescriptor(\.key)).compactMap({
$0.value.formattedDelta
}).map { $0 == "✔" ? "✓" : $0 }.enumerated().map { offset, element in
var color: UIColor {
switch offset {
case 0: return UIColor.Beeminder.SafetyBuffer.orange
case 1: return UIColor.Beeminder.SafetyBuffer.blue
case 2: return UIColor.Beeminder.SafetyBuffer.green
default: return .label.withAlphaComponent(0.8)
}
}
return (text: element, color: color)
}
let attrStr = NSMutableAttributedString()
textAndColor.map { (text: String, color: UIColor) in
NSAttributedString(string: text + " ", attributes: [.foregroundColor: color])
}.forEach { attrStr.append($0) }
return attrStr
}
}
Loading