chore(platform): Updated dependency stack to GNOME 46

mfep · May 11, 2024 · 677f3f2 · 677f3f2
1 parent 79b1742
commit 677f3f2
Show file tree

Hide file tree

Showing 11 changed files with 823 additions and 935 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,27 +6,19 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-relm4 = { version="0.6.2", features = ["gnome_44", "libadwaita"] }
-relm4-components = "0.6.2"
+relm4 = { version="0.8.1", features = ["gnome_46", "libadwaita"] }
+relm4-components = "0.8.1"
 relm4-macros = "0.8.1"
-relm4-icons = { version = "0.6.0", features = [
-    "edit",
-    "entry-clear",
-    "pause",
-    "play",
-    "plus",
-    "refresh",
-    "weight2"
-] }
-libadwaita = { version="0.4.4", features = ["v1_4"] }
+relm4-icons = { version = "0.8.2" }
+libadwaita = { version="0.6.0", features = ["v1_5"] }
 tokio = { version = "1.36", features = [
     "rt",
     "macros",
     "time",
     "rt-multi-thread",
 ] }
 futures = "0.3.30"
-rodio = { version="0.17.3", default-features=false, features = ["wav"] }
+rodio = { version="0.18.0", default-features=false, features = ["wav"] }
 json = "0.12.4"
 
 [build-dependencies]

diff --git a/cargo-sources.json b/cargo-sources.json
diff --git a/icons.toml b/icons.toml
@@ -0,0 +1,9 @@
+icons = [
+    "edit",
+    "entry-clear",
+    "pause",
+    "play",
+    "plus",
+    "refresh",
+    "weight2"
+]
diff --git a/src/app.rs b/src/app.rs
@@ -14,6 +14,7 @@ use relm4::{
     prelude::*,
     RelmObjectExt,
 };
