refactor: Reset action (Vala)

Author: mfep

data/xyz.safeworlds.hiit.gschema.xml.in

@@ -21,9 +21,9 @@
             <default>"[]"</default>
             <summary>List of training setups, in JSON notation</summary>
         </key>
-        <key name="warmup-s" type="u">
+        <key name="countdown-sec" type="u">
             <default>5</default>
-            <summary>The duration of the warmup, in seconds</summary>
+            <summary>The duration of the audio countdown, in seconds</summary>
         </key>
         <key name="beep-volume" type="d">
             <default>1</default>

src/Application.vala

@@ -12,11 +12,13 @@ namespace ExerciseTimer {
                 { "about", this.on_about_action },
                 { "close", this.on_close_action },
                 { "shortcuts", this.on_shortcuts_action },
+                { "restart", this.on_restart_action },
                 { "quit", this.quit },
             };
             this.add_action_entries (action_entries, this);
             this.set_accels_for_action ("app.close", { "<primary>w" });
             this.set_accels_for_action ("app.shortcuts", { "<primary>question" });
+            this.set_accels_for_action ("app.restart", { "<primary>r" });
             this.set_accels_for_action ("app.quit", { "<primary>q" });
         }
 
@@ -69,5 +71,10 @@ namespace ExerciseTimer {
             var dialog = builder.get_object ("shortcuts_dialog") as Adw.ShortcutsDialog;
             dialog.present (this.get_active_window ());
         }
+
+        private void on_restart_action () {
+            var window = this.active_window as ExerciseTimer.Window;
+            window?.on_restart_action ();
+        }
     }
 }

src/ITimerPageActionNotifier.vala

@@ -0,0 +1,5 @@
+namespace ExerciseTimer {
+    public interface ITimerPageActionNotifier : Object {
+        public signal void restart_action_called ();
+    }
+}

src/TimerPage.vala

@@ -1,21 +1,25 @@
 namespace ExerciseTimer {
     [GtkTemplate(ui = "/xyz/safeworlds/hiit/ui/timer_page.ui")]
     public class TimerPage : Adw.NavigationPage, ITimerNotifier {
-        public TimerPage(TrainingSetup setup) {
+        public TimerPage(TrainingSetup setup, ITimerPageActionNotifier action_notifier) {
             Setup = setup;
+            this.action_notifier = action_notifier;
             updateCssClass();
             timer_label_box.set_direction(Gtk.TextDirection.LTR);
             volume_button.get_first_child().css_classes = new string[] { "circular", "toggle", "large-button" };
 
             var settings = new GLib.Settings(Config.AppId);
             settings.bind("beep-volume", volume_adjustment, "value", GLib.SettingsBindFlags.DEFAULT);
+            settings.bind("countdown-sec", this, "CountdownSec", GLib.SettingsBindFlags.DEFAULT);
 
             this.shown.connect(() => {
                 restart();
             });
             this.hidden.connect((_) => {
                 Running = false;
+                this.action_notifier.restart_action_called.disconnect(restart);
             });
+            this.action_notifier.restart_action_called.connect(restart);
         }
 
         public TrainingSetup Setup { get; private set; }
@@ -108,6 +112,8 @@ namespace ExerciseTimer {
             }
         }
 
+        public int CountdownSec { get; set; }
+
         [GtkCallback]
         public void restart() {
             remaining_sets = Setup.Sets;
@@ -136,7 +142,7 @@ namespace ExerciseTimer {
             if (remaining_sec > 1) {
                 --remaining_sec;
                 retval = true;
-                if (remaining_sec <= countdown_threshold) {
+                if (remaining_sec <= CountdownSec) {
                     countdown(remaining_sec);
                 }
             } else {
@@ -229,6 +235,6 @@ namespace ExerciseTimer {
         private int remaining_sets;
         private uint? timer_id;
         private bool running;
-        private const int countdown_threshold = 5;
+        ITimerPageActionNotifier action_notifier;
     }
 }

src/Window.vala

@@ -1,7 +1,7 @@
 namespace ExerciseTimer {
 
     [GtkTemplate(ui = "/xyz/safeworlds/hiit/ui/window.ui")]
-    public class Window : Adw.ApplicationWindow {
+    public class Window : Adw.ApplicationWindow, ITimerPageActionNotifier {
         public Window(Gtk.Application app) {
             Object(application: app);
 
@@ -13,6 +13,10 @@ namespace ExerciseTimer {
             training_list_stack.set_visible_child(training_list_status);
         }
 
+        public void on_restart_action () {
+            restart_action_called();
+        }
+
         [GtkCallback]
         private void on_add_training() {
             var editor_dialog = new TrainingEditor(default_setup);
@@ -38,7 +42,7 @@ namespace ExerciseTimer {
         private void on_training_activated(Gtk.ListBoxRow row) {
             var training_list_row = row as TrainingListRow;
             var setup = training_list_row.Setup;
-            var timer_page = new TimerPage(setup);
+            timer_page = new TimerPage(setup, this);
             navigation_view.push(timer_page);
             voices = new Voices(timer_page);
         }
@@ -55,6 +59,7 @@ namespace ExerciseTimer {
         private unowned Gtk.ListBox training_listbox;
 
         private Voices voices;
+        private TimerPage timer_page;
 
         private static TrainingSetup default_setup = new TrainingSetup(){ Title = "Exercise", WarmupSec = 5, ExerciseSec = 30, RestSec = 10, Sets = 4 };
     }

src/meson.build

@@ -27,6 +27,7 @@ config_source = configure_file(
 sources = [
   'Application.vala',
   'ITimerNotifier.vala',
+  'ITimerPageActionNotifier.vala',
   'TimerPage.vala',
   'TrainingEditor.vala',
   'TrainingListRow.vala',