M README.md → README.md

@@ -20,9 +20,6 @@ - volume mute
   - battery disconnect/reconnect
 
 UI:
-  - Battery
-    - indicator
-    - low level indicator
   - Sunset
     - disappears at night
 
@@ -31,7 +28,6 @@ - notifications
     - low battery notification
   - app launcher
   - bluetooth launcher
-  - Lock screen?
   - lock/sleep/power off screen?
   - wifi?
 

M bar/modules/Battery.qml → bar/modules/Battery.qml

@@ -9,15 +9,20 @@
 
 Repeater {
   model: UPower.devices.values.filter(d=>d.model)
+
   Class.RightRowLayout {
+    property var lvl: Math.round(modelData.percentage*100)
+    property var charge_state: UPowerDeviceState.toString(modelData.state)
     Class.BottombarText {
-      text: modelData.percentage*100+"%"
+      text: lvl+"%"
       font.family: font_jetbrains.name
-      color:  (modelData.percentage*100 < 20)
-              ? Resources.palette.scarlet
-              : Resources.palette.fg
-
-      }
+      color:
+        (charge_state == "Charging")
+        ? Resources.palette.saffron
+        : (lvl < 20)
+        ? Resources.palette.scarlet
+        : Resources.palette.fg
+    }
     Class.BottombarIcon {
       text: modelData.isLaptopBattery
             ? Icons.devices.battery
@@ -25,15 +30,15 @@ : {
                 "Jupiter of the Monkey": Icons.devices.headphones,
                 "mix4": Icons.devices.mewi,
               }[modelData.model] ?? modelData.model
-
-
       color:
-        ({
-          "Charging": Resources.palette.saffron,
-          "Discharging": Resources.palette.orange,
-          "FullyCharged": Resources.palette.cyan,
-          "Empty": Resources.palette.scarlet,
-        })[UPowerDeviceState.toString(modelData.state)] ?? Resources.palette.orange
+        lvl < 20
+        ? Resources.palette.scarlet
+        : {
+            "Charging": Resources.palette.saffron,
+            "Discharging": Resources.palette.orange,
+            "FullyCharged": Resources.palette.cyan,
+            "Empty": Resources.palette.scarlet,
+          }[charge_state] ?? Resources.palette.orange
     }
     Class.BotSep{}
   }

M bar/scripts/suntime.sh → bar/scripts/suntime.sh

@@ -12,6 +12,7 @@ now=$(date '+%H:%M')
     output=$(qalc -t $sun - $now to time)
     echo "+"$output
 else
+    return NIGHT
     exit 1
 fi
 

M shell.qml → shell.qml

@@ -27,7 +27,4 @@ source: "fonts/JetBrainsMono-Thin.ttf"
   }
   Bar {}
   // AnimationTest{}
-  // Surface{}
-  // Lock{}
-  // LockButton{}
 }