Skip to content

Commit 799ef26

Browse files
committed
Fix use of deprecated APIs
1 parent 5c47940 commit 799ef26

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/smhi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn refresh(latitude: f32, longitude: f32, window: slint::Weak<ui::MainWindow
3030
fn collect_forecasts(series: &[TimeSeries]) -> Vec<ui::Forecast> {
3131
series
3232
.iter()
33-
.group_by(|s| s.valid_time.with_timezone(&Local).date_naive())
33+
.chunk_by(|s| s.valid_time.with_timezone(&Local).date_naive())
3434
.into_iter()
3535
.map(|(date, s)| {
3636
let params = s

ui/components.slint

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
2-
import { ListView, ProgressIndicator, StyleMetrics } from "std-widgets.slint";
1+
import { ListView, Palette, ProgressIndicator } from "std-widgets.slint";
32
import { Icon, MaterialIcons } from "icons.slint";
43
import { DayTime, Forecast } from "globals.slint";
54
import { Symbols } from "symbols.slint";
65

76
export component SlintLogo inherits Image {
87
opacity: 0.5;
9-
source: StyleMetrics.dark-color-scheme ? @image-url("../images/slint/MadeWithSlint-logo-light.png")
10-
: @image-url("../images/slint/MadeWithSlint-logo-dark.png");
8+
source: Palette.color-scheme == ColorScheme.dark ? @image-url("../images/slint/MadeWithSlint-logo-light.png")
9+
: @image-url("../images/slint/MadeWithSlint-logo-dark.png");
1110
}
1211

1312
export component SmhiLogo inherits Image {
1413
opacity: 0.5;
15-
source: StyleMetrics.dark-color-scheme ? @image-url("../images/smhi/smhi-logo-dark.png")
16-
: @image-url("../images/smhi/smhi-logo-light.png");
14+
source: Palette.color-scheme == ColorScheme.dark ? @image-url("../images/smhi/smhi-logo-dark.png")
15+
: @image-url("../images/smhi/smhi-logo-light.png");
1716
}
1817

1918
export component ToolBar {
@@ -23,7 +22,7 @@ export component ToolBar {
2322
callback refresh <=> refresh-button.clicked;
2423

2524
Rectangle {
26-
background: StyleMetrics.window-background.mix(StyleMetrics.default-text-color, 0.95);
25+
background: Palette.background.mix(Palette.foreground, 0.95);
2726
HorizontalLayout {
2827
padding: 8px;
2928
alignment: space-between;

ui/icons.slint

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { StyleMetrics } from "std-widgets.slint";
1+
import { Palette } from "std-widgets.slint";
22
import "../fonts/MaterialIcons-Regular.ttf";
33

44
export struct IconData {
@@ -15,7 +15,7 @@ export global IconTheme {
1515
export component Icon {
1616
in property<IconData> icon;
1717
in property<length> size: IconTheme.size;
18-
in property<color> color: StyleMetrics.default-text-color;
18+
in property<color> color: Palette.foreground;
1919

2020
Text {
2121
text: root.icon.code-point;

0 commit comments

Comments
 (0)