Skip to content

Commit 08accce

Browse files
Kn4ughtyKn4ughty
committed
refactor listrows to use builder pattern
1 parent 4f6a467 commit 08accce

5 files changed

Lines changed: 162 additions & 82 deletions

File tree

‎src/apps/mod.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,11 @@ impl Module for AppModule {
188188
Some(Icon::ImageHandle(h)) => Some(h),
189189
};
190190

191-
widglets::listrow(
192-
app.name,
193-
app.subname,
194-
Some(ModuleMessage::ActivatedIndex(i)),
195-
icon,
196-
)
197-
.into()
191+
widglets::ListRow::new(app.name)
192+
.optional_subtext(app.subname)
193+
.on_activate(ModuleMessage::ActivatedIndex(i))
194+
.optional_icon(icon)
195+
.into()
198196
}),
199197
)
200198
.width(iced::Fill),

‎src/drun/mod.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ impl Module for Drun {
6969
.clone()
7070
.into_iter()
7171
.enumerate()
72-
.map(|(i, opt)| {
73-
widglets::listrow(opt, None, Some(ModuleMessage::ActivatedIndex(i)), None)
72+
.map(|(i, item)| {
73+
widglets::ListRow::new(item)
74+
.on_activate(ModuleMessage::ActivatedIndex(i))
7475
.into()
7576
}),
7677
))

‎src/websearch/mod.rs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,23 @@ impl Module for Web {
143143
Some(url) => self.image_hashmap.get(&url).cloned(),
144144
};
145145

146-
widglets::listrow(
147-
result.title,
148-
Some(result.description),
149-
Some(ModuleMessage::WebMessage(WebMsg::ResultSelected(
146+
widglets::ListRow::new(result.title)
147+
.subtext(result.description)
148+
.on_activate(ModuleMessage::WebMessage(WebMsg::ResultSelected(
150149
result.destination_url,
151-
))), // eww
152-
image,
153-
)
154-
.into()
150+
)))
151+
.optional_icon(image)
152+
.into()
153+
154+
// widglets::ListRow(
155+
// result.title,
156+
// Some(result.description),
157+
// Some(ModuleMessage::WebMessage(WebMsg::ResultSelected(
158+
// result.destination_url,
159+
// ))), // eww
160+
// image,
161+
// )
162+
// .into()
155163
})
156164
.collect();
157165

‎src/widglets/list.rs‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
use iced::widget;
2+
3+
use super::PADDING;
4+
use super::{HeadingLevel, heading};
5+
6+
// pub struct ResultList<Message> {
7+
// selected_index: usize,
8+
// rows: Vec<ListRow<Message>>,
9+
// }
10+
11+
pub struct ListRow<Message> {
12+
text: String,
13+
subtext: Option<String>,
14+
icon: Option<iced::widget::image::Handle>,
15+
on_activate: Option<Message>,
16+
}
17+
18+
impl<Message> ListRow<Message> {
19+
pub fn new<T>(text: T) -> Self
20+
where
21+
T: ToString,
22+
{
23+
Self {
24+
text: text.to_string(),
25+
subtext: None,
26+
icon: None,
27+
on_activate: None,
28+
}
29+
}
30+
31+
pub fn subtext<T>(mut self, subtext: T) -> Self
32+
where
33+
T: ToString,
34+
{
35+
self.subtext = Some(subtext.to_string());
36+
self
37+
}
38+
39+
pub fn optional_subtext<T>(self, subtext: Option<T>) -> Self
40+
where
41+
T: ToString,
42+
{
43+
if let Some(text) = subtext {
44+
self.subtext(text)
45+
} else {
46+
self
47+
}
48+
}
49+
50+
pub fn icon(mut self, handle: widget::image::Handle) -> Self {
51+
self.icon = Some(handle);
52+
self
53+
}
54+
55+
pub fn optional_icon(self, handle: Option<widget::image::Handle>) -> Self {
56+
if let Some(h) = handle {
57+
self.icon(h)
58+
} else {
59+
self
60+
}
61+
}
62+
63+
/// Message to output when selected and enter is pressed, or clicked.
64+
pub fn on_activate(mut self, msg: Message) -> Self {
65+
self.on_activate = Some(msg);
66+
self
67+
}
68+
}
69+
70+
impl<'a, Message> From<ListRow<Message>> for iced::Element<'a, Message>
71+
where
72+
Message: Clone + 'a,
73+
{
74+
fn from(value: ListRow<Message>) -> Self {
75+
let mut row_widget = widget::Row::new().padding(0);
76+
77+
let icon_widget = widget::Responsive::new(move |size| {
78+
// wish i didnt have to clone
79+
if let Some(icon) = value.icon.clone() {
80+
let real_image =
81+
widget::image::Image::new(icon).content_fit(iced::ContentFit::Cover);
82+
83+
widget::container(real_image)
84+
} else {
85+
// TODO. Get image from user icon theme
86+
widget::container(widget::image(widget::image::Handle::from_bytes(
87+
include_bytes!("../../assets/image-missing-symbolic.png").to_vec(),
88+
)))
89+
}
90+
.clip(true)
91+
.width(size.height)
92+
.height(size.height)
93+
.padding(0)
94+
.align_y(iced::Alignment::Center)
95+
.align_x(iced::Alignment::Center)
96+
.into()
97+
})
98+
.width(iced::Shrink)
99+
.height(iced::Length::Fixed(32.0)); // i dont like this
100+
101+
row_widget = row_widget.push(icon_widget);
102+
row_widget = row_widget.push(widget::space().width(iced::Length::Fixed(PADDING)));
103+
104+
// let colw = widget::Column::new();
105+
106+
let text_widget = widget::container(
107+
heading(HeadingLevel::H3, value.text, None)
108+
.align_x(iced::Left)
109+
.align_y(iced::Alignment::Center)
110+
.width(iced::Fill),
111+
);
112+
row_widget = row_widget.push(text_widget);
113+
// let colw = colw.push(text_widget);
114+
115+
let subtext_widget = widget::container(
116+
heading(
117+
HeadingLevel::Subheading,
118+
value.subtext.unwrap_or_default(),
119+
None,
120+
)
121+
.align_x(iced::Right)
122+
.align_y(iced::Alignment::Center),
123+
);
124+
row_widget = row_widget.push(subtext_widget);
125+
126+
widget::container(
127+
widget::button(row_widget)
128+
.width(iced::Fill)
129+
.height(iced::Shrink)
130+
.on_press_maybe(value.on_activate)
131+
.style(widget::button::secondary),
132+
)
133+
.padding(PADDING)
134+
.into()
135+
}
136+
}

