Browse Source

Formatting.

pull/101/head
Abhishek 3 years ago
parent
commit
e5f48668ae
  1. 2
      Clocker/ClockerUITests/PermissionsTests.swift
  2. 8
      Clocker/ClockerUITests/PreferencesTest.swift
  3. 2
      Clocker/Events and Reminders/CalendarHandler.swift
  4. 2
      Clocker/Overall App/Themer.swift
  5. 2
      Clocker/Panel/ParentPanelController+ModernSlider.swift
  6. 5
      Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift

2
Clocker/ClockerUITests/PermissionsTests.swift

@ -17,7 +17,7 @@ class PermissionsTests: XCTestCase {
if app.tables["FloatingTableView"].exists {
app.buttons["FloatingPin"].click()
}
app.tapMenubarIcon()
app/*@START_MENU_TOKEN@*/ .buttons["Preferences"]/*[[".dialogs[\"Clocker Panel\"].buttons[\"Preferences\"]",".buttons[\"Preferences\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/ .click()

8
Clocker/ClockerUITests/PreferencesTest.swift

@ -306,14 +306,14 @@ class PreferencesTest: XCTestCase {
// Let's make sure we have > 1 timezones first
let favourites = preferencesTable.tableRows
if (favourites.count < 2) {
if favourites.count < 2 {
addAPlace(place: "UTC", to: app)
}
XCTAssertTrue(favourites.count > 1)
sleep(2)
// Select two timezones
let unfavouritedMenubarsQuery = preferencesTable.checkBoxes.matching(NSPredicate(format: "value == 0", ""))

2
Clocker/Events and Reminders/CalendarHandler.swift

@ -158,7 +158,7 @@ extension EventCenter {
let relevantEvents = filteredEvents[autoupdatingCalendar.startOfDay(for: Date())] ?? []
let filteredEvents = relevantEvents.filter {
$0.event.isAllDay == false && $0.event.startDate.timeIntervalSinceNow > -300
$0.event.isAllDay == false && $0.event.endDate.timeIntervalSinceNow > 0
}
if filteredEvents.count == 1 { return filteredEvents.first }

2
Clocker/Overall App/Themer.swift

@ -519,7 +519,7 @@ extension Themer {
if let xmarkImage = symbolImage(for: "xmark.circle.fill") {
return xmarkImage
}
return removeImage()
}

2
Clocker/Panel/ParentPanelController+ModernSlider.swift

@ -25,7 +25,7 @@ extension ParentPanelController {
resetModernSliderButton.layer?.masksToBounds = true
resetModernSliderButton.layer?.cornerRadius = resetModernSliderButton.frame.width / 2
}
goBackwardsButton.image = Themer.shared().goBackwardsImage()
goForwardButton.image = Themer.shared().goForwardsImage()

5
Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift

@ -34,6 +34,7 @@ class UpcomingEventViewItem: NSCollectionViewItem {
}
// MARK: Setup UI
func setup(_ title: String,
_ subtitle: String,
_ color: NSColor,
@ -87,7 +88,7 @@ class UpcomingEventViewItem: NSCollectionViewItem {
func setupEmptyState() {
let subtitle = NSCalendar.autoupdatingCurrent.isDateInWeekend(Date()) ? NSLocalizedString("Happy Weekend.", comment: "Button Title for no upcoming event") : NSLocalizedString("Great going.", comment: "Button Title for no upcoming event")
setAlternateState(NSLocalizedString("No upcoming events for today!", comment: "Next Event Label with no upcoming event"),
subtitle,
NSColor.systemGreen,
@ -126,7 +127,7 @@ class UpcomingEventViewItem: NSCollectionViewItem {
@objc func zoomButtonAction(_ sender: NSButton) {
guard sender.image != nil else { return }
if let meetingURL = meetingLink {
NSWorkspace.shared.open(meetingURL)
} else {

Loading…
Cancel
Save