add default icon for the devices

Author: pythops

src/app.rs

@@ -416,13 +416,7 @@ impl App {
                 .iter()
                 .map(|d| {
                     Row::new(vec![
-                        {
-                            if let Some(icon) = &d.icon {
-                                format!("{} {}", icon, &d.alias)
-                            } else {
-                                d.alias.to_owned()
-                            }
-                        },
+                        format!("{} {}", &d.icon, &d.alias),
                         d.is_trusted.to_string(),
                         d.is_connected.to_string(),
                         {
@@ -586,43 +580,36 @@ impl App {
 
             //New devices
 
-            let mut max_name_width = 20;
             if render_new_devices {
                 let rows: Vec<Row> = selected_controller
                     .new_devices
                     .iter()
                     .map(|d| {
-                        Row::new(vec![d.addr.to_string(), {
-                            if let Some(icon) = &d.icon {
-                                format!("{} {}", icon, &d.alias)
-                            } else {
-                                if d.alias.len() > max_name_width {
-                                    max_name_width = d.alias.len();
-                                }
-                                d.alias.to_owned()
-                            }
-                        }])
+                        Row::new(vec![
+                            d.addr.to_string(),
+                            format!("{} {}", &d.icon, &d.alias),
+                        ])
                     })
                     .collect();
                 let rows_len = rows.len();
 
-                let widths = [
-                    Constraint::Length(20),
-                    Constraint::Length(max_name_width.try_into().unwrap()),
-                ];
+                let widths = [Constraint::Length(20), Constraint::Length(20)];
 
                 let new_devices_table = Table::new(rows, widths)
                     .header({
                         if self.focused_block == FocusedBlock::NewDevices {
                             Row::new(vec![
-                                Cell::from("Address").style(Style::default().fg(Color::Yellow)),
-                                Cell::from("Name").style(Style::default().fg(Color::Yellow)),
+                                Cell::from(Line::from("Address").fg(Color::Yellow).centered()),
+                                Cell::from(Line::from("Name").fg(Color::Yellow).centered()),
                             ])
                             .style(Style::new().bold())
                             .bottom_margin(1)
                         } else {
-                            Row::new(vec![Cell::from("Address"), Cell::from("Name")])
-                                .bottom_margin(1)
+                            Row::new(vec![
+                                Cell::from(Line::from("Address").centered()),
+                                Cell::from(Line::from("Name").centered()),
+                            ])
+                            .bottom_margin(1)
                         }
                     })
                     .block(

src/bluetooth.rs

@@ -23,7 +23,7 @@ pub struct Controller {
 pub struct Device {
     device: BTDevice,
     pub addr: Address,
-    pub icon: Option<String>,
+    pub icon: String,
     pub alias: String,
     pub is_paired: bool,
     pub is_trusted: bool,
@@ -38,19 +38,19 @@ impl Device {
     }
 
     // https://specifications.freedesktop.org/icon-naming/latest/
-    pub fn get_icon(name: &str) -> Option<String> {
+    pub fn get_icon(name: &str) -> String {
         match name {
-            "audio-card" => Some(String::from("󰓃")),
-            "audio-input-microphone" => Some(String::from("")),
-            "audio-headphones" | "audio-headset" => Some(String::from("󰋋")),
-            "battery" => Some(String::from("󰂀")),
-            "camera-photo" => Some(String::from("󰻛")),
-            "computer" => Some(String::from("")),
-            "input-keyboard" => Some(String::from("󰌌")),
-            "input-mouse" => Some(String::from("󰍽")),
-            "input-gaming" => Some(String::from("󰊴")),
-            "phone" => Some(String::from("󰏲")),
-            _ => Some(String::from(" ")),
+            "audio-card" => String::from("󰓃 "),
+            "audio-input-microphone" => String::from(" "),
+            "audio-headphones" | "audio-headset" => String::from("󰋋 "),
+            "battery" => String::from("󰂀 "),
+            "camera-photo" => String::from("󰻛 "),
+            "computer" => String::from(" "),
+            "input-keyboard" => String::from("󰌌 "),
+            "input-mouse" => String::from("󰍽 "),
+            "input-gaming" => String::from("󰊴 "),
+            "phone" => String::from("󰏲 "),
+            _ => String::from("󰾰 "),
         }
     }
 }