refactor: Finished timer page (Vala)

mfep · mfep · commit b3c206c06b31 · 2025-11-14T17:46:54.000+01:00
diff --git a/build-aux/xyz.safeworlds.hiit.Devel.json b/build-aux/xyz.safeworlds.hiit.Devel.json
@@ -3,35 +3,14 @@
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "49",
     "sdk" : "org.gnome.Sdk",
-    "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm20"
-    ],
     "command" : "hiit",
     "finish-args" : [
         "--share=ipc",
         "--socket=fallback-x11",
         "--socket=wayland",
         "--socket=pulseaudio",
-        "--device=dri",
-        "--env=RUST_LOG=hiit=debug",
-        "--env=G_MESSAGES_DEBUG=none",
-        "--env=RUST_BACKTRACE=1"
+        "--device=dri"
     ],
-    "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin",
-        "build-args": [
-            "--share=network"
-        ],
-        "prepend-ld-library-path" : "/usr/lib/sdk/llvm20/lib",
-        "env" : {
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse",
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
-        }
-    },
     "separate-locales": false,
     "modules" : [
         {
diff --git a/data/resources/audio/ping.wav b/data/resources/audio/ping.wav
diff --git a/data/resources/audio/ping1.wav b/data/resources/audio/ping1.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43c5c94d4b7d239b9e6fd326aed73925c1c401850605a295193db562ea9d824f
+size 26356
diff --git a/data/resources/audio/ping2.wav b/data/resources/audio/ping2.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:815cde465e8c6570f2960677af0190511b49f7898e0924341dab8cfa60bdccc3
+size 52538
diff --git a/data/resources/audio/ping3.wav b/data/resources/audio/ping3.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:720d5765573df602b5f06e1e683ea219fc6f2eebfd92942141558b4f6f537870
+size 78720
diff --git a/data/resources/icons/arrow-circular-top-right-symbolic.svg b/data/resources/icons/arrow-circular-top-right-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 7.40625 1 c -0.613281 0.007812 -1.234375 0.089844 -1.847656 0.253906 c -3.273438 0.878906 -5.558594 3.855469 -5.558594 7.246094 s 2.285156 6.367188 5.558594 7.242188 c 3.273437 0.878906 6.742187 -0.558594 8.4375 -3.492188 c 0.273437 -0.480469 0.109375 -1.089844 -0.367188 -1.367188 c -0.476562 -0.273437 -1.089844 -0.109374 -1.367187 0.367188 c -1.246094 2.160156 -3.777344 3.207031 -6.1875 2.5625 c -2.40625 -0.644531 -4.074219 -2.820312 -4.074219 -5.3125 c 0 -2.496094 1.667969 -4.667969 4.074219 -5.3125 c 2.410156 -0.644531 4.941406 0.402344 6.1875 2.5625 c 0.058593 0.085938 0.125 0.164062 0.203125 0.226562 l -0.019532 0.015626 l -0.007812 0.007812 h -1.4375 c -0.550781 0 -1 0.449219 -1 1 c 0 0 0 1 1 1 h 5 v -5 s 0.003906 -1 -1 -1 c -0.550781 0 -1 0.449219 -1 1 v 1.6875 l -0.015625 0.011719 l -0.011719 0.011719 c -1.277344 -2.179688 -3.53125 -3.519532 -5.953125 -3.691407 c -0.203125 -0.015625 -0.40625 -0.019531 -0.613281 -0.019531 z m 0 0" fill="#222222"/></svg>
diff --git a/data/resources/icons/icons.gresource.xml b/data/resources/icons/icons.gresource.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/xyz/safeworlds/hiit/icons/scalable/actions/">
+    <file preprocess="xml-stripblanks">arrow-circular-top-right-symbolic.svg</file>
     <file preprocess="xml-stripblanks">edit-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">pause-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">play-symbolic.svg</file>
     <file preprocess="xml-stripblanks">weight2-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/data/resources/icons/pause-symbolic.svg b/data/resources/icons/pause-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 4 3 c -0.554688 0 -1 0.445312 -1 1 v 8 c 0 0.554688 0.445312 1 1 1 h 2 c 0.550781 0 1 -0.445312 1 -1 v -8 c 0 -0.554688 -0.449219 -1 -1 -1 z m 6 0 c -0.554688 0 -1 0.445312 -1 1 v 8 c 0 0.554688 0.445312 1 1 1 h 2 c 0.550781 0 1 -0.445312 1 -1 v -8 c 0 -0.554688 -0.449219 -1 -1 -1 z m 0 0" fill="#222222"/></svg>
diff --git a/data/resources/icons/play-symbolic.svg b/data/resources/icons/play-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 4 4.070312 v 7.859376 c 0 1.070312 0.90625 1.066406 0.90625 1.066406 h 0.09375 c 0.171875 0 0.347656 -0.039063 0.5 -0.125 l 7 -4 c 0.308594 -0.171875 0.46875 -0.523438 0.46875 -0.875 c 0 -0.351563 -0.160156 -0.703125 -0.46875 -0.875 l -7 -4 c -0.152344 -0.085938 -0.328125 -0.125 -0.5 -0.125 h -0.09375 s -0.90625 0 -0.90625 1.074218 z m 0 0" fill="#222222"/></svg>
diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
@@ -6,7 +6,9 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/training_editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/training_list_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
-    <file compressed="true">audio/ping.wav</file>
+    <file compressed="true">audio/ping1.wav</file>
+    <file compressed="true">audio/ping2.wav</file>
+    <file compressed="true">audio/ping3.wav</file>
     <file compressed="true">style.css</file>
   </gresource>
 </gresources>
diff --git a/data/resources/ui/timer_page.blp b/data/resources/ui/timer_page.blp
@@ -72,29 +72,47 @@ template $ExerciseTimerTimerPage : Adw.NavigationPage {
 
                             Gtk.Button {
                                 css-classes: ["circular", "large-button"];
-                                //TODO icon
+                                icon-name: "arrow-circular-top-right-symbolic";
                                 valign: center;
                                 // TODO huge button
                                 // Translators: tooltip text for the reset button
                                 tooltip-text: _("Restart Training");
+                                visible: bind template.Finished inverted;
+                                clicked => $restart();
                             }
                             Gtk.Button {
                                 css-classes: ["circular", "huge-button"];
-                                // TODO icon
-                                // TODO tooltip
-                                // TODO visible
+                                icon-name: "arrow-circular-top-right-symbolic";
+                                valign: center;
+                                // Translators: tooltip text for the reset button
+                                tooltip-text: _("Restart Training");
+                                visible: bind template.Finished;
+                                clicked => $restart();
                             }
-                            Gtk.ScaleButton {
-                                css-classes: ["circular", "large-button"];
-                                //TODO icon
+                            Gtk.Button {
+                                css-classes: ["circular", "huge-button"];
+                                icon-name: bind template.PlayIconName;
+                                tooltip-text: bind template.PlayIconTooltip;
+                                visible: bind template.Finished inverted;
+                                clicked => $playPause();
+                            }
+                            Gtk.ScaleButton volume_button {
+                                icons: ["audio-volume-muted-symbolic", "audio-volume-high-symbolic", "audio-volume-medium-symbolic"];
                                 valign: center;
                                 // Translators: tooltip text for the volume button
                                 tooltip-text: _("Set Volume");
-                                // TODO visible
+                                visible: bind template.Finished inverted;
+                                adjustment: Gtk.Adjustment volume_adjustment {
+                                    lower: 0;
+                                    upper: 1;
+                                };
                             }
                         }
                     }
                 }
+                Gtk.Label {
+                    label: bind template.RemainingSetsFormatted;
+                }
             }
         }
     }
