Refactor Scheduled views to use a common base class

Author: byquanton

src/Views/Scheduled/Scheduled.vala

@@ -340,14 +340,8 @@ public class Views.Scheduled.Scheduled : Adw.Bin {
 
     public void clean_up () {
         foreach (var row in Util.get_default ().get_children (listbox)) {
-            if (row is Views.Scheduled.ScheduledDay) {
-                ((Views.Scheduled.ScheduledDay) row).clean_up ();
-            } else if (row is Views.Scheduled.ScheduledMonth) {
-                ((Views.Scheduled.ScheduledMonth) row).clean_up ();
-            } else if (row is Views.Scheduled.ScheduledRange) {
-                ((Views.Scheduled.ScheduledRange) row).clean_up ();
-            } else if (row is Views.Scheduled.ScheduledOverdue) {
-                ((Views.Scheduled.ScheduledOverdue) row).clean_up ();
+            if (row is Views.Scheduled.ScheduledSection) {
+                ((Views.Scheduled.ScheduledSection) row).clean_up ();
             }
         }
 

src/Views/Scheduled/ScheduledDay.vala

@@ -19,26 +19,10 @@
  * Authored by: Alain M. <alainmh23@gmail.com>
  */
 
-public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
+public class Views.Scheduled.ScheduledDay : Views.Scheduled.ScheduledSection {
     public GLib.DateTime date { get; construct; }
 
-    private Gtk.ListBox listbox;
-    private Gtk.Revealer listbox_revealer;
-
-    #if WITH_EVOLUTION
-    private Widgets.EventsList event_list;
-    private Gtk.Revealer event_list_revealer;
-    #endif
-
-    private Gee.HashMap<string, Layouts.ItemRow> items;
-
-    private bool has_items {
-        get {
-            return items.size > 0;
-        }
-    }
-
-    private Gee.HashMap<ulong, weak GLib.Object> signal_map = new Gee.HashMap<ulong, weak GLib.Object> ();
+    private Gtk.Box header_content;
 
     public ScheduledDay (GLib.DateTime date) {
         Object (
@@ -55,19 +39,14 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
         add_css_class ("transition");
         add_css_class ("no-padding");
 
-        items = new Gee.HashMap<string, Layouts.ItemRow> ();
-
         var day_label = new Gtk.Label (date.get_day_of_month ().to_string ()) {
             halign = Gtk.Align.START
         };
         day_label.add_css_class ("font-bold");
 
-        var date_format_label = new Gtk.Label (
-            date.format ("%a")
-                                ) {
+        var date_format_label = new Gtk.Label (date.format ("%a")) {
             halign = Gtk.Align.START
         };
-
         date_format_label.add_css_class ("dimmed");
 
         var title_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) {
@@ -77,36 +56,10 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
         title_box.append (day_label);
         title_box.append (date_format_label);
 
-        #if WITH_EVOLUTION
-        event_list = new Widgets.EventsList.for_day (date) {
-            hexpand = true,
-            valign = Gtk.Align.START,
-            margin_top = 6
-        };
 
-        event_list_revealer = new Gtk.Revealer () {
-            transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN,
-            reveal_child = event_list.has_items,
-            child = event_list
-        };
-        #endif
 
-        var header_content = new Gtk.Box (Gtk.Orientation.VERTICAL, 0) {
-            hexpand = true,
-            valign = Gtk.Align.START,
-            margin_start = 30,
-            margin_end = 24
-        };
-
-        header_content.append (title_box);
-        header_content.append (new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
-            margin_top = 6,
-            margin_bottom = 3
-        });
-
-        #if WITH_EVOLUTION
-        header_content.append (event_list_revealer);
-        #endif
+        header_content = create_header (title_box);
+        setup_events (header_content);
 
         listbox = new Gtk.ListBox () {
             valign = Gtk.Align.START,
@@ -139,19 +92,16 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
         content.append (listbox_revealer);
 
         child = content;
+
+        setup_listbox ();
+        setup_item_signals ();
         add_items ();
 
         Timeout.add (listbox_revealer.transition_duration, () => {
             listbox_revealer.reveal_child = has_items;
             return GLib.Source.REMOVE;
         });
 
-        signal_map[Services.Store.instance ().item_added.connect (valid_add_item)] = Services.Store.instance ();
-        signal_map[Services.Store.instance ().item_deleted.connect (valid_delete_item)] = Services.Store.instance ();
-        signal_map[Services.Store.instance ().item_updated.connect (valid_update_item)] = Services.Store.instance ();
-        signal_map[Services.Store.instance ().item_archived.connect (valid_delete_item)] = Services.Store.instance ();
-        signal_map[Services.Store.instance ().item_unarchived.connect (valid_add_item)] = Services.Store.instance ();
-
         signal_map[Services.EventBus.get_default ().item_moved.connect ((item) => {
             if (items.has_key (item.id)) {
                 items[item.id].update_request ();
@@ -160,68 +110,14 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
             listbox.invalidate_filter ();
         })] = Services.EventBus.get_default ();
 
-        signal_map[Services.Settings.get_default ().settings.changed["scheduled-sort-order"].connect (() => {
-            listbox.invalidate_sort ();
-        })] = Services.Settings.get_default ();
-
-        listbox.set_sort_func ((lbrow, lbbefore) => {
-            Objects.Item item1 = ((Layouts.ItemRow) lbrow).item;
-            Objects.Item item2 = ((Layouts.ItemRow) lbbefore).item;
-
-            SortedByType sorted_by = SortedByType.parse (Services.Settings.get_default ().settings.get_string ("scheduled-sort-order"));
-
-            return Util.get_default ().set_item_sort_func (
-                item1,
-                item2,
-                sorted_by,
-                SortOrderType.ASC
-            );
-        });
-
-        listbox.set_filter_func ((row) => {
-            var item = ((Layouts.ItemRow) row).item;
-            bool return_value = true;
-
-            if (Objects.Filters.Scheduled.get_default ().filters.size <= 0) {
-                return true;
-            }
-
-            return_value = false;
-            foreach (Objects.Filters.FilterItem filter in Objects.Filters.Scheduled.get_default ().filters.values) {
-                if (filter.filter_type == FilterItemType.PRIORITY) {
-                    return_value = return_value || item.priority == int.parse (filter.value);
-                } else if (filter.filter_type == FilterItemType.LABEL) {
-                    return_value = return_value || item.has_label (filter.value);
-                }
-            }
-
-            return return_value;
-        });
-
-        signal_map[Objects.Filters.Scheduled.get_default ().filter_added.connect (() => {
-            listbox.invalidate_filter ();
-        })] = Objects.Filters.Scheduled.get_default ();
-
-        signal_map[Objects.Filters.Scheduled.get_default ().filter_removed.connect (() => {
-            listbox.invalidate_filter ();
-        })] = Objects.Filters.Scheduled.get_default ();
-
-        signal_map[Objects.Filters.Scheduled.get_default ().filter_updated.connect (() => {
-            listbox.invalidate_filter ();
-        })] = Objects.Filters.Scheduled.get_default ();
-
         signal_map[Services.EventBus.get_default ().dim_content.connect ((active, focused_item_id) => {
             header_content.sensitive = !active;
         })] = Services.EventBus.get_default ();
 
-        #if WITH_EVOLUTION
-        signal_map[event_list.change.connect (() => {
-            event_list_revealer.reveal_child = event_list.has_items;
-        })] = event_list;
-        #endif
+
     }
 
-    private void add_items () {
+    protected override void add_items () {
         foreach (Objects.Item item in Services.Store.instance ().get_items_by_date (date, false)) {
             add_item (item);
         }
@@ -239,39 +135,30 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
         }
     }
 
-    private void add_item (Objects.Item item) {
-        if (!items.has_key (item.id)) {
-            items[item.id] = new Layouts.ItemRow (item);
-            items[item.id].disable_drag_and_drop ();
-            listbox.append (items[item.id]);
-        }
-    }
-
-    private void valid_add_item (Objects.Item item) {
+    protected override bool valid_item_predicate (Objects.Item item) {
         bool valid_due = item.has_due && Services.Store.instance ().valid_item_by_date (item, date, false);
-        bool valid_deadline = Utils.Datetime.is_today (date) && item.has_deadline && 
-                              Utils.Datetime.is_today (Utils.Datetime.get_date_only (item.deadline_datetime));
-        
-        if (!items.has_key (item.id) && (valid_due || valid_deadline)) {
-            items[item.id] = new Layouts.ItemRow (item);
-            items[item.id].disable_drag_and_drop ();
-            listbox.append (items[item.id]);
-        }
+        bool valid_deadline = Utils.Datetime.is_today (date) && item.has_deadline &&
+        Utils.Datetime.is_today (Utils.Datetime.get_date_only (item.deadline_datetime));
 
-        listbox_revealer.reveal_child = has_items;
-        listbox.invalidate_filter ();
+        return valid_due || valid_deadline;
     }
 
-    private void valid_delete_item (Objects.Item item) {
-        if (items.has_key (item.id)) {
-            items[item.id].hide_destroy ();
-            items.unset (item.id);
-        }
+    #if WITH_EVOLUTION
+    protected override Widgets.EventsList? create_events_list () {
+        return new Widgets.EventsList.for_day (date) {
+            hexpand = true,
+            valign = Gtk.Align.START,
+            margin_top = 6
+        };
+    }
+    #endif
 
-        listbox_revealer.reveal_child = has_items;
+    protected override void valid_add_item (Objects.Item item) {
+        base.valid_add_item (item);
+        listbox.invalidate_filter ();
     }
 
-    private void valid_update_item (Objects.Item item) {
+    protected override void valid_update_item (Objects.Item item, string? update_id = null) {
         if (items.has_key (item.id)) {
             items[item.id].update_request ();
         }
@@ -301,25 +188,4 @@ public class Views.Scheduled.ScheduledDay : Gtk.ListBoxRow {
         listbox_revealer.reveal_child = has_items;
         listbox.invalidate_filter ();
     }
-
-
-
-    public void clean_up () {
-        listbox.set_filter_func (null);
-        listbox.set_sort_func (null);
-
-        foreach (var row in Util.get_default ().get_children (listbox)) {
-            ((Layouts.ItemRow) row).clean_up ();
-        }
-        
-        foreach (var entry in signal_map.entries) {
-            entry.value.disconnect (entry.key);
-        }
-
-        signal_map.clear ();
-
-        #if WITH_EVOLUTION
-        event_list.clean_up ();
-        #endif
-    }
 }