Skip to content

Add time-based color coding to countdown text #913

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
jubin-marut wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add time-based color coding to countdown text #913

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions MeetingBar/Extensions/DefaultsKeys.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ extension Defaults.Keys {
static let statusbarEventTitleLength = Key<Int>("statusbarEventTitleLength", default: statusbarEventTitleLengthLimits.max)

static let hideMeetingTitle = Key<Bool>("hideMeetingTitle", default: false)
static let timeBasedStatusBarColor = Key<Bool>("timeBasedStatusBarColor", default: false)
static let dismissedEvents = Key<[ProcessedEvent]>("dismissedEvents", default: [])

static let ongoingEventVisibility = Key<OngoingEventVisibility>("ongoingEventVisibility", default: .showTenMinBeforeNext)
Expand Down
1 change: 1 addition & 0 deletions MeetingBar/Resources /Localization /en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"preferences_appearance_status_bar_ongoing_time_immediate_value" = "hide after start";
"preferences_appearance_status_bar_ongoing_time_ten_after_value" = "hide 10 min after start";
"preferences_appearance_status_bar_ongoing_time_ten_before_next_value" = "hide 10 min before next event";
"preferences_appearance_status_bar_time_color_toggle" = "Color countdown by time remaining";
"preferences_appearance_status_bar_next_event_toggle" = "Show only events starting within";
"preferences_appearance_status_bar_next_event_stepper" = "%d minutes";
"preferences_appearance_menu_title" = "Menu";
Expand Down
42 changes: 32 additions & 10 deletions MeetingBar/UI/StatusBar/StatusBarItemController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ final class StatusBarItemController {
.timeFormat, .bookmarks, .eventTitleFormat,
.personalEventsAppereance, .pastEventsAppereance,
.declinedEventsAppereance, .ongoingEventVisibility,
.showTimelineInMenu,
.showTimelineInMenu, .timeBasedStatusBarColor,
options: []
)
.receive(on: DispatchQueue.main)
Expand Down Expand Up @@ -258,11 +258,6 @@ final class StatusBarItemController {
let menuTitle = NSMutableAttributedString()

if Defaults[.eventTimeFormat] != .show_under_title || Defaults[.eventTitleFormat] == .none {
var eventTitle = title
if Defaults[.eventTimeFormat] == .show {
eventTitle += " " + time
}

var styles = [NSAttributedString.Key: Any]()
styles[NSAttributedString.Key.font] = NSFont.systemFont(ofSize: MenuStyleConstants.defaultFontSize)

Expand All @@ -274,7 +269,15 @@ final class StatusBarItemController {
styles[NSAttributedString.Key.underlineStyle] = NSUnderlineStyle.single.rawValue | NSUnderlineStyle.patternDot.rawValue | NSUnderlineStyle.byWord.rawValue
}

menuTitle.append(NSAttributedString(string: eventTitle, attributes: styles))
menuTitle.append(NSAttributedString(string: title, attributes: styles))

if Defaults[.eventTimeFormat] == .show, !time.isEmpty {
var timeStyles = styles
if Defaults[.timeBasedStatusBarColor] {
timeStyles[NSAttributedString.Key.foregroundColor] = countdownColor(for: nextEvent)
}
menuTitle.append(NSAttributedString(string: " " + time, attributes: timeStyles))
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} else {
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineHeightMultiple = 0.7
Expand All @@ -298,9 +301,10 @@ final class StatusBarItemController {

menuTitle.append(NSAttributedString(string: title, attributes: styles))

let timeAttributes = [
NSAttributedString.Key.font: NSFont.systemFont(ofSize: 9),
NSAttributedString.Key.foregroundColor: NSColor.lightGray
let timeColor: NSColor = Defaults[.timeBasedStatusBarColor] ? countdownColor(for: nextEvent) : .lightGray
let timeAttributes: [NSAttributedString.Key: Any] = [
.font: NSFont.systemFont(ofSize: 9),
.foregroundColor: timeColor
]
menuTitle.append(NSAttributedString(string: "\n" + time, attributes: timeAttributes))

Expand Down Expand Up @@ -536,6 +540,24 @@ func shortenTitle(title: String?, offset: Int) -> String {
return eventTitle
}

func countdownColor(for event: MBEvent) -> NSColor {
let now = Date()
let timeRemaining: TimeInterval
if event.startDate <= now, event.endDate > now {
timeRemaining = event.endDate.timeIntervalSinceNow
} else {
timeRemaining = event.startDate.timeIntervalSinceNow
}

if timeRemaining >= 15 * 60 {
return .systemGreen
} else if timeRemaining >= 5 * 60 {
return .systemYellow
} else {
return .systemRed
}
}

func createEventStatusString(title: String, startDate: Date, endDate: Date) -> (String, String) {
var eventTime: String

Expand Down
6 changes: 6 additions & 0 deletions MeetingBar/UI/Views/Preferences/AppearanceTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ struct StatusBarSection: View {
@Default(.showEventMaxTimeUntilEventThreshold) var showEventMaxTimeUntilEventThreshold
@Default(.showEventMaxTimeUntilEventEnabled) var showEventMaxTimeUntilEventEnabled
@Default(.ongoingEventVisibility) var ongoingEventVisibility
@Default(.timeBasedStatusBarColor) var timeBasedStatusBarColor

var body: some View {
GroupBox(label: Label("preferences_appearance_status_bar_title".loco(), systemImage: "menubar.rectangle")) {
Expand Down Expand Up @@ -236,6 +237,11 @@ struct StatusBarSection: View {
)
.disabled(!showEventMaxTimeUntilEventEnabled)
}
Toggle(
"preferences_appearance_status_bar_time_color_toggle".loco(),
isOn: $timeBasedStatusBarColor
)

Picker("preferences_appearance_status_bar_ongoing_title".loco(), selection: $ongoingEventVisibility) {
Text("preferences_appearance_status_bar_ongoing_time_immediate_value".loco()).tag(
OngoingEventVisibility.hideImmediateAfter)
Expand Down
Loading