Skip to content

Commit fe01bf2

Browse files
StroselStrosel
committed
Snapshot for Ogeon/palette#283 
1 parent e3b808f commit fe01bf2

19 files changed

+1263
-1018
lines changed

‎Cargo.lock

+1,157-761
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+20-17
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@ update = []
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
giftwrap = "0.5"
15-
chrono = "0.4"
16-
dirs = "4.0"
17-
iced_core = "0.10"
18-
lazy_static = "1.4"
19-
rusqlite_migration = "1.0"
20-
futures = "0.3"
14+
giftwrap = "0.5.0"
15+
chrono = "0.4.34"
16+
dirs = "5.0.1"
17+
iced_core = "0.12.0"
18+
lazy_static = "1.4.0"
19+
rusqlite_migration = "1.1.0"
20+
futures = "0.3.30"
2121

22-
frost = {git = "https://github.com/Strosel/frost", tag="v0.10.0"}
22+
palette="0.7.1"
23+
frost = {git = "https://github.com/Strosel/frost", tag="v0.12.0"}
2324

2425
[dependencies.self_update]
25-
version = "0.37"
26+
version = "0.39.0"
2627
default-features = false
2728
features = ["rustls", "archive-zip", "compression-zip-deflate"]
2829

2930
[dependencies.iced]
30-
version = "0.10"
31+
version = "0.12.0"
3132
features = [
3233
"canvas",
3334
"tokio",
@@ -36,11 +37,13 @@ features = [
3637
]
3738

3839
[dependencies.rusqlite]
39-
version = "0.29"
40+
version = "0.30.0"
4041
features = ["chrono", "bundled"]
4142

4243
[dependencies.iced_aw]
43-
version = "0.7"
44+
#FIXME version = "0.7"
45+
git = "https://github.com/iced-rs/iced_aw"
46+
branch = "main"
4447
default-features = false
4548
features = [
4649
"tab_bar",
@@ -53,16 +56,16 @@ features = [
5356
]
5457

5558
[dependencies.genpdf]
56-
version = "0.2"
59+
version = "0.2.0"
5760
features = ["images"]
5861

5962
[dependencies.indexmap]
60-
version = "1.8"
61-
features = ["serde-1"]
63+
version = "2.2.3"
64+
features = ["serde"]
6265

6366
[dependencies.tokio]
64-
version = "1.28"
65-
features = ["sync"]
67+
version = "1.36.0"
68+
features = ["sync"]
6669

6770
# Metadata
6871

‎src/icons.rs

+3-11
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,18 @@ impl From<Icon> for String {
4747
}
4848
}
4949

50-
impl<'a, R> From<Icon> for Text<'a, R>
51-
where
52-
R: iced_core::text::Renderer,
53-
R::Theme: iced::widget::text::StyleSheet,
54-
iced::Font: Into<R::Font>,
55-
{
56-
fn from(i: Icon) -> Text<'a, R> {
50+
impl<'a> From<Icon> for Text<'a> {
51+
fn from(i: Icon) -> Text<'a> {
5752
BIG_TEXT::new(String::from(i))
5853
.font(ICON_FONT)
5954
.horizontal_alignment(Horizontal::Center)
6055
.vertical_alignment(Vertical::Center)
6156
}
6257
}
6358

64-
impl<'a, M, R> From<Icon> for Element<'a, M, R>
59+
impl<'a, M> From<Icon> for Element<'a, M>
6560
where
6661
M: 'a,
67-
R: iced_core::text::Renderer + 'a,
68-
R::Theme: iced::widget::text::StyleSheet,
69-
iced::Font: Into<R::Font>,
7062
{
7163
fn from(i: Icon) -> Self {
7264
Text::from(i).into()

‎src/item/component.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ use {
33
crate::{
44
theme::{Container, DEF_PADDING, SMALL_PADDING},
55
widgets::{column, row, SMALL_TEXT},
6-
Element, Renderer,
76
},
87
frost::clickable::Clickable,
98
iced::{
109
alignment::Horizontal,
1110
widget::{Checkbox, Column, Component, Text},
12-
Length,
11+
Element, Length,
1312
},
1413
};
1514

@@ -56,7 +55,7 @@ pub enum Event {
5655
Toggle(bool),
5756
}
5857

59-
impl<M> Component<M, Renderer> for Item<'_, M>
58+
impl<M> Component<M> for Item<'_, M>
6059
where
6160
M: Clone,
6261
{
@@ -98,6 +97,7 @@ where
9897
Checkbox::new(
9998
"I Lager",
10099
stock,
100+
).on_toggle(
101101
Event::Toggle,
102102
),
103103
]

‎src/item/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use {crate::Element, category::*};
1+
use {category::*, iced::Element};
22

33
pub mod category;
44
pub mod component;

‎src/main.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ use {
22
crate::{
33
icons::Icon,
44
screens::{Message, Tab, TabId},
5-
theme::{BORDER_WIDTH, DEF_PADDING, DEF_TEXT},
5+
theme::{DEF_PADDING, DEF_TEXT},
66
widgets::{column, SMALL_TEXT},
77
},
88
chrono::Local,
99
iced::{
1010
font,
1111
widget::{Container, Text},
12-
window, Application, Command, Font, Length, Settings,
12+
window, Application, Command, Element, Font, Length, Pixels, Settings, Size,
1313
},
1414
iced_aw::{Card, Modal, TabLabel, Tabs},
1515
lazy_static::lazy_static,
@@ -29,9 +29,6 @@ pub mod screens;
2929
pub mod theme;
3030
pub mod widgets;
3131

32-
pub type Renderer = iced::Renderer<theme::Theme>;
33-
pub type Element<'a, M> = iced::Element<'a, M, Renderer>;
34-
3532
#[macro_export]
3633
macro_rules! command {
3734
($msg:expr) => {
@@ -49,11 +46,14 @@ lazy_static! {
4946
pub fn main() -> iced::Result {
5047
App::run(Settings {
5148
window: window::Settings {
52-
min_size: Some((1360, 600)),
49+
min_size: Some(Size {
50+
width: 1360.0,
51+
height: 600.0,
52+
}),
5353
..window::Settings::default()
5454
},
5555
default_font: FONT,
56-
default_text_size: DEF_TEXT,
56+
default_text_size: Pixels(DEF_TEXT),
5757
..Settings::default()
5858
})
5959
}
@@ -67,7 +67,7 @@ impl Application for App {
6767
type Executor = iced::executor::Default;
6868
type Message = Message;
6969
type Flags = ();
70-
type Theme = theme::Theme;
70+
type Theme = iced::Theme;
7171

7272
fn new(_: Self::Flags) -> (Self, Command<Self::Message>) {
7373
(
@@ -150,7 +150,7 @@ impl Application for App {
150150
)
151151
.set_active_tab(&self.tab.id()),
152152
)
153-
.padding(BORDER_WIDTH as u16),
153+
.padding(2),
154154
],
155155
self.modal.clone().map(move |(title, content)| {
156156
Card::new(Text::new(title), SMALL_TEXT::new(content))

‎src/payment.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ impl TryFrom<String> for Payment {
3434
}
3535
}
3636

37-
use {
38-
crate::Element,
39-
iced::widget::image::{Handle, Image},
37+
use iced::{
38+
widget::image::{Handle, Image},
39+
Element,
4040
};
4141
impl<'a, M> From<Payment> for Element<'a, M>
4242
where

‎src/receipt.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ use {
44
payment::Payment,
55
theme::{DEF_PADDING, RECEIPT_WIDTH},
66
widgets::column,
7-
Element, Renderer,
87
},
98
frost::clickable::Clickable,
109
iced::{
1110
widget::{scrollable, Column, Component, Scrollable, Text},
12-
Length,
11+
Element, Length,
1312
},
1413
indexmap::IndexSet,
1514
};
@@ -72,7 +71,7 @@ where
7271
}
7372
}
7473

75-
impl<'a, M> Component<M, Renderer> for Receipt<M>
74+
impl<'a, M> Component<M> for Receipt<M>
7675
where
7776
M: Clone + std::fmt::Debug + 'a,
7877
{

‎src/screens/info.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ use {
22
crate::{
33
theme::DEF_PADDING,
44
widgets::{column, row, SMALL_TEXT},
5-
Element, Renderer,
65
},
76
iced::{
87
widget::{Component, Container, Text},
9-
Alignment, Length,
8+
Alignment, Element, Length,
109
},
1110
iced_aw::{style::badge::BadgeStyles, Badge},
1211
self_update::{cargo_crate_version, Status},
@@ -26,7 +25,7 @@ impl Info {
2625
}
2726
}
2827

29-
impl<M> Component<M, Renderer> for Info {
28+
impl<M> Component<M> for Info {
3029
type State = ();
3130
type Event = ();
3231

‎src/screens/manager.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
use {
2-
super::{Message, Sideffect, Tab, TabId},
2+
super::{Message, Sideffect, TabId},
33
crate::{
44
icons::Icon,
55
item::{category::Category, Item},
66
theme::{self, DEF_PADDING, RECEIPT_WIDTH},
77
widgets::{column, row, NumberInput, SquareButton, BIG_TEXT},
8-
Element, Renderer,
98
},
109
frost::wrap::{Direction, Wrap},
1110
iced::{
1211
widget::{Button, Component, PickList, Rule, Scrollable, Space, Text, TextInput},
13-
Alignment, Length,
12+
Alignment, Element, Length,
1413
},
1514
iced_aw::{Card, Modal},
1615
rusqlite::params,
@@ -71,7 +70,7 @@ impl Manager {
7170
}
7271
}
7372

74-
impl Component<Message, Renderer> for Manager {
73+
impl Component<Message> for Manager {
7574
type State = State;
7675
type Event = Event;
7776

@@ -247,7 +246,7 @@ impl Component<Message, Renderer> for Manager {
247246
Text::new("Lösendord"),
248247
TextInput::new("", &password)
249248
.on_input(Event::UpdatePassword)
250-
.password()
249+
.secure(true)
251250
.padding(DEF_PADDING)
252251
.on_submit(Event::Login),
253252
Button::new(Text::new("Logga In"))

‎src/screens/menu.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ use {
88
receipt::Receipt,
99
theme::{self, DEF_PADDING, RECEIPT_WIDTH},
1010
widgets::{calc::Calc, column, row, SquareButton, BIG_TEXT},
11-
Element, Renderer,
1211
},
1312
chrono::Local,
1413
frost::wrap::{Direction, Wrap},
1514
iced::{
1615
widget::{Button, Checkbox, Component, Container, Rule, Scrollable, Space},
17-
Alignment, Length,
16+
Alignment, Element, Length,
1817
},
1918
rusqlite::params,
2019
};
@@ -55,7 +54,7 @@ impl Menu {
5554
}
5655
}
5756

58-
impl Component<Message, Renderer> for Menu {
57+
impl Component<Message> for Menu {
5958
type State = State;
6059
type Event = Event;
6160

@@ -164,7 +163,7 @@ impl Component<Message, Renderer> for Menu {
164163
]
165164
.align_items(Alignment::Center),
166165
receipt,
167-
Checkbox::new("Printa kvitto", print, Event::TogglePrint),
166+
Checkbox::new("Printa kvitto", print).on_toggle(Event::TogglePrint),
168167
row![
169168
#nopad
170169
Button::new(Payment::Swish)

‎src/screens/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use {
99
error::{Error, Result},
1010
item::Item,
1111
payment::Payment,
12-
Element,
1312
},
1413
chrono::{Date, DateTime, Local},
1514
futures::{future::BoxFuture, FutureExt},
15+
iced::Element,
1616
rusqlite::params,
1717
std::future::{Future, IntoFuture},
1818
};

‎src/screens/sales/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ use {
77
receipt::Receipt,
88
theme::{self, DEF_PADDING, RECEIPT_WIDTH},
99
widgets::{column, row, BIG_TEXT, SMALL_TEXT},
10-
Element, Renderer,
1110
},
1211
chrono::{Date, Local, TimeZone},
1312
iced::{
1413
widget::{Button, Component, Container, Row, Rule, Space, Text},
15-
Alignment, Length,
14+
Alignment, Element, Length,
1615
},
1716
iced_aw::date_picker::{self, DatePicker},
1817
indexmap::IndexMap,
@@ -63,7 +62,7 @@ impl Sales {
6362
}
6463
}
6564

66-
impl Component<Message, Renderer> for Sales {
65+
impl Component<Message> for Sales {
6766
type State = Option<Picker>;
6867
type Event = Event;
6968

‎src/screens/transactions.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ use {
88
receipt::Receipt,
99
theme::{self, DEF_PADDING, RECEIPT_WIDTH},
1010
widgets::{column, row, SquareButton},
11-
Element, Renderer,
1211
},
1312
chrono::{DateTime, Local},
1413
frost::clickable::Clickable,
1514
iced::{
1615
widget::{Component, Container, Row, Rule, Space},
17-
Length,
16+
Element, Length,
1817
},
1918
indexmap::IndexMap,
2019
};
@@ -59,7 +58,7 @@ impl Transactions {
5958
}
6059
}
6160

62-
impl Component<Message, Renderer> for Transactions {
61+
impl Component<Message> for Transactions {
6362
type State = State;
6463
type Event = Event;
6564

0 commit comments

Comments
 (0)