morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: moved from NSUserNotification to the User Notification

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-01-23 00:06:49 +01:00
parent 6172cd9c49
commit edfb564bab
4 changed files with 114 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Modules/Battery/main.swift
View File

@@ -48,8 +48,8 @@ public class Battery: Module {
private let popupView: Popup
private var settingsView: Settings
private var lowNotification: NSUserNotification? = nil
private var highNotification: NSUserNotification? = nil
private var lowLevelNotificationState: Bool = false
private var highLevelNotificationState: Bool = false
public init() {
self.settingsView = Settings("Battery")
@@ -138,10 +138,9 @@ public class Battery: Module {
return
}
if (value.level > notificationLevel || value.powerSource != "Battery Power") && self.lowNotification != nil {
NSUserNotificationCenter.default.removeDeliveredNotification(self.lowNotification!)
if (value.level > notificationLevel || value.powerSource != "Battery Power") && self.lowLevelNotificationState {
if value.level > notificationLevel {
self.lowNotification = nil
self.lowLevelNotificationState = false
}
return
}
@@ -150,18 +149,26 @@ public class Battery: Module {
return
}
if value.level <= notificationLevel && self.lowNotification == nil {
if value.level <= notificationLevel && !self.lowLevelNotificationState {
let title = localizedString("Low battery")
var subtitle = localizedString("Battery remaining", "\(Int(value.level*100))")
if value.timeToEmpty > 0 {
subtitle += " (\(Double(value.timeToEmpty*60).printSecondsToHoursMinutesSeconds()))"
}
self.lowNotification = showNotification(
title: localizedString("Low battery"),
subtitle: subtitle,
id: "battery-level",
icon: NSImage(named: NSImage.Name("low-battery"))!
)
if #available(macOS 10.14, *) {
showNotification(
title: title,
subtitle: subtitle
)
} else {
showNSNotification(
title: title,
subtitle: subtitle
)
}
self.lowLevelNotificationState = true
}
}
@@ -175,10 +182,9 @@ public class Battery: Module {
return
}
if (value.level < notificationLevel || value.powerSource == "Battery Power") && self.highNotification != nil {
NSUserNotificationCenter.default.removeDeliveredNotification(self.highNotification!)
if (value.level < notificationLevel || value.powerSource == "Battery Power") && self.highLevelNotificationState {
if value.level < notificationLevel {
self.highNotification = nil
self.highLevelNotificationState = false
}
return
}
@@ -187,18 +193,26 @@ public class Battery: Module {
return
}
if value.level >= notificationLevel && self.highNotification == nil {
if value.level >= notificationLevel && !self.highLevelNotificationState {
let title = localizedString("High battery")
var subtitle = localizedString("Battery remaining to full charge", "\(Int((1-value.level)*100))")
if value.timeToCharge > 0 {
subtitle += " (\(Double(value.timeToCharge*60).printSecondsToHoursMinutesSeconds()))"
}
self.highNotification = showNotification(
title: localizedString("High battery"),
subtitle: subtitle,
id: "battery-level2",
icon: NSImage(named: NSImage.Name("high-battery"))!
)
if #available(macOS 10.14, *) {
showNotification(
title: title,
subtitle: subtitle
)
} else {
showNSNotification(
title: title,
subtitle: subtitle
)
}
self.highLevelNotificationState = true
}
}
}