From e42227879162a9f142d74e69cefd70f83310501e Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Thu, 10 Mar 2022 18:50:07 +0100 Subject: [PATCH] feat: added `Based on utilization` color option for Bar chart widget in the Battery module (#865) --- Kit/Widgets/BarChart.swift | 2 +- Modules/Battery/config.plist | 1 - Modules/Battery/main.swift | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Kit/Widgets/BarChart.swift b/Kit/Widgets/BarChart.swift index cd196032..9efdf02b 100644 --- a/Kit/Widgets/BarChart.swift +++ b/Kit/Widgets/BarChart.swift @@ -171,7 +171,7 @@ public class BarChart: WidgetWrapper { if partitionValue.color == nil { switch self.colorState { case .systemAccent: controlAccentColor.set() - case .utilization: partitionValue.value.usageColor(zones: self.colorZones).setFill() + case .utilization: partitionValue.value.usageColor(zones: self.colorZones, reversed: self.title == "Battery").setFill() case .pressure: self.pressureLevel.pressureColor().setFill() case .monochrome: if self.boxState { diff --git a/Modules/Battery/config.plist b/Modules/Battery/config.plist index a069e497..dbb913b1 100644 --- a/Modules/Battery/config.plist +++ b/Modules/Battery/config.plist @@ -54,7 +54,6 @@ Unsupported colors - utilization pressure Order diff --git a/Modules/Battery/main.swift b/Modules/Battery/main.swift index 9b6ad26f..7ee98383 100644 --- a/Modules/Battery/main.swift +++ b/Modules/Battery/main.swift @@ -117,7 +117,9 @@ public class Battery: Module { case let widget as Mini: widget.setValue(abs(value.level)) widget.setColorZones((0.15, 0.3)) - case let widget as BarChart: widget.setValue([[ColorValue(value.level)]]) + case let widget as BarChart: + widget.setValue([[ColorValue(value.level)]]) + widget.setColorZones((0.15, 0.3)) case let widget as BatterykWidget: widget.setValue( percentage: value.level ,