net: make net_wireless icon dynamic

greshake · Mar 15, 2023 · 4e45727 · 4e45727
1 parent 0c7dde4
commit 4e45727
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/files/icons/material-nf.toml b/files/icons/material-nf.toml
@@ -70,7 +70,13 @@ net_modem = "\uf8f1" # nf-mdi-phone
 net_up = "\ufa51" # nf-mdi-upload
 net_vpn = "\ufa81" # nf-mdi-vpn
 net_wired = "\uf6ff" # nf-mdi-ethernet
-net_wireless = "\ufaa8" # nf-mdi-wifi
+net_wireless = [
+	"\U000F092F", # nf-md-wifi_strength_outline
+	"\U000F091F", # nf-md-wifi_strength_1
+	"\U000F0922", # nf-md-wifi_strength_2
+	"\U000F0925", # nf-md-wifi_strength_3
+	"\U000F0928", # nf-md-wifi_strength_4
+]
 notification = "\uf599" # nf-mdi-bell
 phone = "\uf8f1" # nf-mdi-phone
 phone_disconnected = "\ufb57" # nf-mdi-phone_minus

diff --git a/files/icons/material.toml b/files/icons/material.toml
@@ -56,7 +56,7 @@ net_modem = "\uefe6" # cable | TODO: broken?
 net_up = "\uf09b" # upload
 net_vpn = "\ue0da" # vpn_key
 net_wired = "\uefe6" # cable | TODO: broken?
-net_wireless = "\ue63e" # wifi
+net_wireless = "\ue63e" # wifi | TODO: progression based on signal strength
 notification = "\ue7f7" # notifications_active
 phone = "\ue324" # phone_android
 phone_disconnected = "\ue339" # device_unknown

diff --git a/src/blocks/net.rs b/src/blocks/net.rs
@@ -53,7 +53,7 @@
 //! - `net_loopback`
 //! - `net_vpn`
 //! - `net_wired`
-//! - `net_wireless`
+//! - `net_wireless` (as a progression)
 //! - `net_up`
 //! - `net_down`
 
@@ -140,8 +140,14 @@ pub async fn run(config: Config, mut api: CommonApi) -> Result<()> {
                 push_to_hist(&mut rx_hist, speed_down);
                 push_to_hist(&mut tx_hist, speed_up);
 
+                let icon = if let Some(signal) = device.signal() {
+                    Value::icon(api.get_icon_in_progression(device.icon, signal / 100.0)?)
+                } else {
+                    Value::icon(api.get_icon(device.icon)?)
+                };
+
                 widget.set_values(map! {
-                    "icon" => Value::icon(api.get_icon(device.icon)?),
+                    "icon" => icon,
                     "speed_down" => Value::bytes(speed_down),
                     "speed_up" => Value::bytes(speed_up),
                     "graph_down" => Value::text(util::format_bar_graph(&rx_hist)),