Skip to content

Allow checking next event in 30min #546

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
pakerwreah merged 1 commit into from
Nov 28, 2025
Merged

Allow checking next event in 30min #546

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
2 changes: 1 addition & 1 deletion Calendr/MenuBar/NextEventViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class NextEventViewModel {
)
&&
// event is in the configured range to check
Int(dateProvider.now.distance(to: event.start)) <= 3600 * hoursToCheck
dateProvider.now.distance(to: event.start) <= 3600 * max(0.5, Double(hoursToCheck))
}

return upcoming
Expand Down
2 changes: 1 addition & 1 deletion Calendr/Settings/GeneralSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class GeneralSettingsViewController: NSViewController, SettingsUI {

// Next event range

nextEventRangeStepper.minValue = 1
nextEventRangeStepper.minValue = 0
nextEventRangeStepper.maxValue = 24 * 60
nextEventRangeStepper.valueWraps = false
nextEventRangeStepper.refusesFirstResponder = true
Expand Down
6 changes: 4 additions & 2 deletions Calendr/Settings/SettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,15 @@ class SettingsViewModel:

eventStatusItemCheckRangeLabel = eventStatusItemCheckRange
.repeat(when: calendarChangeObservable)
.map { range in
.map { hours in
let dateFormatter = DateComponentsFormatter()
dateFormatter.calendar = dateProvider.calendar
dateFormatter.unitsStyle = .abbreviated

return Strings.Formatter.Date.Relative.in(
dateFormatter.string(from: DateComponents(hour: range))!
dateFormatter.string(
from: hours > 0 ? DateComponents(hour: hours) : DateComponents(minute: 30)
)!
)
}
.share(replay: 1)
Expand Down
32 changes: 32 additions & 0 deletions CalendrTests/NextEventViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,38 @@ class NextEventViewModelTests: XCTestCase {
XCTAssertEqual(hasEvent, false)
}

func testNextEvent_checkRangeZero_shouldCheck30min() {

let viewModel = makeViewModel(type: .event)

var hasEvent: Bool?

viewModel.hasEvent
.bind { hasEvent = $0 }
.disposed(by: disposeBag)

dateProvider.now = .make(year: 2021, month: 1, day: 1, at: .end)

let hoursToCheck = 0
var start = now + 30 * 60

settings.eventStatusItemCheckRangeObserver.onNext(hoursToCheck)

calendarService.changeEvents([
.make(start: start, end: start + 1)
])

XCTAssertEqual(hasEvent, true)

start += 1

calendarService.changeEvents([
.make(start: start, end: start + 1)
])

XCTAssertEqual(hasEvent, false)
}

func testNextEventLength() {

let viewModel = makeViewModel(type: .event)
Expand Down
16 changes: 16 additions & 0 deletions CalendrTests/SettingsViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,20 +311,36 @@ class SettingsViewModelTests: XCTestCase {
localStorage.eventStatusItemCheckRange = 12

var eventStatusItemCheckRange: Int?
var eventStatusItemCheckRangeLabel: String?

viewModel.eventStatusItemCheckRange
.bind { eventStatusItemCheckRange = $0 }
.disposed(by: disposeBag)

viewModel.eventStatusItemCheckRangeLabel
.bind { eventStatusItemCheckRangeLabel = $0 }
.disposed(by: disposeBag)

XCTAssertEqual(eventStatusItemCheckRange, 12)
XCTAssertEqual(eventStatusItemCheckRangeLabel, "in 12h")
XCTAssertEqual(localStorageEventStatusItemCheckRange, 12)

viewModel.eventStatusItemCheckRangeObserver.onNext(18)

XCTAssertEqual(eventStatusItemCheckRange, 18)
XCTAssertEqual(eventStatusItemCheckRangeLabel, "in 18h")
XCTAssertEqual(localStorageEventStatusItemCheckRange, 18)
}

func testEventStatusItemCheckRangeZero_shouldDisplay30min() {

viewModel.eventStatusItemCheckRangeObserver.onNext(0)

XCTAssertEqual(viewModel.eventStatusItemCheckRange.lastValue(), 0)
XCTAssertEqual(viewModel.eventStatusItemCheckRangeLabel.lastValue(), "in 30m")
XCTAssertEqual(localStorageEventStatusItemCheckRange, 0)
}

func testToggleEventStatusItemDetectNotch() {

localStorage.eventStatusItemDetectNotch = true
Expand Down