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

fixed initWidget function in battery module

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2019-09-11 10:12:35 +02:00
parent c08cecf147
commit d6834fe33e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Stats/Modules/Battery/Battery.swift
View File

@@ -29,7 +29,6 @@ class Battery: Module {
self.available = Observable(self.reader.available)
self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
self.percentageView = Observable(defaults.object(forKey: "\(self.name)_percentage") != nil ? defaults.bool(forKey: "\(self.name)_percentage") : false)
self.view = BatteryWidget(frame: NSMakeRect(0, 0, widgetSize.width, widgetSize.height))
}
func start() {
@@ -37,7 +36,9 @@ class Battery: Module {
let value = self.reader.value!.value
(self.view as! Widget).setValue(data: [abs(value.first!)])
}
(self.view as! BatteryWidget).setCharging(value: (self.reader as! BatteryReader).usage.value.isCharged)
if let view = self.view as? BatteryWidget {
view.setCharging(value: (self.reader as! BatteryReader).usage.value.ACstatus)
}
self.reader.start()
self.reader.value.subscribe(observer: self) { (value, _) in
@@ -46,12 +47,13 @@ class Battery: Module {
}
}
(self.reader as! BatteryReader).usage.subscribe(observer: self) { (value, _) in
(self.view as! BatteryWidget).setCharging(value: value.isCharged)
(self.view as! BatteryWidget).setCharging(value: value.ACstatus)
}
}
func initWidget() {
(self.view as! BatteryWidget).setPercentage(value: self.percentageView.value)
self.view = BatteryWidget(frame: NSMakeRect(0, 0, widgetSize.width, widgetSize.height))
(self.view as! BatteryWidget).setPercentage(value: (self.reader as! BatteryReader).usage.value.ACstatus)
}
func initMenu(active: Bool) {

3
Stats/Modules/Module.swift
View File

@@ -29,11 +29,12 @@ protocol Module: class {
func initMenu(active: Bool)
func initTab()
func initWidget()
}
extension Module {
func initWidget(label: Bool = false) {
func initWidget() {
var widget: Widget = Mini()
switch self.widgetType {