cleaning up use

.gitignore

@@ -1,4 +1,5 @@
 /.flatpak-builder
-/target
+/.vscode
 /build
 /builddir
+/target

Cargo.toml

@@ -26,7 +26,7 @@ tokio = { version = "1.28", features = [
     "rt-multi-thread",
 ] }
 futures = "0.3.28"
-rodio = "0.17.1"
+rodio = { version="0.17.1", default-features=false, features = ["wav"] }
 json = "0.12.4"
 
 [build-dependencies]

src/exercise_editor.rs

@@ -1,9 +1,8 @@
-use crate::exercise_setup::ExerciseSetup;
-use gtk::prelude::{ButtonExt, GtkWindowExt, OrientableExt, WidgetExt};
+use crate::exercise_setup::*;
 use relm4::{
     adw::{self, prelude::*},
     binding::*,
-    gtk, ComponentParts, ComponentSender, RelmObjectExt, RelmWidgetExt, SimpleComponent,
+    gtk, RelmObjectExt, RelmWidgetExt,
 };
 
 #[derive(Debug)]
@@ -33,7 +32,7 @@ pub enum ExerciseEditorOutput {
 }
 
 #[relm4::component(pub)]
-impl SimpleComponent for ExerciseEditor {
+impl relm4::SimpleComponent for ExerciseEditor {
     type Init = (ExerciseEditorRole, ExerciseSetup);
     type Input = ExerciseEditorInput;
     type Output = Option<ExerciseEditorOutput>;
@@ -134,10 +133,10 @@ impl SimpleComponent for ExerciseEditor {
             role: init.0,
         };
         let widgets = view_output!();
-        ComponentParts { model, widgets }
+        relm4::ComponentParts { model, widgets }
     }
 
-    fn update(&mut self, message: Self::Input, sender: ComponentSender<Self>) {
+    fn update(&mut self, message: Self::Input, sender: relm4::ComponentSender<Self>) {
         match message {
             ExerciseEditorInput::Cancel => sender.output(None).unwrap(),
             ExerciseEditorInput::Create => {

src/exercise_setup.rs

@@ -1,17 +1,12 @@
-use std::time::Duration;
-
+use crate::exercise_editor::*;
+use crate::*;
+use futures::prelude::*;
 use relm4::{
-    gtk::{self, prelude::*, Root},
+    gtk::{self, prelude::*},
     prelude::*,
-    Component, RelmWidgetExt,
+    RelmWidgetExt,
 };
-
-use crate::{exercise_editor::ExerciseEditor, AppModelInput};
-use crate::{
-    exercise_editor::{ExerciseEditorOutput, ExerciseEditorRole},
-    settings,
-};
-use futures::StreamExt;
+use std::time::Duration;
 
 #[derive(Debug, Clone)]
 pub struct ExerciseSetup {
@@ -35,7 +30,7 @@ impl Default for ExerciseSetup {
 
 #[derive(Debug)]
 pub enum ExerciseSetupInput {
-    Edit(Root),
+    Edit(gtk::Root),
     Update(ExerciseSetup),
     Load,
 }

src/exercise_timer.rs

@@ -3,9 +3,10 @@ mod timer;
 
 use relm4::{
     adw,
-    binding::Binding,
+    binding::*,
     gtk::{self, prelude::*},
-    Component, ComponentParts, ComponentSender, RelmObjectExt, RelmWidgetExt, WorkerController,
+    prelude::*,
+    RelmObjectExt, RelmWidgetExt,
 };
 use timer::{TimerModel, TimerOutput};
 
@@ -28,8 +29,8 @@ pub struct ExerciseTimer {
     remaining_sets: usize,
     remaining_s: usize,
     running: bool,
-    timer: Option<WorkerController<TimerModel>>,
-    audio_player: WorkerController<AudioPlayerModel>,
+    timer: Option<relm4::WorkerController<TimerModel>>,
+    audio_player: relm4::WorkerController<AudioPlayerModel>,
 }
 
 impl ExerciseTimer {
@@ -92,7 +93,9 @@ pub enum ExerciseTimerInput {
     Reset,
 }
 
-fn build_timer(sender: &ComponentSender<ExerciseTimer>) -> Option<WorkerController<TimerModel>> {
+fn build_timer(
+    sender: &ComponentSender<ExerciseTimer>,
+) -> Option<relm4::WorkerController<TimerModel>> {
     Some(
         TimerModel::builder()
             .detach_worker(())

src/exercise_timer/audio_player.rs

@@ -1,6 +1,5 @@
-use relm4::gtk::gio;
-use relm4::{self, prelude::*, Worker};
-use rodio::{self, Decoder, Source};
+use relm4::{self, gtk::gio, prelude::*};
+use rodio::{self, Source};
 
 pub struct AudioPlayerModel {
     output_stream: rodio::OutputStreamHandle,
@@ -11,7 +10,7 @@ pub struct AudioPlayerModel {
 impl AudioPlayerModel {
     fn play_ping(&self, times: u32) {
         let cursor = std::io::Cursor::new(self.ping_bytes.clone());
-        let decoder = Decoder::new_wav(cursor).expect("Could not decode WAV");
+        let decoder = rodio::Decoder::new_wav(cursor).expect("Could not decode WAV");
         let new_duration = decoder.total_duration().unwrap() * times;
         let d = decoder
             .repeat_infinite()
@@ -38,7 +37,7 @@ pub struct AudioPlayerModelInit {
     pub volume: f64,
 }
 
-impl Worker for AudioPlayerModel {
+impl relm4::Worker for AudioPlayerModel {
     type Init = AudioPlayerModelInit;
     type Input = AudioPlayerInput;
     type Output = ();

src/exercise_timer/timer.rs

@@ -1,6 +1,5 @@
-use std::time::Duration;
-
 use relm4::Worker;
+use std::time::Duration;
 
 pub struct TimerModel;