feat(sidebar): new filters, grid/list view toggle, and code cleanup (#1751)

* add new sidebar filter

* hide magicbutton

Author: alainm23

core/Enum.vala

@@ -92,115 +92,6 @@ public enum ProjectIconStyle {
     }
 }
 
-public enum FilterType {
-    INBOX = 0,
-    TODAY = 1,
-    SCHEDULED = 2,
-    PINBOARD = 3,
-    LABELS = 4,
-    COMPLETED = 5;
-
-    public string to_string () {
-        switch (this) {
-            case INBOX:
-                return "inbox";
-
-            case TODAY:
-                return "today";
-
-            case SCHEDULED:
-                return "scheduled";
-
-            case PINBOARD:
-                return "pinboard";
-
-            case LABELS:
-                return "labels";
-
-            case COMPLETED:
-                return "completed";
-
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public string get_name () {
-        switch (this) {
-            case INBOX:
-                return _("Inbox");
-
-            case TODAY:
-                return _("Today");
-
-            case SCHEDULED:
-                return _("Scheduled");
-
-            case PINBOARD:
-                return _("Pinboard");
-
-            case LABELS:
-                return _("Labels");
-
-            case COMPLETED:
-                return _("Completed");
-
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public string get_icon () {
-        switch (this) {
-            case INBOX:
-                return "mailbox-symbolic";
-
-            case TODAY:
-                return "star-outline-thick-symbolic";
-
-            case SCHEDULED:
-                return "month-symbolic";
-
-            case PINBOARD:
-                return "pin-symbolic";
-
-            case LABELS:
-                return "tag-outline-symbolic";
-
-            case COMPLETED:
-                return "check-round-outline-symbolic";
-
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public string get_color (bool dark = Services.Settings.get_default ().settings.get_boolean ("dark-mode")) {
-        switch (this) {
-            case INBOX:
-                return dark ? "#99c1f1" : "#3584e4";
-
-            case TODAY:
-                return "#33d17a";
-
-            case SCHEDULED:
-                return dark ? "#dc8add" : "#9141ac";
-
-            case PINBOARD:
-                return dark ? "#f66151" : "#ed333b";
-
-            case LABELS:
-                return dark ? "#cdab8f" : "#986a44";
-
-            case COMPLETED:
-                return dark ? "#ffbe6f" : "#ff7800";
-
-            default:
-                assert_not_reached ();
-        }
-    }
-}
-
 public enum SourceType {
     NONE,
     LOCAL,
@@ -254,8 +145,7 @@ public enum PaneType {
     FILTER,
     FAVORITE,
     PROJECT,
-    LABEL,
-    TASKLIST
+    LABEL
 }
 
 public enum LoadingButtonType {

core/Objects/BaseObject.vala

@@ -24,6 +24,7 @@ public class Objects.BaseObject : GLib.Object {
     public string name { get; set; default = ""; }
     public string keywords { get; set; default = ""; }
     public string icon_name { get; set; default = ""; }
+    public string color { get; set; default = ""; }
 
     public signal void deleted ();
     public signal void updated (string update_id = "");
@@ -73,6 +74,7 @@ public class Objects.BaseObject : GLib.Object {
 
     public signal void loading_change ();
     public signal void sensitive_change ();
+    public signal void count_updated ();
 
     public string view_id { get; set; default = ""; }
 
@@ -223,6 +225,32 @@ public class Objects.BaseObject : GLib.Object {
         }
     }
 
+    public int ? _item_count = null;
+    public int item_count {
+        get {
+            if (_item_count == null) {
+                _item_count = update_count ();
+            }
+
+            return _item_count;
+        }
+
+        set {
+            _item_count = value;
+        }
+    }
+
+    public double ? _percentage = null;
+    public double percentage {
+        get {
+            if (_percentage == null) {
+                _percentage = update_percentage ();
+            }
+
+            return _percentage;
+        }
+    }
+
     public virtual string get_update_json (string uuid, string ? temp_id = null) {
         return "";
     }
@@ -267,4 +295,18 @@ public class Objects.BaseObject : GLib.Object {
 
         return null;
     }
+
+    public virtual int update_count () {
+        return 0;
+    }
+
+    public virtual double update_percentage () {
+        return 0.0;
+    }
+
+    public virtual void count_update () { }
+
+    public virtual string theme_color () {
+        return color;
+    }
 }

core/Objects/Filters/AllItems.vala

@@ -28,11 +28,46 @@ public class Objects.Filters.AllItems : Objects.BaseObject {
 
         return _instance;
     }
-
+    
     construct {
         name = _("All Tasks");
         keywords = "%s;%s".printf (_("all tasks"), _("all"));
         icon_name = "check-round-outline-symbolic";
         view_id = "all-items-view";
+        color = Services.Settings.get_default ().settings.get_boolean ("dark-mode") ? "#99c1f1" : "#3584e4";
+
+        Services.Store.instance ().item_added.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_deleted.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_archived.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_unarchived.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_updated.connect (() => {
+            count_update ();
+        });
+    }
+
+    public override int update_count () {
+        return Services.Store.instance ().get_items_no_parent (false).size;
+    }
+
+    public override void count_update () {
+        _item_count = update_count ();
+                
+        count_updated ();
+    }
+
+    public override string theme_color () {
+        return Services.Settings.get_default ().get_boolean ("dark-mode") ? "#99c1f1" : "#3584e4";
     }
 }

core/Objects/Filters/Anytime.vala

@@ -34,5 +34,40 @@ public class Objects.Filters.Anytime : Objects.BaseObject {
         keywords = "%s;%s;%s".printf (_("anytime"), _("filters"), _("no date"));
         icon_name = "grid-large-symbolic";
         view_id = "anytime-view";
+        color = Services.Settings.get_default ().settings.get_boolean ("dark-mode") ? "#dc8add" : "#9141ac";
+
+        Services.Store.instance ().item_added.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_deleted.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_archived.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_unarchived.connect (() => {
+            count_update ();
+        });
+
+        Services.Store.instance ().item_updated.connect (() => {
+            count_update ();
+        });
+    }
+
+    public override int update_count () {
+        return Services.Store.instance ().get_items_no_date (false).size;
+    }
+
+    public override void count_update () {
+        _item_count = update_count ();
+                
+        count_updated ();
+    }
+
+    public override string theme_color () {
+        return Services.Settings.get_default ().settings.get_boolean ("dark-mode") ? "#dc8add" : "#9141ac";
     }
 }

core/Objects/Filters/Completed.vala

@@ -29,52 +29,44 @@ public class Objects.Filters.Completed : Objects.BaseObject {
         return _instance;
     }
 
-    int ? _count = null;
-    public int count {
-        get {
-            if (_count == null) {
-                _count = Services.Store.instance ().get_items_completed ().size;
-            }
-
-            return _count;
-        }
-
-        set {
-            _count = value;
-        }
-    }
-
-    public signal void count_updated ();
-
     construct {
         name = _("Completed");
         keywords = "%s;%s;%s".printf (_("completed"), _("filters"), _("logbook"));
         icon_name = "check-round-outline-symbolic";
-        view_id = FilterType.COMPLETED.to_string ();
+        view_id = "completed";
+        color = Services.Settings.get_default ().settings.get_boolean ("dark-mode") ? "#ffbe6f" : "#ff7800";
 
         Services.Store.instance ().item_added.connect (() => {
-            _count = Services.Store.instance ().get_items_completed ().size;
-            count_updated ();
+            count_update ();
         });
 
         Services.Store.instance ().item_deleted.connect (() => {
-            _count = Services.Store.instance ().get_items_completed ().size;
-            count_updated ();
+            count_update ();
         });
 
         Services.Store.instance ().item_updated.connect (() => {
-            _count = Services.Store.instance ().get_items_completed ().size;
-            count_updated ();
+            count_update ();
         });
 
         Services.Store.instance ().item_archived.connect (() => {
-            _count = Services.Store.instance ().get_items_completed ().size;
-            count_updated ();
+            count_update ();
         });
 
         Services.Store.instance ().item_unarchived.connect (() => {
-            _count = Services.Store.instance ().get_items_completed ().size;
-            count_updated ();
+            count_update ();
         });
     }
+
+    public override int update_count () {
+        return Services.Store.instance ().get_items_completed ().size;
+    }
+
+    public override void count_update () {
+        _item_count = update_count ();
+        count_updated ();
+    }
+
+    public override string theme_color () {
+        return Services.Settings.get_default ().settings.get_boolean ("dark-mode") ? "#ffbe6f" : "#ff7800";
+    }
 }