use extended ascii, add styles to signal bar

Chleba · Dec 10, 2023 · 4680e02 · 4680e02
1 parent 8469f44
commit 4680e02
Show file tree

Hide file tree

Showing 3 changed files with 251 additions and 221 deletions.
diff --git a/src/action.rs b/src/action.rs
@@ -2,73 +2,78 @@ use std::fmt;
 use tokio_wifiscanner::Wifi;
 
 use serde::{
-  de::{self, Deserializer, Visitor},
-  Deserialize, Serialize,
+    de::{self, Deserializer, Visitor},
+    Deserialize, Serialize,
 };
 
 use crate::components::wifiscan::WifiInfo;
 
 // #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 #[derive(Debug, Clone, PartialEq)]
 pub enum Action {
-  Tick,
-  Render,
-  Resize(u16, u16),
-  Suspend,
-  Resume,
-  Quit,
-  Refresh,
-  Error(String),
-  Help,
+    Tick,
+    Render,
+    Resize(u16, u16),
+    Suspend,
+    Resume,
+    Quit,
+    Refresh,
+    Error(String),
+    Help,
 
-  Scan(Vec<WifiInfo>),
+    // -- custom actions
+    Scan(Vec<WifiInfo>),
 }
 
 impl<'de> Deserialize<'de> for Action {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    struct ActionVisitor;
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct ActionVisitor;
 
-    impl<'de> Visitor<'de> for ActionVisitor {
-      type Value = Action;
+        impl<'de> Visitor<'de> for ActionVisitor {
+            type Value = Action;
 
-      fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("a valid string representation of Action")
-      }
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("a valid string representation of Action")
+            }
 
-      fn visit_str<E>(self, value: &str) -> Result<Action, E>
-      where
-        E: de::Error,
-      {
-        match value {
-          "Tick" => Ok(Action::Tick),
-          "Render" => Ok(Action::Render),
-          "Suspend" => Ok(Action::Suspend),
-          "Resume" => Ok(Action::Resume),
-          "Quit" => Ok(Action::Quit),
-          "Refresh" => Ok(Action::Refresh),
-          "Help" => Ok(Action::Help),
-          data if data.starts_with("Error(") => {
-            let error_msg = data.trim_start_matches("Error(").trim_end_matches(")");
-            Ok(Action::Error(error_msg.to_string()))
-          },
-          data if data.starts_with("Resize(") => {
-            let parts: Vec<&str> = data.trim_start_matches("Resize(").trim_end_matches(")").split(',').collect();
-            if parts.len() == 2 {
-              let width: u16 = parts[0].trim().parse().map_err(E::custom)?;
-              let height: u16 = parts[1].trim().parse().map_err(E::custom)?;
-              Ok(Action::Resize(width, height))
-            } else {
-              Err(E::custom(format!("Invalid Resize format: {}", value)))
+            fn visit_str<E>(self, value: &str) -> Result<Action, E>
+            where
+                E: de::Error,
+            {
+                match value {
+                    "Tick" => Ok(Action::Tick),
+                    "Render" => Ok(Action::Render),
+                    "Suspend" => Ok(Action::Suspend),
+                    "Resume" => Ok(Action::Resume),
+                    "Quit" => Ok(Action::Quit),
+                    "Refresh" => Ok(Action::Refresh),
+                    "Help" => Ok(Action::Help),
+                    data if data.starts_with("Error(") => {
+                        let error_msg = data.trim_start_matches("Error(").trim_end_matches(")");
+                        Ok(Action::Error(error_msg.to_string()))
+                    }
+                    data if data.starts_with("Resize(") => {
+                        let parts: Vec<&str> = data
+                            .trim_start_matches("Resize(")
+                            .trim_end_matches(")")
+                            .split(',')
+                            .collect();
+                        if parts.len() == 2 {
+                            let width: u16 = parts[0].trim().parse().map_err(E::custom)?;
+                            let height: u16 = parts[1].trim().parse().map_err(E::custom)?;
+                            Ok(Action::Resize(width, height))
+                        } else {
+                            Err(E::custom(format!("Invalid Resize format: {}", value)))
+                        }
+                    }
+                    _ => Err(E::custom(format!("Unknown Action variant: {}", value))),
+                }
             }
-          },
-          _ => Err(E::custom(format!("Unknown Action variant: {}", value))),
         }
-      }
-    }
 
-    deserializer.deserialize_str(ActionVisitor)
-  }
+        deserializer.deserialize_str(ActionVisitor)
+    }
 }
diff --git a/src/components/home.rs b/src/components/home.rs
@@ -45,7 +45,7 @@ impl Component for Home {
   }
 
   fn draw(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()> {
-    f.render_widget(Paragraph::new("hello world"), area);
+    f.render_widget(Paragraph::new("Network scanner"), area);
     Ok(())
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ impl Component for Home { @@
       }
       fn draw(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()> {
-        f.render_widget(Paragraph::new("hello world"), area);
+        f.render_widget(Paragraph::new("Network scanner"), area);
         Ok(())
       }
     }
@@ Expand Down @@