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

improv(bluetooth): align confirm and cancel buttons closer to design

Browse source
This commit is contained in:
Vukašin Vojinović 2024-09-01 16:11:02 +02:00 • committed by Michael Murphy
parent 77e6fc5908
commit a2063213e4
1 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,6 @@ use crate::bluetooth::{BluerDeviceStatus, BluerRequest, BluerState, DeviceProper
use cosmic::{ use cosmic::{
applet::token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate}, applet::token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate},
cctk::sctk::reexports::calloop, cctk::sctk::reexports::calloop,
widget::text::body,
}; };
use cosmic::{ use cosmic::{
@ -13,7 +12,7 @@ use cosmic::{
iced::{ iced::{
self, self,
wayland::popup::{destroy_popup, get_popup}, wayland::popup::{destroy_popup, get_popup},
widget::{column, container, row, scrollable, text, Column}, widget::{column, container, row, scrollable, Column},
Alignment, Length, Subscription, Alignment, Length, Subscription,
}, },
iced_runtime::core::{ iced_runtime::core::{
@ -22,7 +21,7 @@ use cosmic::{
window, window,
}, },
iced_style::application, iced_style::application,
widget::{button, divider, icon}, widget::{button, divider, icon, text},
Command, Element, Theme, Command, Element, Theme,
}; };
use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline}; use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline};
@ -359,8 +358,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
}) { }) {
let mut row = row![ let mut row = row![
icon::from_name(dev.icon.as_str()).size(16).symbolic(true), icon::from_name(dev.icon.as_str()).size(16).symbolic(true),
text(dev.name.clone()) text::body(dev.name.clone())
.size(14)
.horizontal_alignment(Horizontal::Left) .horizontal_alignment(Horizontal::Left)
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.width(Length::Fill) .width(Length::Fill)
@ -380,7 +378,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
}; };
let status = row!( let status = row!(
icon::from_name(icon).symbolic(true).size(14), icon::from_name(icon).symbolic(true).size(14),
body(format!("{}%", battery)) text::body(format!("{}%", battery))
) )
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(2) .spacing(2)
@ -396,8 +394,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
match &dev.status { match &dev.status {
BluerDeviceStatus::Connected => { BluerDeviceStatus::Connected => {
row = row.push( row = row.push(
text(fl!("connected")) text::body(fl!("connected"))
.size(14)
.horizontal_alignment(Horizontal::Right) .horizontal_alignment(Horizontal::Right)
.vertical_alignment(Vertical::Center), .vertical_alignment(Vertical::Center),
); );
@ -459,8 +456,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
"go-next-symbolic" "go-next-symbolic"
}; };
let available_connections_btn = menu_button(row![ let available_connections_btn = menu_button(row![
text(fl!("other-devices")) text::body(fl!("other-devices"))
.size(14)
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fixed(24.0)) .height(Length::Fixed(24.0))
.vertical_alignment(Vertical::Center), .vertical_alignment(Vertical::Center),
@ -471,8 +467,10 @@ impl cosmic::Application for CosmicBluetoothApplet {
.height(Length::Fixed(24.0)) .height(Length::Fixed(24.0))
]) ])
.on_press(Message::ToggleVisibleDevices(!self.show_visible_devices)); .on_press(Message::ToggleVisibleDevices(!self.show_visible_devices));
content = content.push(padded_control(divider::horizontal::default())); if self.bluer_state.bluetooth_enabled {
content = content.push(available_connections_btn); content = content.push(padded_control(divider::horizontal::default()));
content = content.push(available_connections_btn);
}
let mut list_column: Vec<Element<'_, Message>> = let mut list_column: Vec<Element<'_, Message>> =
Vec::with_capacity(self.bluer_state.devices.len()); Vec::with_capacity(self.bluer_state.devices.len());
@ -482,56 +480,50 @@ impl cosmic::Application for CosmicBluetoothApplet {
icon::from_name(device.icon.as_str()) icon::from_name(device.icon.as_str())
.size(16) .size(16)
.symbolic(true), .symbolic(true),
text(&device.name) text::body(&device.name)
.size(14)
.horizontal_alignment(Horizontal::Left) .horizontal_alignment(Horizontal::Left)
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.width(Length::Fill) .width(Length::Fill)
]), ]),
padded_control( padded_control(
text(fl!( text::body(fl!(
"confirm-pin", "confirm-pin",
HashMap::from_iter(vec![("deviceName", device.name.clone())]) HashMap::from_iter(vec![("deviceName", device.name.clone())])
)) ))
.horizontal_alignment(Horizontal::Left) .horizontal_alignment(Horizontal::Left)
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.width(Length::Fill) .width(Length::Fill)
.size(14)
), ),
padded_control( padded_control(
text(pin) text::title3(pin)
.horizontal_alignment(Horizontal::Center) .horizontal_alignment(Horizontal::Center)
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.width(Length::Fixed(280.0)) .width(Length::Fixed(280.0)) //.size(22)
.size(22)
) )
.align_x(Horizontal::Center), .align_x(Horizontal::Center),
padded_control( padded_control(
row![ row![
button( button(
text(fl!("cancel")) text::body(fl!("cancel"))
.size(14)
.width(Length::Fill)
.height(Length::Fixed(24.0))
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.horizontal_alignment(Horizontal::Center) .horizontal_alignment(Horizontal::Center)
) )
.padding([8, 24]) .padding([4, 0])
.width(Length::Fill) .height(Length::Fixed(28.0))
.width(Length::Fixed(105.0))
.on_press(Message::Cancel), .on_press(Message::Cancel),
button( button(
text(fl!("confirm")) text::body(fl!("confirm"))
.size(14)
.height(Length::Fixed(24.0))
.vertical_alignment(Vertical::Center) .vertical_alignment(Vertical::Center)
.horizontal_alignment(Horizontal::Center) .horizontal_alignment(Horizontal::Center)
) )
.padding([8, 24]) .padding([4, 0])
.width(Length::Fill) .height(Length::Fixed(28.0))
.width(Length::Fixed(105.0))
.on_press(Message::Confirm), .on_press(Message::Confirm),
] ]
.spacing(self.core.system_theme().cosmic().space_xxs()) .spacing(self.core.system_theme().cosmic().space_xxs())
.width(Length::Fill) .width(Length::Shrink)
.align_items(Alignment::Center) .align_items(Alignment::Center)
) )
.align_x(Horizontal::Center) .align_x(Horizontal::Center)
@ -552,9 +544,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
}) { }) {
let row = row![ let row = row![
icon::from_name(dev.icon.as_str()).size(16).symbolic(true), icon::from_name(dev.icon.as_str()).size(16).symbolic(true),
text(dev.name.clone()) text::body(dev.name.clone()).horizontal_alignment(Horizontal::Left),
.horizontal_alignment(Horizontal::Left)
.size(14),
] ]
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(12); .spacing(12);