-
Notifications
You must be signed in to change notification settings - Fork 120
[Booking] Update booking badges colours #16307
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
05ff5e8
Adding BookingBadgeView
adborbas de658b4
Update text
adborbas 452ba26
Adopt BookingListView
adborbas e6c635a
BookingBadgeable
adborbas a56c570
Update loc
adborbas fe8b110
Update tests
adborbas 91af872
Remove unused code
adborbas 620f937
Only draw the border when needed
adborbas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import SwiftUI | ||
| import enum Yosemite.BookingAttendanceStatus | ||
| import enum Yosemite.BookingStatus | ||
|
|
||
| struct BookingBadgeView: View { | ||
| let text: String | ||
| let color: Color | ||
|
|
||
| var body: some View { | ||
| BadgeView(text: text, | ||
| customizations: .init(textColor: Color(UIColor.label.resolvedColor(with: .init(userInterfaceStyle: .light))), | ||
| backgroundColor: color, | ||
| bordered: false, | ||
| bold: false)) | ||
| } | ||
| } | ||
|
|
||
| protocol BookingBadgeable { | ||
| var text: String { get } | ||
| var badgeColor: Color { get } | ||
| } | ||
|
|
||
| extension BookingBadgeView { | ||
| init(_ badgeable: BookingBadgeable) { | ||
| self.init(text: badgeable.text, color: badgeable.badgeColor) | ||
| } | ||
| } | ||
|
|
||
| extension BookingAttendanceStatus: BookingBadgeable { | ||
| var badgeColor: Color { | ||
| switch self { | ||
| case .noShow: | ||
| return BadgeColor.info | ||
| default: | ||
| return BadgeColor.default | ||
| } | ||
| } | ||
|
|
||
| var text: String { | ||
| self.localizedTitle | ||
| } | ||
| } | ||
|
|
||
| extension BookingStatus: BookingBadgeable { | ||
| var badgeColor: Color { | ||
| switch self { | ||
| case .unpaid: | ||
| return BadgeColor.info | ||
| default: | ||
| return BadgeColor.default | ||
| } | ||
| } | ||
|
|
||
| var text: String { | ||
| self.localizedTitle | ||
| } | ||
| } | ||
|
|
||
| fileprivate enum BadgeColor { | ||
| static let `default` = Color(uiColor: .systemGray6.resolvedColor(with: .init(userInterfaceStyle: .light))) | ||
| static let info = try! Color(rgbString: "rgba(255, 227, 101, 1)") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of manually updating the strings in
Localizable.strings, you can update the key for the updated string. The new key and value will be generated automatically inLocalizable.strings.Similar suggestion for the other change below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, but changing the key would mean that the intention of the text is different, but this is not the case now. Just the text is changing. In that sense, I'd keep the key and only change the value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I get your point, you might not need new translation for this text. I'm good with keeping this as-is.