refactor: Create training with dialog

Author: mfep

data/resources/ui/training_editor.blp

@@ -9,6 +9,22 @@ template $ExerciseTimerTrainingEditor : Adw.Dialog {
                 // Translators: The editor window's title when modifying a training
                 title: _("Edit Training");
             };
+            show-end-title-buttons: false;
+
+            [start]
+            Gtk.Button {
+                // Translators: Button to close the training editor window without modifications
+                label: _("Cancel");
+                clicked => $on_cancel_clicked();
+            }
+
+            [end]
+            Gtk.Button {
+                // Translators: Button to close the training editor window with saving modifications
+                label: _("Apply");
+                css-classes: ["suggested-action"];
+                clicked => $on_apply_clicked();
+            }
         }
 
         Adw.Clamp {
@@ -21,16 +37,14 @@ template $ExerciseTimerTrainingEditor : Adw.Dialog {
                 orientation: vertical;
 
                 Adw.PreferencesGroup {
-                    margin-bottom: 12;
-
                     Adw.EntryRow name_row {
                         // Translators: The title of the field for the name of the training in the editor window
                         title: _("Name");
                     }
                 }
 
                 Adw.PreferencesGroup {
-                    margin-bottom: 12;
+                    margin-top: 12;
 
                     Adw.SpinRow {
                         // Translators: The title of the field for the number of sets in the training in the editor window
@@ -75,12 +89,6 @@ template $ExerciseTimerTrainingEditor : Adw.Dialog {
                         };
                     }
                 }
-
-                Gtk.Button {
-                    label: "Apply";
-                    css-classes: ["suggested-action"];
-                    clicked => $on_apply_clicked();
-                }
             }
         }
     }

src/TrainingEditor.vala

@@ -24,6 +24,11 @@ namespace ExerciseTimer {
             this.close();
         }
 
+        [GtkCallback]
+        private void on_cancel_clicked() {
+            this.close();
+        }
+
         private TrainingSetup setup;
         [GtkChild]
         private unowned Adw.EntryRow name_row;

src/Window.vala

@@ -15,12 +15,16 @@ namespace ExerciseTimer {
 
         [GtkCallback]
         private void on_add_training() {
-            training_list_stack.set_visible_child(training_list_scrolled);
-            var row = new TrainingListRow(){
-                Setup = new TrainingSetup(){ Title = "Sample Exercise %d".printf(i++), WarmupSec = 5, ExerciseSec = 30, RestSec = 10, Sets = 4 }
-            };
-            row.Deleted.connect(on_training_deleted);
-            training_listbox.append(row);
+            var editor_dialog = new TrainingEditor(default_setup);
+            editor_dialog.Applied.connect((new_setup) => {
+                training_list_stack.set_visible_child(training_list_scrolled);
+                var row = new TrainingListRow(){
+                    Setup = new_setup
+                };
+                row.Deleted.connect(on_training_deleted);
+                training_listbox.append(row);
+            });
+            editor_dialog.present(this);
         }
 
         private void on_training_deleted(Gtk.Widget row) {
@@ -39,6 +43,6 @@ namespace ExerciseTimer {
         [GtkChild]
         private unowned Gtk.ListBox training_listbox;
 
-        private int i = 0;
+        private static TrainingSetup default_setup = new TrainingSetup(){ Title = "Exercise", WarmupSec = 5, ExerciseSec = 30, RestSec = 10, Sets = 4 };
     }
 }