From fdfc08eb6a91d4c236eddd8a146b4f8c86fdc987 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Sat, 26 Mar 2022 21:11:03 -0400 Subject: [PATCH] Swiftlint. --- .../OnboardingSearchController.swift | 9 +++---- Clocker/Overall App/ConfigExport.swift | 4 +-- Clocker/Overall App/Themer.swift | 3 +-- .../Overall App/VersionUpdateHandler.swift | 8 +++--- .../Data Layer/TimezoneDataOperations.swift | 2 +- .../Panel/Notes Popover/NotesPopover.swift | 10 +++---- .../TextViewWithPlaceholder.swift | 2 +- Clocker/Panel/PanelController.swift | 5 ++-- Clocker/Panel/ParentPanelController.swift | 27 +++++++------------ Clocker/Panel/UI/PanelTableView.swift | 2 +- .../UpcomingEventViewItem.swift | 3 +-- .../AppFeedbackWindowController.swift | 5 ++-- .../Appearance/AppearanceViewController.swift | 5 ++-- .../Calendar/CalendarViewController.swift | 8 +++--- .../General/PreferencesDataSource.swift | 7 +++-- .../General/PreferencesViewController.swift | 12 ++++----- .../Menu Bar/StatusContainerView.swift | 10 +++---- .../Menu Bar/StatusItemHandler.swift | 3 +-- .../Preferences/Menu Bar/StatusItemView.swift | 8 +++--- .../UpcomingEventStatusItemView.swift | 8 +++--- Clocker/StartupKit/Package.swift | 6 ++--- 21 files changed, 62 insertions(+), 85 deletions(-) diff --git a/Clocker/Onboarding/OnboardingSearchController.swift b/Clocker/Onboarding/OnboardingSearchController.swift index 2c2607a..d08eb1e 100644 --- a/Clocker/Onboarding/OnboardingSearchController.swift +++ b/Clocker/Onboarding/OnboardingSearchController.swift @@ -135,8 +135,7 @@ class OnboardingSearchController: NSViewController { private func setupLabelHidingTimer() { Timer.scheduledTimer(withTimeInterval: 5, - repeats: false) - { _ in + repeats: false) { _ in OperationQueue.main.addOperation { self.setInfoLabel(CLEmptyString) } @@ -228,7 +227,7 @@ class OnboardingSearchController: NSViewController { "latitude": latitude, "longitude": longitude, "nextUpdate": CLEmptyString, - CLCustomLabel: filteredAddress, + CLCustomLabel: filteredAddress ] as [String: Any] DataStore.shared().addTimezone(TimezoneData(with: newTimeZone)) @@ -413,7 +412,7 @@ class OnboardingSearchController: NSViewController { CLTimezoneName: formattedAddress, CLCustomLabel: formattedAddress, CLTimezoneID: CLEmptyString, - CLPlaceIdentifier: result.placeId, + CLPlaceIdentifier: result.placeId ] as [String: Any] return TimezoneData(with: totalPackage) @@ -484,7 +483,7 @@ class ResultSectionHeaderTableViewCell: NSTableCellView { class OnboardingSelectionTableRowView: NSTableRowView { override func drawSelection(in _: NSRect) { if selectionHighlightStyle != .none { - let selectionRect = NSInsetRect(bounds, 1, 1) + let selectionRect = bounds.insetBy(dx: 1, dy: 1) NSColor(calibratedWhite: 0.4, alpha: 1).setStroke() NSColor(calibratedWhite: 0.4, alpha: 1).setFill() let selectionPath = NSBezierPath(roundedRect: selectionRect, xRadius: 6, yRadius: 6) diff --git a/Clocker/Overall App/ConfigExport.swift b/Clocker/Overall App/ConfigExport.swift index 97ba117..c01bf2c 100644 --- a/Clocker/Overall App/ConfigExport.swift +++ b/Clocker/Overall App/ConfigExport.swift @@ -29,7 +29,7 @@ struct ConfigExport { CLDefaultMenubarMode, CLInstallHomeIndicatorObject, CLSwitchToCompactModeAlert, - CLDisplayDSTTransitionInfo, + CLDisplayDSTTransitionInfo ]) let dictionaryRep = UserDefaults.standard.dictionaryRepresentation() var clockerPrefs: [String: Any] = [:] @@ -53,7 +53,7 @@ struct ConfigExport { "Latitude": customObject.latitude ?? 0.0, "Longitude": customObject.longitude ?? 0.0, "Place Identifier": customObject.placeID ?? "0.0", - "Selection Type": "\(customObject.selectionType)", + "Selection Type": "\(customObject.selectionType)" ] return timezoneDictionary } diff --git a/Clocker/Overall App/Themer.swift b/Clocker/Overall App/Themer.swift index 7d53e3b..8dd347e 100644 --- a/Clocker/Overall App/Themer.swift +++ b/Clocker/Overall App/Themer.swift @@ -460,8 +460,7 @@ extension Themer { _ darkImage: NSImage, _ systemImage: NSImage, _ solarizedLightImage: NSImage, - _ solarizedDarkImage: NSImage) -> NSImage - { + _ solarizedDarkImage: NSImage) -> NSImage { if #available(macOS 10.14, *) { switch themeIndex { case .light: diff --git a/Clocker/Overall App/VersionUpdateHandler.swift b/Clocker/Overall App/VersionUpdateHandler.swift index 4d562f0..1b8d2c0 100644 --- a/Clocker/Overall App/VersionUpdateHandler.swift +++ b/Clocker/Overall App/VersionUpdateHandler.swift @@ -242,20 +242,20 @@ class VersionUpdateHandler: NSObject { y: 0.0, width: contentSize.width, height: contentSize.height)) - textView.minSize = NSMakeSize(0.0, contentSize.height) - textView.maxSize = NSMakeSize(floatMax, floatMax) + textView.minSize = NSSize(width: 0.0, height: contentSize.height) + textView.maxSize = NSSize(width: floatMax, height: floatMax) textView.isVerticallyResizable = true textView.isHorizontallyResizable = false textView.isEditable = false textView.autoresizingMask = .width - textView.textContainer?.containerSize = NSMakeSize(contentSize.width, floatMax) + textView.textContainer?.containerSize = NSSize(width: contentSize.width, height: floatMax) textView.textContainer?.widthTracksTextView = true textView.string = details scrollView.documentView = textView textView.sizeToFit() let height = min(200.0, scrollView.documentView?.frame.size.height ?? 200.0) + 3.0 - scrollView.frame = NSMakeRect(0.0, 0.0, scrollView.frame.size.width, height) + scrollView.frame = NSRect(x: 0.0, y: 0.0, width: scrollView.frame.size.width, height: height) alert.accessoryView = scrollView if ignoreButton.isEmpty == false { diff --git a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift index 0db1170..749f6e1 100644 --- a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift +++ b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift @@ -283,7 +283,7 @@ extension TimezoneDataOperations { let unableToConvertDateParameters = [ "New Date": newDate, "Timezone": dataObject.timezone(), - "Locale": dateFormatter.locale.identifier, + "Locale": dateFormatter.locale.identifier ] as [String: Any] Logger.log(object: unableToConvertDateParameters, for: "Date conversion failure - New Date is nil") return CLEmptyString diff --git a/Clocker/Panel/Notes Popover/NotesPopover.swift b/Clocker/Panel/Notes Popover/NotesPopover.swift index f140883..81dd3a2 100644 --- a/Clocker/Panel/Notes Popover/NotesPopover.swift +++ b/Clocker/Panel/Notes Popover/NotesPopover.swift @@ -73,7 +73,7 @@ class NotesPopover: NSViewController { "1 hour before", "2 hour before", "1 day before", - "2 days before", + "2 days before" ] alertPopupButton.removeAllItems() @@ -240,7 +240,7 @@ class NotesPopover: NSViewController { let attributesDictionary = [ NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: Themer.shared().mainTextColor(), - NSAttributedString.Key.paragraphStyle: style, + NSAttributedString.Key.paragraphStyle: style ] button.attributedTitle = NSAttributedString(string: title, @@ -322,8 +322,7 @@ class NotesPopover: NSViewController { } private func updateTimezoneInDefaultPreferences(with override: Int, - _: OverrideType) - { + _: OverrideType) { let timezones = DataStore.shared().timezones() var timezoneObjects: [TimezoneData] = [] @@ -392,8 +391,7 @@ class NotesPopover: NSViewController { timezone: model.timezone(), alertIndex: alertIndex, reminderDate: reminderPicker.dateValue, - additionalNotes: model.note) - { + additionalNotes: model.note) { showSuccessMessage() } } diff --git a/Clocker/Panel/Notes Popover/TextViewWithPlaceholder.swift b/Clocker/Panel/Notes Popover/TextViewWithPlaceholder.swift index fac52d0..7485d90 100644 --- a/Clocker/Panel/Notes Popover/TextViewWithPlaceholder.swift +++ b/Clocker/Panel/Notes Popover/TextViewWithPlaceholder.swift @@ -18,7 +18,7 @@ class TextViewWithPlaceholder: NSTextView { if let placeHolderFont = NSFont(name: "Avenir", size: 14) { let textDict = [ NSAttributedString.Key.foregroundColor: NSColor.gray, - NSAttributedString.Key.font: placeHolderFont, + NSAttributedString.Key.font: placeHolderFont ] return NSAttributedString(string: " Add your notes here.", attributes: textDict) } diff --git a/Clocker/Panel/PanelController.swift b/Clocker/Panel/PanelController.swift index 310ee03..a52a3d0 100644 --- a/Clocker/Panel/PanelController.swift +++ b/Clocker/Panel/PanelController.swift @@ -154,8 +154,7 @@ class PanelController: ParentPanelController { } if let statusWindow = statusBackgroundWindow, - let statusButton = statusView - { + let statusButton = statusView { var statusItemFrame = statusWindow.convertToScreen(statusButton.frame) var statusItemScreen = NSScreen.main var testPoint = statusItemFrame.origin @@ -222,7 +221,7 @@ class PanelController: ParentPanelController { "Show Upcoming Event View": showUpcomingEventView == "YES" ? "Yes" : "No", "Country": country, "Calendar Access Provided": EventCenter.sharedCenter().calendarAccessGranted() ? "Yes" : "No", - "Number of Timezones": preferences.count, + "Number of Timezones": preferences.count ] Logger.log(object: panelEvent, for: "openedPanel") diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index 7f0de6c..503dcdb 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -188,8 +188,7 @@ class ParentPanelController: NSWindowController { object: nil) NotificationCenter.default.addObserver(forName: NSUbiquitousKeyValueStore.didChangeExternallyNotification, object: self, - queue: OperationQueue.main) - { [weak self] _ in + queue: OperationQueue.main) { [weak self] _ in if let sSelf = self { sSelf.mainTableView.reloadData() sSelf.setScrollViewConstraint() @@ -341,7 +340,7 @@ class ParentPanelController: NSWindowController { let styleAttributes = [ NSAttributedString.Key.paragraphStyle: paragraphStyle, - NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13) ?? NSFont.systemFont(ofSize: 13), + NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13) ?? NSFont.systemFont(ofSize: 13) ] let leftButtonAttributedTitle = NSAttributedString(string: leftButton.title, attributes: styleAttributes) @@ -417,8 +416,7 @@ class ParentPanelController: NSWindowController { newHeight += 20 } else if DataStore.shared().shouldDisplay(.dstTransitionInfo), let obj = object, - TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) != nil - { + TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) != nil { newHeight += 20 } } @@ -606,8 +604,7 @@ class ParentPanelController: NSWindowController { if $0 < mainTableView.numberOfRows, let cellView = mainTableView.view(atColumn: 0, row: $0, makeIfNecessary: false) as? TimezoneCellView, - let model = TimezoneData.customObject(from: current) - { + let model = TimezoneData.customObject(from: current) { if let futureSliderCell = futureSlider.cell as? CustomSliderCell, futureSliderCell.tracking == true { return } @@ -627,8 +624,7 @@ class ParentPanelController: NSWindowController { if let note = model.note, !note.isEmpty { cellView.noteLabel.stringValue = note } else if DataStore.shared().shouldDisplay(.dstTransitionInfo), - let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) - { + let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) { cellView.noteLabel.stringValue = value } else { cellView.noteLabel.stringValue = CLEmptyString @@ -728,8 +724,7 @@ class ParentPanelController: NSWindowController { @IBAction func calendarButtonAction(_ sender: NSButton) { if sender.title == NSLocalizedString("Click here to start.", - comment: "Button Title for no Calendar access") - { + comment: "Button Title for no Calendar access") { showPermissionsWindow() } else { retrieveCalendarEvents() @@ -820,8 +815,7 @@ class ParentPanelController: NSWindowController { if let events = eventCenter.eventsForDate[NSCalendar.autoupdatingCurrent.startOfDay(for: now)], events.isEmpty == false { OperationQueue.main.addOperation { if self.upcomingEventCollectionView != nil, - let upcomingEvents = eventCenter.upcomingEventsForDay(events) - { + let upcomingEvents = eventCenter.upcomingEventsForDay(events) { self.upcomingEventsDataSource.updateEventsDataSource(upcomingEvents) self.upcomingEventCollectionView.reloadData() return @@ -901,7 +895,7 @@ class ParentPanelController: NSWindowController { let styleAttributes = [ NSAttributedString.Key.paragraphStyle: paragraphStyle, - NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)!, + NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)! ] leftButton.attributedTitle = NSAttributedString(string: "Not Really", attributes: styleAttributes) rightButton.attributedTitle = NSAttributedString(string: "Yes!", attributes: styleAttributes) @@ -937,7 +931,7 @@ class ParentPanelController: NSWindowController { let styleAttributes = [ NSAttributedString.Key.paragraphStyle: paragraphStyle, - NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)!, + NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)! ] if leftButton.attributedTitle.string == "Not Really" { @@ -1121,8 +1115,7 @@ extension ParentPanelController: NSSharingServicePickerDelegate { stride(from: 0, to: sortedByTime.count, by: 1).forEach { if $0 < sortedByTime.count, - let dataModel = TimezoneData.customObject(from: sortedByTime[$0]) - { + let dataModel = TimezoneData.customObject(from: sortedByTime[$0]) { let dataOperations = TimezoneDataOperations(with: dataModel) let date = dataOperations.todaysDate(with: 0) let time = dataOperations.time(with: 0) diff --git a/Clocker/Panel/UI/PanelTableView.swift b/Clocker/Panel/UI/PanelTableView.swift index 8f6bdce..c0dcf45 100644 --- a/Clocker/Panel/UI/PanelTableView.swift +++ b/Clocker/Panel/UI/PanelTableView.swift @@ -32,7 +32,7 @@ class PanelTableView: NSTableView { let options: NSTrackingArea.Options = [ .mouseMoved, .mouseEnteredAndExited, - .activeAlways, + .activeAlways ] let clipRect = enclosingScrollView?.contentView.bounds ?? .zero diff --git a/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift b/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift index 19810f6..effe786 100644 --- a/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift +++ b/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift @@ -40,8 +40,7 @@ class UpcomingEventViewItem: NSCollectionViewItem { _ color: NSColor, _ link: URL?, _ delegate: UpcomingEventPanelDelegate?, - _ isCancelled: Bool) - { + _ isCancelled: Bool) { if leadingConstraint.constant != UpcomingEventViewItem.EventLeadingConstraint / 2 { leadingConstraint.animator().constant = UpcomingEventViewItem.EventLeadingConstraint / 2 } diff --git a/Clocker/Preferences/App Feedback/AppFeedbackWindowController.swift b/Clocker/Preferences/App Feedback/AppFeedbackWindowController.swift index 0cce1b5..05fb914 100644 --- a/Clocker/Preferences/App Feedback/AppFeedbackWindowController.swift +++ b/Clocker/Preferences/App Feedback/AppFeedbackWindowController.swift @@ -80,8 +80,7 @@ class AppFeedbackWindowController: NSWindowController { themeDidChangeNotification = NotificationCenter.default.addObserver(forName: .themeDidChangeNotification, object: nil, - queue: OperationQueue.main) - { _ in + queue: OperationQueue.main) { _ in self.window?.backgroundColor = Themer.shared().mainBackgroundColor() self.setup() } @@ -202,7 +201,7 @@ class AppFeedbackWindowController: NSWindowController { AppFeedbackConstants.CLOperatingSystemVersion: osVersion, AppFeedbackConstants.CLClockerVersion: versionInfo, AppFeedbackConstants.CLAppFeedbackDateProperty: todaysDate(), - AppFeedbackConstants.CLAppFeedbackUserPreferences: generateUserPreferences(), + AppFeedbackConstants.CLAppFeedbackUserPreferences: generateUserPreferences() ] } diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift index 79558af..9c41148 100644 --- a/Clocker/Preferences/Appearance/AppearanceViewController.swift +++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift @@ -60,7 +60,7 @@ class AppearanceViewController: ParentViewController { "4 days", "5 days", "6 days", - "7 days", + "7 days" ]) if #available(macOS 11.0, *) {} else { @@ -188,8 +188,7 @@ class AppearanceViewController: ParentViewController { refresh(panel: true, floating: true) if let selectedFormat = sender.selectedItem?.title, - selectedFormat.contains("ss") - { + selectedFormat.contains("ss") { Logger.info("Selected format contains timezone format") guard let panelController = PanelController.panel() else { return } panelController.pauseTimer() diff --git a/Clocker/Preferences/Calendar/CalendarViewController.swift b/Clocker/Preferences/Calendar/CalendarViewController.swift index fd17568..6e77ab4 100644 --- a/Clocker/Preferences/Calendar/CalendarViewController.swift +++ b/Clocker/Preferences/Calendar/CalendarViewController.swift @@ -114,7 +114,7 @@ class CalendarViewController: ParentViewController { let attributesDictionary: [NSAttributedString.Key: Any] = [ NSAttributedString.Key.paragraphStyle: style, NSAttributedString.Key.font: boldFont, - NSAttributedString.Key.foregroundColor: Themer.shared().mainTextColor(), + NSAttributedString.Key.foregroundColor: Themer.shared().mainTextColor() ] let attributedString = NSAttributedString(string: title, attributes: attributesDictionary) @@ -243,15 +243,13 @@ extension CalendarViewController: NSTableViewDelegate { func tableView(_ tableView: NSTableView, viewFor _: NSTableColumn?, row: Int) -> NSView? { if let currentSource = calendars[row] as? String, - let message = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "sourceCellView"), owner: self) as? SourceTableViewCell - { + let message = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "sourceCellView"), owner: self) as? SourceTableViewCell { message.sourceName.stringValue = currentSource return message } if let currentSource = calendars[row] as? CalendarInfo, - let calendarCell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "calendarCellView"), owner: self) as? CalendarTableViewCell - { + let calendarCell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "calendarCellView"), owner: self) as? CalendarTableViewCell { calendarCell.calendarName.stringValue = currentSource.calendar.title calendarCell.calendarSelected.state = currentSource.selected ? NSControl.StateValue.on : NSControl.StateValue.off calendarCell.calendarSelected.target = self diff --git a/Clocker/Preferences/General/PreferencesDataSource.swift b/Clocker/Preferences/General/PreferencesDataSource.swift index 63d464d..770f83d 100644 --- a/Clocker/Preferences/General/PreferencesDataSource.swift +++ b/Clocker/Preferences/General/PreferencesDataSource.swift @@ -104,8 +104,7 @@ extension PreferencesDataSource: NSTableViewDataSource { var selectedDataSource: TimezoneData? if selectedTimezones.count > row, - let model = TimezoneData.customObject(from: selectedTimezones[row]) - { + let model = TimezoneData.customObject(from: selectedTimezones[row]) { selectedDataSource = model } @@ -162,7 +161,7 @@ extension PreferencesDataSource: NSTableViewDataSource { if selectedTimezones.count > row { Logger.log(object: [ "Old Label": dataObject.customLabel ?? "Error", - "New Label": formattedValue, + "New Label": formattedValue ], for: "Custom Label Changed") @@ -175,7 +174,7 @@ extension PreferencesDataSource: NSTableViewDataSource { Logger.log(object: [ "MethodName": "SetObjectValue", "Selected Timezone Count": selectedTimezones.count, - "Current Row": row, + "Current Row": row ], for: "Error in selected row count") } diff --git a/Clocker/Preferences/General/PreferencesViewController.swift b/Clocker/Preferences/General/PreferencesViewController.swift index f59decb..4184a56 100644 --- a/Clocker/Preferences/General/PreferencesViewController.swift +++ b/Clocker/Preferences/General/PreferencesViewController.swift @@ -95,8 +95,7 @@ class PreferencesViewController: ParentViewController { NotificationCenter.default.addObserver(forName: NSUbiquitousKeyValueStore.didChangeExternallyNotification, object: self, - queue: OperationQueue.main) - { [weak self] _ in + queue: OperationQueue.main) { [weak self] _ in if let sSelf = self { sSelf.refreshTimezoneTableView() } @@ -249,7 +248,7 @@ class PreferencesViewController: ParentViewController { [timezoneNameSortButton, labelSortButton, timezoneSortButton].forEach { $0?.attributedTitle = NSAttributedString(string: $0?.title ?? CLEmptyString, attributes: [ NSAttributedString.Key.foregroundColor: Themer.shared().mainTextColor(), - NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)!, + NSAttributedString.Key.font: NSFont(name: "Avenir-Light", size: 13)! ]) } @@ -345,8 +344,7 @@ extension PreferencesViewController: NSTableViewDataSource, NSTableViewDelegate if let appDelegate = NSApplication.shared.delegate as? AppDelegate, let menubarFavourites = DataStore.shared().menubarTimezones(), menubarFavourites.isEmpty, - DataStore.shared().shouldDisplay(.showMeetingInMenubar) == false - { + DataStore.shared().shouldDisplay(.showMeetingInMenubar) == false { appDelegate.invalidateMenubarTimer(true) } @@ -510,7 +508,7 @@ extension PreferencesViewController { CLTimezoneName: formattedAddress, CLCustomLabel: formattedAddress, CLTimezoneID: CLEmptyString, - CLPlaceIdentifier: $0.placeId, + CLPlaceIdentifier: $0.placeId ] as [String: Any] finalResults.append(TimezoneData(with: totalPackage)) @@ -602,7 +600,7 @@ extension PreferencesViewController { "latitude": dataObject.latitude!, "longitude": dataObject.longitude!, "nextUpdate": CLEmptyString, - CLCustomLabel: filteredAddress, + CLCustomLabel: filteredAddress ] as [String: Any] // Mark if the timezone is same as local timezone diff --git a/Clocker/Preferences/Menu Bar/StatusContainerView.swift b/Clocker/Preferences/Menu Bar/StatusContainerView.swift index 282d598..2e95f92 100644 --- a/Clocker/Preferences/Menu Bar/StatusContainerView.swift +++ b/Clocker/Preferences/Menu Bar/StatusContainerView.swift @@ -33,12 +33,10 @@ func compactWidth(for timezone: TimezoneData) -> Int { if timeFormat == DateFormat.twelveHour || timeFormat == DateFormat.twelveHourWithSeconds || timeFormat == DateFormat.twelveHourWithZero - || timeFormat == DateFormat.twelveHourWithSeconds - { + || timeFormat == DateFormat.twelveHourWithSeconds { totalWidth += 20 } else if timeFormat == DateFormat.twentyFourHour - || timeFormat == DateFormat.twentyFourHourWithSeconds - { + || timeFormat == DateFormat.twentyFourHourWithSeconds { totalWidth += 0 } @@ -78,7 +76,7 @@ class StatusContainerView: NSView { let timeBasedAttributes = [ NSAttributedString.Key.font: compactModeTimeFont, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] func containerWidth(for timezones: [Data]) -> CGFloat { @@ -137,7 +135,7 @@ class StatusContainerView: NSView { NSAttributedString.Key.font: compactModeTimeFont, NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] let operation = TimezoneDataOperations(with: timezone) diff --git a/Clocker/Preferences/Menu Bar/StatusItemHandler.swift b/Clocker/Preferences/Menu Bar/StatusItemHandler.swift index d055680..4b3c568 100644 --- a/Clocker/Preferences/Menu Bar/StatusItemHandler.swift +++ b/Clocker/Preferences/Menu Bar/StatusItemHandler.swift @@ -115,8 +115,7 @@ class StatusItemHandler: NSObject { userNotificationsDidChangeNotif = center.addObserver(forName: UserDefaults.didChangeNotification, object: self, - queue: mainQueue) - { _ in + queue: mainQueue) { _ in self.setupStatusItem() } diff --git a/Clocker/Preferences/Menu Bar/StatusItemView.swift b/Clocker/Preferences/Menu Bar/StatusItemView.swift index a2b871b..597d740 100644 --- a/Clocker/Preferences/Menu Bar/StatusItemView.swift +++ b/Clocker/Preferences/Menu Bar/StatusItemView.swift @@ -50,7 +50,7 @@ class StatusItemView: NSView { NSAttributedString.Key.font: compactModeTimeFont, NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] return attributes } @@ -62,7 +62,7 @@ class StatusItemView: NSView { NSAttributedString.Key.font: NSFont.boldSystemFont(ofSize: 10), NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] return textFontAttributes } @@ -91,14 +91,14 @@ class StatusItemView: NSView { locationView.leadingAnchor.constraint(equalTo: leadingAnchor), locationView.trailingAnchor.constraint(equalTo: trailingAnchor), locationView.topAnchor.constraint(equalTo: topAnchor, constant: 7), - locationView.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 0.35), + locationView.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 0.35) ]) NSLayoutConstraint.activate([ timeView.leadingAnchor.constraint(equalTo: leadingAnchor), timeView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: 0), timeView.topAnchor.constraint(equalTo: locationView.bottomAnchor), - timeView.bottomAnchor.constraint(equalTo: bottomAnchor), + timeView.bottomAnchor.constraint(equalTo: bottomAnchor) ]) } diff --git a/Clocker/Preferences/Menu Bar/UpcomingEventStatusItemView.swift b/Clocker/Preferences/Menu Bar/UpcomingEventStatusItemView.swift index 52196ac..640e03a 100644 --- a/Clocker/Preferences/Menu Bar/UpcomingEventStatusItemView.swift +++ b/Clocker/Preferences/Menu Bar/UpcomingEventStatusItemView.swift @@ -21,7 +21,7 @@ class UpcomingEventStatusItemView: NSView { NSAttributedString.Key.font: compactModeTimeFont, NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] return attributes } @@ -33,7 +33,7 @@ class UpcomingEventStatusItemView: NSView { NSAttributedString.Key.font: NSFont.boldSystemFont(ofSize: 10), NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.backgroundColor: NSColor.clear, - NSAttributedString.Key.paragraphStyle: defaultParagraphStyle, + NSAttributedString.Key.paragraphStyle: defaultParagraphStyle ] return textFontAttributes } @@ -54,14 +54,14 @@ class UpcomingEventStatusItemView: NSView { nextEventField.leadingAnchor.constraint(equalTo: leadingAnchor), nextEventField.trailingAnchor.constraint(equalTo: trailingAnchor), nextEventField.topAnchor.constraint(equalTo: topAnchor, constant: 7), - nextEventField.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 0.35), + nextEventField.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 0.35) ]) NSLayoutConstraint.activate([ etaField.leadingAnchor.constraint(equalTo: leadingAnchor), etaField.trailingAnchor.constraint(equalTo: trailingAnchor, constant: 0), etaField.topAnchor.constraint(equalTo: nextEventField.bottomAnchor), - etaField.bottomAnchor.constraint(equalTo: bottomAnchor), + etaField.bottomAnchor.constraint(equalTo: bottomAnchor) ]) } diff --git a/Clocker/StartupKit/Package.swift b/Clocker/StartupKit/Package.swift index 968a353..20e83a3 100644 --- a/Clocker/StartupKit/Package.swift +++ b/Clocker/StartupKit/Package.swift @@ -6,13 +6,13 @@ import PackageDescription let package = Package( name: "StartupKit", platforms: [ - .macOS(.v10_12), + .macOS(.v10_12) ], products: [ .library( name: "StartupKit", targets: ["StartupKit"] - ), + ) ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -22,6 +22,6 @@ let package = Package( .target( name: "StartupKit", dependencies: [] - ), + ) ] )