From 235563aa0ae541d59d347395f6d1dee0673ca50b Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 25 Feb 2024 19:19:48 -0500
Subject: [PATCH] feat: (ags razer): use label with percent instead of bar

---
 .../ags/config/scss/binto-widgets/bar.scss    | 35 ++++---------------
 .../ags/config/ts/bar/items/razer-stats.ts    | 28 ++++++++++-----
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/modules/ags/config/scss/binto-widgets/bar.scss b/modules/ags/config/scss/binto-widgets/bar.scss
index 115615b6..ad1ded94 100644
--- a/modules/ags/config/scss/binto-widgets/bar.scss
+++ b/modules/ags/config/scss/binto-widgets/bar.scss
@@ -25,39 +25,16 @@
   padding: 0 5px;
   background: $bgfull;
 
-  .low progress {
-    background: $red;
+  .low {
+    color: $red;
   }
 
-  .medium progress {
-    background: $yellow;
+  .medium {
+    color: $yellow;
   }
 
-  .high progress {
-    background: $green;
-  }
-
-  progressbar:disabled {
-    opacity: 0.5;
-  }
-
-  progressbar {
-    min-height: 6px;
-    background: transparent;
-    border: none;
-
-    trough {
-      background: #363847;
-      min-height: inherit;
-      border-radius: inherit;
-      border: 0.3px solid black;
-    }
-
-    progress {
-      min-height: inherit;
-      border-radius: inherit;
-      border: none;
-    }
+  .high {
+    color: $green;
   }
 
   image {
diff --git a/modules/ags/config/ts/bar/items/razer-stats.ts b/modules/ags/config/ts/bar/items/razer-stats.ts
index ee048bb7..74170d3f 100644
--- a/modules/ags/config/ts/bar/items/razer-stats.ts
+++ b/modules/ags/config/ts/bar/items/razer-stats.ts
@@ -1,9 +1,11 @@
-const { Box, Icon, ProgressBar } = Widget;
+
+const { Box, Icon, Label } = Widget;
 
 const RAZER_POLL = 30000;
 const LOW_BATT = 20;
 
 
+// TODO: add charging indicator
 const RazerBat = Variable(-1, {
     poll: [
         RAZER_POLL,
@@ -15,11 +17,20 @@ const RazerBat = Variable(-1, {
             "polychromatic-cli -n 'Razer Naga Pro (Wireless)' -k",
         ],
         (out) => {
-            const battery = out.split('\n')
+            const batteryMatches = out.split('\n')
                 .filter((i) => i.includes('Battery'))[0]
                 .match(/[0-9]+/);
 
-            return battery !== null ? parseInt(battery[0]) : -1;
+            let battery = batteryMatches !== null ?
+                parseInt(batteryMatches[0]) :
+                -1;
+
+            // Don't set to zero when in sleep mode
+            if (battery === 0 && RazerBat.value > 10) {
+                battery = RazerBat.value;
+            }
+
+            return battery;
         },
     ],
 });
@@ -34,11 +45,6 @@ export default () => Box({
                     'mouse-razer-symbolic' :
                     'content-loading-symbolic';
             }),
-        }),
-
-        ProgressBar({
-            vpack: 'center',
-            value: RazerBat.bind().transform((v) => v >= 0 ? v / 100 : 0),
             setup: (self) => {
                 self.hook(RazerBat, () => {
                     self.toggleClassName(
@@ -57,5 +63,11 @@ export default () => Box({
             },
         }),
 
+        Label({
+            vpack: 'center',
+            label: RazerBat.bind().transform((v) => {
+                return v !== -1 ? `${v}%` : '';
+            }),
+        }),
     ],
 });