+use relm4_icons::icon_names;
 
 #[derive(Debug)]
 pub enum AppModelInput {
@@ -74,7 +75,7 @@ impl Component for AppModel {
                     set_child = &adw::ToolbarView {
                         add_top_bar = &adw::HeaderBar {
                             pack_start = &gtk::Button {
-                                set_icon_name: "plus",
+                                set_icon_name: icon_names::PLUS,
                                 connect_clicked => AppModelInput::PromptNewExercise,
                             },
                             pack_end = &gtk::MenuButton {
@@ -98,7 +99,7 @@ impl Component for AppModel {
                             },
                             #[name = "exercise_list_status"]
                             adw::StatusPage {
-                                set_icon_name: Some("weight2"),
+                                set_icon_name: Some(icon_names::WEIGHT2),
                                 set_title: "No exercise is created yet",
                                 gtk::Button {
                                     set_css_classes: &["suggested-action", "pill"],
@@ -126,14 +127,23 @@ impl Component for AppModel {
 
     fn init(
         init: Self::Init,
-        root: &Self::Root,
+        root: Self::Root,
         sender: ComponentSender<Self>,
     ) -> ComponentParts<Self> {
-        let list_exercises = relm4::factory::FactoryVecDeque::from_iter(
-            settings::load_exercise_list_from_gsettings().into_iter(),
-            gtk::Box::default(),
-            sender.input_sender(),
-        );
+        let mut list_exercises = relm4::factory::FactoryVecDeque::builder()
+            .launch(gtk::Box::default())
+            .forward(sender.input_sender(), |output| match output {
+                ExerciseSetupOutput::Remove(index) => AppModelInput::RemoveExerciseSetup(index),
+                ExerciseSetupOutput::Load(exercise_setup) => {
+                    AppModelInput::LoadExercise(exercise_setup)
+                }
+            });
+        {
+            let mut guard = list_exercises.guard();
+            for exercise_setup in settings::load_exercise_list_from_gsettings().into_iter() {
+                guard.push_back(exercise_setup);
+            }
+        }
         let model = AppModel {
             exercise_timer: None,
             list_exercises,
@@ -273,7 +283,7 @@ impl Component for AppModel {
                 }
             }
         }
-        update_status_visible(&widgets, &self);
+        update_status_visible(widgets, self);
     }
 }
 

diff --git a/src/exercise_editor.rs b/src/exercise_editor.rs
@@ -113,7 +113,7 @@ impl relm4::SimpleComponent for ExerciseEditor {
 
     fn init(
         init: Self::Init,
-        root: &Self::Root,
+        root: Self::Root,
         sender: relm4::ComponentSender<Self>,
     ) -> relm4::ComponentParts<Self> {
         let model = ExerciseEditor {

diff --git a/src/exercise_setup.rs b/src/exercise_setup.rs
@@ -1,4 +1,3 @@
-use crate::app::*;
 use crate::exercise_editor::*;
 use crate::settings;
 use futures::prelude::*;
@@ -7,6 +6,7 @@ use relm4::{
     prelude::*,
     RelmWidgetExt,
 };
+use relm4_icons::icon_names;
 use std::time::Duration;
 
 #[derive(Debug, Clone)]
@@ -55,7 +55,6 @@ impl FactoryComponent for ExerciseSetup {
     type Input = ExerciseSetupInput;
     type Output = ExerciseSetupOutput;
     type CommandOutput = ();
-    type ParentInput = AppModelInput;
     type ParentWidget = gtk::Box;
 
     view! {
@@ -106,7 +105,7 @@ impl FactoryComponent for ExerciseSetup {
                         attach[1, 1, 1, 1] = &gtk::Label {
                             set_halign: gtk::Align::Start,
                             #[watch]
-                            set_label: &format!("{} s", self.exercise_s.to_string()),
+                            set_label: &format!("{} s", self.exercise_s),
                         },
                         attach[0, 2, 1, 1] = &gtk::Label {
                             set_halign: gtk::Align::Start,
@@ -115,7 +114,7 @@ impl FactoryComponent for ExerciseSetup {
                         attach[1, 2, 1, 1] = &gtk::Label {
                             set_halign: gtk::Align::Start,
                             #[watch]
-                            set_label: &format!("{} s", self.rest_s.to_string()),
+                            set_label: &format!("{} s", self.rest_s),
                         },
                     },
                     #[wrap(Some)]
@@ -125,21 +124,21 @@ impl FactoryComponent for ExerciseSetup {
                             set_orientation: gtk::Orientation::Horizontal,
                             set_valign: gtk::Align::End,
                             gtk::Button {
-                                set_icon_name: "edit",
+                                set_icon_name: icon_names::EDIT,
                                 connect_clicked[sender] => move |btn| {
                                     sender.input(ExerciseSetupInput::Edit(btn.root().unwrap()));
                                 },
                             },
                             gtk::Button {
                                 set_class_active: ("destructive-action", true),
-                                set_icon_name: "entry-clear",
+                                set_icon_name: icon_names::ENTRY_CLEAR,
                                 connect_clicked[sender, index] => move |_| {
-                                    sender.output(ExerciseSetupOutput::Remove(index.clone()))
+                                    sender.output(ExerciseSetupOutput::Remove(index.clone())).unwrap();
                                 },
                             },
                             gtk::Button {
                                 set_class_active: ("suggested-action", true),
-                                set_icon_name: "play",
+                                set_icon_name: icon_names::PLAY,
                                 connect_clicked => ExerciseSetupInput::Load,
                             },
                         },
@@ -157,13 +156,6 @@ impl FactoryComponent for ExerciseSetup {
         init
     }
 
-    fn forward_to_parent(output: Self::Output) -> Option<Self::ParentInput> {
-        Some(match output {
-            ExerciseSetupOutput::Remove(index) => AppModelInput::RemoveExerciseSetup(index),
-            ExerciseSetupOutput::Load(setup) => AppModelInput::LoadExercise(setup),
-        })
-    }
-
     fn update(&mut self, message: Self::Input, sender: relm4::FactorySender<Self>) {
         match message {
             ExerciseSetupInput::Edit(root) => {
@@ -182,7 +174,9 @@ impl FactoryComponent for ExerciseSetup {
                 *self = setup;
             }
             ExerciseSetupInput::Load => {
-                sender.output(ExerciseSetupOutput::Load(self.clone()));
+                sender
+                    .output(ExerciseSetupOutput::Load(self.clone()))
+                    .unwrap();
             }
         }
     }

diff --git a/src/exercise_timer.rs b/src/exercise_timer.rs
@@ -8,6 +8,7 @@ use relm4::{
     prelude::*,
     RelmObjectExt, RelmWidgetExt,
 };
+use relm4_icons::icon_names;
 use timer::{TimerModel, TimerOutput};
 
 use crate::{exercise_setup::ExerciseSetup, settings::GlobalExerciseSetup};
@@ -200,7 +201,7 @@ impl Component for ExerciseTimer {
                         set_spacing: 12,
                         gtk::Button {
                             set_css_classes: &["circular", "large-button"],
-                            set_icon_name: "refresh",
+                            set_icon_name: icon_names::REFRESH,
                             set_valign: gtk::Align::Center,
                             connect_clicked => ExerciseTimerInput::Reset,
                             #[watch]
@@ -213,7 +214,7 @@ impl Component for ExerciseTimer {
                             connect_clicked => ExerciseTimerInput::StartStop,
                             gtk::Image {
                                 #[watch]
-                                set_icon_name: Some(if model.running { "pause" } else { "play" }),
+                                set_icon_name: Some(if model.running { icon_names::PAUSE } else { icon_names::PLAY }),
                             },
                         },
                         #[name = "volume_button"]
@@ -241,7 +242,7 @@ impl Component for ExerciseTimer {
 
     fn init(
         init: Self::Init,
-        root: &Self::Root,
+        root: Self::Root,
         sender: relm4::ComponentSender<Self>,
     ) -> ComponentParts<Self> {
         let model = ExerciseTimer::new(init.setup, init.global_setup, init.output_handle, &sender);

diff --git a/src/settings.rs b/src/settings.rs
@@ -1,5 +1,4 @@
 use crate::exercise_setup::*;
-use json;
 use relm4::{
     self,
     binding::*,

diff --git a/src/settings_dialog.rs b/src/settings_dialog.rs
@@ -48,7 +48,7 @@ impl Component for SettingsDialogModel {
 
     fn init(
         init: Self::Init,
-        root: &Self::Root,
+        root: Self::Root,
         _sender: ComponentSender<Self>,
     ) -> ComponentParts<Self> {
         let widgets = view_output!();

diff --git a/src/shortcuts_window.rs b/src/shortcuts_window.rs
@@ -1,6 +1,6 @@
 use relm4::{
     self,
-    gtk::{self, prelude::*},
+    gtk::{self, glib, prelude::*},
     prelude::*,
 };
 
@@ -34,14 +34,14 @@ impl SimpleComponent for ShortcutsWindowModel {
             set_visible: model.visible,
             connect_close_request[sender] => move |_| {
                 sender.input(ShortcutsWindowInput::Hide);
-                gtk::Inhibit(false)
+                glib::Propagation::Stop
             }
         }
     }
 
     fn init(
         _init: Self::Init,
-        root: &Self::Root,
+        root: Self::Root,
         sender: ComponentSender<Self>,
     ) -> ComponentParts<Self> {
         let model = Self { visible: false };