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

feat(bluetooth): add discoverable & pairable toggles + fix bug where the receiver for bluetooth events is accidentally dropped

Browse source
This commit is contained in:
Ashley Wulber 2023-02-10 13:08:29 -05:00 • committed by Ashley Wulber
parent c068343c4d
commit b1a5468547
3 changed files with 48 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cosmic-applet-bluetooth/src/app.rs
View file

@ -34,19 +34,6 @@ pub fn run() -> cosmic::iced::Result {
CosmicBluetoothApplet::run(helper.window_settings())
}
// impl Into<()> for NewConnectionState {
// fn into(self) -> AccessPoint {
// match self {
// NewConnectionState::EnterPassword {
// access_point,
// password,
// } => access_point,
// NewConnectionState::Waiting(access_point) => access_point,
// NewConnectionState::Failure(access_point) => access_point,
// }
// }
// }
#[derive(Default)]
struct CosmicBluetoothApplet {
icon_name: String,
@ -151,9 +138,6 @@ impl Application for CosmicBluetoothApplet {
BluerRequest::StateUpdate
if self.popup.is_some() && self.bluer_sender.is_some() =>
{
for device in &self.bluer_state.devices {
dbg!((&device.name, &device.status));
}
let tx = self.bluer_sender.as_ref().cloned().unwrap();
return Command::perform(
async move {
@ -172,9 +156,6 @@ impl Application for CosmicBluetoothApplet {
self.bluer_state = state;
}
BluerEvent::DevicesChanged { state } => {
for device in &state.devices {
dbg!(&device.name);
}
self.bluer_state = state;
}
BluerEvent::Finished => {
@ -372,12 +353,22 @@ impl Application for CosmicBluetoothApplet {
}
let mut content = column![
container(
column![
toggler(fl!("bluetooth"), self.bluer_state.bluetooth_enabled, |m| {
Message::Request(BluerRequest::SetBluetoothEnabled(m))
},)
.width(Length::Fill),
// these are not in the UX mockup, but they are useful imo
toggler(fl!("discoverable"), self.bluer_state.discoverable, |m| {
Message::Request(BluerRequest::SetDiscoverable(m))
},)
.width(Length::Fill),
toggler(fl!("pairable"), self.bluer_state.pairable, |m| {
Message::Request(BluerRequest::SetPairable(m))
},)
.width(Length::Fill)
)
]
.spacing(8)
.padding([0, 12]),
divider::horizontal::light(),
known_bluetooth,