diff --git a/src/ITimerNotifier.vala b/src/ITimerNotifier.vala
@@ -0,0 +1,9 @@
+namespace ExerciseTimer {
+    public interface ITimerNotifier {
+        public signal void preparation_started ();
+        public signal void exercise_started ();
+        public signal void rest_started ();
+        public signal void finished ();
+        public signal void countdown (int remaining_s);
+    }
+}
diff --git a/src/TimerPage.vala b/src/TimerPage.vala
@@ -1,27 +1,21 @@
 namespace ExerciseTimer {
     [GtkTemplate(ui = "/xyz/safeworlds/hiit/ui/timer_page.ui")]
-    public class TimerPage : Adw.NavigationPage {
+    public class TimerPage : Adw.NavigationPage, ITimerNotifier {
         public TimerPage(TrainingSetup setup) {
             Setup = setup;
-            remaining_sets = setup.Sets;
-            if (setup.WarmupSec > 0) {
-                current_state = State.Preparation;
-                remaining_sec = setup.WarmupSec;
-            } else {
-                current_state = State.Exercise;
-                remaining_sec = setup.ExerciseSec;
-            }
+            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);
 
-            var timer_id = GLib.Timeout.add(1000, onTimeout);
+            this.shown.connect(() => {
+                restart();
+            });
             this.hidden.connect((_) => {
-                if (current_state != State.Finished) {
-                    GLib.Source.remove(timer_id);
-                }
+                Running = false;
             });
-
-            notifyProperties();
-            updateCssClass();
-            timer_label_box.set_direction(Gtk.TextDirection.LTR);
         }
 
         public TrainingSetup Setup { get; private set; }
@@ -46,6 +40,16 @@ namespace ExerciseTimer {
             }
         }
 
+        public string RemainingSetsFormatted {
+            owned get {
+                if (Finished) {
+                    return "";
+                }
+                // Translators: Label showing the number of remaining sets on the timer page
+                return _("Remaining Sets: %d").printf(remaining_sets);
+            }
+        }
+
         public string StateFormatted {
             owned get {
                 switch (current_state) {
@@ -66,50 +70,122 @@ namespace ExerciseTimer {
             }
         }
 
+        private bool Running {
+            get {
+                return running;
+            }
+            set {
+                if (timer_id != null) {
+                    GLib.Source.remove(timer_id);
+                    timer_id = null;
+                }
+                if (value) {
+                    timer_id = GLib.Timeout.add(1000, onTimeout);
+                }
+                running = value;
+            }
+        }
+
+        public string PlayIconName {
+            owned get {
+                if (Running) {
+                    return "pause-symbolic";
+                } else {
+                    return "play-symbolic";
+                }
+            }
+        }
+
+        public string PlayIconTooltip {
+            owned get {
+                if (Running) {
+                    // Translators: tooltip text for the pause/resume button when the training is running
+                    return _("Pause Training");
+                } else {
+                    // Translators: tooltip text for the pause/resume button when the training is paused
+                    return _("Resume Training");
+                }
+            }
+        }
+
+        [GtkCallback]
+        public void restart() {
+            remaining_sets = Setup.Sets;
+            if (Setup.WarmupSec > 0) {
+                current_state = State.Preparation;
+                remaining_sec = Setup.WarmupSec;
+                preparation_started();
+            } else {
+                current_state = State.Exercise;
+                remaining_sec = Setup.ExerciseSec;
+                exercise_started();
+            }
+            Running = true;
+            notifyProperties();
+            updateCssClass();
+        }
+
+        [GtkCallback]
+        public void playPause() {
+            Running = !Running;
+            notifyProperties();
+        }
+
         private bool onTimeout() {
             bool retval;
             if (remaining_sec > 1) {
                 --remaining_sec;
                 retval = true;
+                if (remaining_sec <= countdown_threshold) {
+                    countdown(remaining_sec);
+                }
             } else {
                 switch (current_state) {
                 case State.Preparation:
                     current_state = State.Exercise;
                     remaining_sec = Setup.ExerciseSec;
                     retval = true;
+                    exercise_started();
                     break;
                 case State.Exercise:
                     --remaining_sets;
                     if (remaining_sets > 0) {
                         current_state = State.Rest;
                         remaining_sec = Setup.RestSec;
                         retval = true;
+                        rest_started();
                         break;
                     } else {
                         current_state = State.Finished;
                         retval = false;
+                        running = false;
+                        timer_id = null;
+                        finished();
                         break;
                     }
                 case State.Rest:
                     current_state = State.Exercise;
                     remaining_sec = Setup.ExerciseSec;
+                    exercise_started();
                     retval = true;
                     break;
                 default:
                     assert_not_reached();
                 }
                 updateCssClass();
             }
-
             notifyProperties();
             return retval;
         }
 
         private void notifyProperties() {
             notify_property("RemainingMinFormatted");
             notify_property("RemainingSecFormatted");
+            notify_property("RemainingSetsFormatted");
             notify_property("StateFormatted");
             notify_property("Finished");
+            notify_property("PlayIconName");
+            notify_property("PlayIconTooltip");
         }
 
         private void updateCssClass() {
@@ -143,9 +219,16 @@ namespace ExerciseTimer {
         unowned Gtk.Box timer_card;
         [GtkChild]
         unowned Gtk.Box timer_label_box;
+        [GtkChild]
+        unowned Gtk.Adjustment volume_adjustment;
+        [GtkChild]
+        unowned Gtk.ScaleButton volume_button;
 
         private State current_state;
         private int remaining_sec;
         private int remaining_sets;
+        private uint? timer_id;
+        private bool running;
+        private const int countdown_threshold = 5;
     }
 }
diff --git a/src/Voices.vala b/src/Voices.vala
@@ -0,0 +1,29 @@
+namespace ExerciseTimer {
+    public class Voices : Object {
+        public double Volume { get; set; }
+
+        public Voices(ITimerNotifier notifier) {
+            for (var i = 0; i < ping_files.length; ++i) {
+                var resource_path = "/xyz/safeworlds/hiit/audio/ping%d.wav".printf(i + 1);
+                ping_files[i] = Gtk.MediaFile.for_resource(resource_path);
+            }
+
+            var settings = new GLib.Settings(Config.AppId);
+            settings.bind("beep-volume", this, "Volume", GLib.SettingsBindFlags.DEFAULT);
+
+            notifier.preparation_started.connect(() => { ping(2); });
+            notifier.exercise_started.connect(() => { ping(2); });
+            notifier.rest_started.connect(() => { ping(2); });
+            notifier.finished.connect(() => { ping(3); });
+            notifier.countdown.connect((_) => { ping(1); });
+        }
+
+        private void ping(int times) {
+            ping_files[times - 1].volume = Volume;
+            ping_files[times - 1].seek(0);
+            ping_files[times - 1].play_now();
+        }
+
+        private Gtk.MediaFile[] ping_files = new Gtk.MediaFile[3];
+    }
+}
diff --git a/src/Window.vala b/src/Window.vala
@@ -40,6 +40,7 @@ namespace ExerciseTimer {
             var setup = training_list_row.Setup;
             var timer_page = new TimerPage(setup);
             navigation_view.push(timer_page);
+            voices = new Voices(timer_page);
         }
 
         [GtkChild]
@@ -53,6 +54,8 @@ namespace ExerciseTimer {
         [GtkChild]
         private unowned Gtk.ListBox training_listbox;
 
+        private Voices voices;
+
         private static TrainingSetup default_setup = new TrainingSetup(){ Title = "Exercise", WarmupSec = 5, ExerciseSec = 30, RestSec = 10, Sets = 4 };
     }
 }
diff --git a/src/meson.build b/src/meson.build

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:43c5c94d4b7d239b9e6fd326aed73925c1c401850605a295193db562ea9d824f`
	`3`	`+size 26356`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:815cde465e8c6570f2960677af0190511b49f7898e0924341dab8cfa60bdccc3`
	`3`	`+size 52538`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:720d5765573df602b5f06e1e683ea219fc6f2eebfd92942141558b4f6f537870`
	`3`	`+size 78720`