leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(bluetooth): icons & text sizing

Browse source
This commit is contained in:
Ashley Wulber 2023-02-13 15:39:46 -05:00 • committed by Ashley Wulber
parent 4f9544f682
commit f272037bdd
2 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cosmic-applet-bluetooth/src/bluetooth.rs
View file

@ -150,6 +150,7 @@ pub struct BluerDevice {
pub address: Address,
pub status: BluerDeviceStatus,
pub properties: Vec<DeviceProperty>,
pub icon: String,
}
impl Eq for BluerDevice {}
@ -197,11 +198,23 @@ impl BluerDevice {
} else {
BluerDeviceStatus::Disconnected
};
let icon = properties
.iter()
.find_map(|p| {
if let DeviceProperty::Icon(icon) = p {
Some(icon.clone())
} else {
None
}
})
.unwrap_or_else(|| "bluetooth-symbolic".into());
Self {
name,
address: device.address(),
status,
properties,
icon,
}
}
}
@ -617,23 +630,8 @@ async fn build_device_list(adapter: &Adapter) -> Vec<BluerDevice> {
Ok(device) => device,
Err(_) => continue,
};
let name = device.name().await.unwrap_or_default().unwrap_or_default();
let is_paired = device.is_paired().await.unwrap_or_default();
let is_connected = device.is_connected().await.unwrap_or_default();
let properties = device.all_properties().await.unwrap_or_default();
let status = if is_connected {
BluerDeviceStatus::Connected
} else if is_paired {
BluerDeviceStatus::Paired
} else {
BluerDeviceStatus::Disconnected
};
devices.push(BluerDevice {
name,
address,
status,
properties,
});
devices.push(BluerDevice::from_device(&device).await);
}
devices.sort();
devices