src/widglets.rs renamed to src/widglets/mod.rs

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use std::{fs, path::PathBuf};
22

33
use iced::widget;
44

5-
use crate::module::ModuleMessage;
5+
pub mod list;
6+
pub use list::ListRow;
67

78
const PADDING: f32 = 4.0;
89
const SVG_HEIGHT: usize = 64;
@@ -78,67 +79,3 @@ pub fn heading<'a>(
7879
widget::text::Style { color: c }
7980
})
8081
}
81-
82-
pub fn listrow<'a>(
83-
text: String,
84-
subtext: Option<String>,
85-
on_press: Option<ModuleMessage>,
86-
icon: Option<iced::widget::image::Handle>,
87-
) -> widget::Container<'a, ModuleMessage> {
88-
let mut row_widget = widget::Row::new().padding(0);
89-
90-
let full_icon = widget::Responsive::new(move |size| {
91-
// wish i didnt have to clone
92-
if let Some(icon) = icon.clone() {
93-
let real_image = widget::image::Image::new(icon).content_fit(iced::ContentFit::Cover);
94-
95-
widget::container(real_image)
96-
} else {
97-
// TODO. Get image from user icon theme
98-
widget::container(widget::image(widget::image::Handle::from_bytes(
99-
include_bytes!("../assets/image-missing-symbolic.png").to_vec(),
100-
)))
101-
}
102-
.clip(true)
103-
.width(size.height)
104-
.height(size.height)
105-
.padding(0)
106-
.align_y(iced::Alignment::Center)
107-
.align_x(iced::Alignment::Center)
108-
.into()
109-
})
110-
.width(iced::Shrink)
111-
.height(iced::Length::Fixed(32.0)); // i dont like this
112-
113-
row_widget = row_widget.push(full_icon);
114-
row_widget = row_widget.push(widget::space().width(iced::Length::Fixed(PADDING)));
115-
116-
// let colw = widget::Column::new();
117-
118-
let text_widget = widget::container(
119-
heading(HeadingLevel::H3, text, None)
120-
.align_x(iced::Left)
121-
.align_y(iced::Alignment::Center)
122-
.width(iced::Fill),
123-
);
124-
row_widget = row_widget.push(text_widget);
125-
// let colw = colw.push(text_widget);
126-
127-
let subtext_widget = widget::container(
128-
heading(HeadingLevel::Subheading, subtext.unwrap_or("".into()), None)
129-
.align_x(iced::Right)
130-
.align_y(iced::Alignment::Center),
131-
);
132-
row_widget = row_widget.push(subtext_widget);
133-
// let colw = colw.push(subtext_widget);
134-
// row_widget = row_widget.push(colw);
135-
136-
widget::container(
137-
widget::button(row_widget)
138-
.width(iced::Fill)
139-
.height(iced::Shrink)
140-
.on_press_maybe(on_press)
141-
.style(widget::button::secondary),
142-
)
143-
.padding(PADDING)
144-
}

0 commit comments

Comments
 (0)