sidebar: Port to Adw.ViewSwitcherSidebar

Author: jamiethecat

openemail/gtk/contacts.py

@@ -3,10 +3,12 @@
 # SPDX-FileContributor: kramo
 
 from contextlib import suppress
+from typing import Any
 
 from gi.repository import Adw, GObject, Gtk
 
 from openemail import PREFIX, store, tasks
+from openemail._property import Property
 from openemail.core.model import Address
 from openemail.store import DictStore, People
 
@@ -34,6 +36,20 @@ class Contacts(Adw.NavigationPage):
     address: Adw.EntryRow = child
     address_form: Form = child
 
+    contact_requests_filter: Gtk.BoolFilter = child
+
+    counter = Property(int)
+
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+        store.settings.connect(
+            "changed::contact-requests",
+            lambda *_: self.contact_requests_filter.changed(
+                Gtk.FilterChange.MORE_STRICT
+            ),
+        )
+
     @Gtk.Template.Callback()
     def _new_contact(self, *_args):
         self.address_form.reset()

openemail/gtk/content.py

@@ -14,7 +14,6 @@
 
 from .contacts import Contacts
 from .messages import Broadcasts, Drafts, Inbox, Outbox, Sent, Trash
-from .navigation_row import NavigationRow
 from .profile_settings import ProfileSettings
 
 for t in Contacts, Broadcasts, Drafts, Inbox, Outbox, Sent, Trash, ComposeSheet:
@@ -33,7 +32,6 @@ class Content(Adw.BreakpointBin):
     split_view: Adw.OverlaySplitView = child
 
     sidebar_toolbar_view: Adw.ToolbarView = child
-    sidebar: Gtk.ListBox = child
     stack: Adw.ViewStack = child
     profile_settings: ProfileSettings = child
 
@@ -55,9 +53,6 @@ def header_bar_layout(self) -> str:
     def __init__(self, **kwargs: Any):
         super().__init__(**kwargs)
 
-        self.sidebar.set_header_func(self._header_func)
-        self.sidebar.select_row(self.sidebar.get_row_at_index(0))
-
         Property.bind(Profile.of(client.user), "image", self, "profile-image")
         Property.bind(
             Notifier(), "sending", self.sidebar_toolbar_view, "reveal-bottom-bars"
@@ -68,24 +63,8 @@ def __init__(self, **kwargs: Any):
             lambda *_: self.notify("header-bar-layout"),
         )
 
-    def _header_func(self, row: NavigationRow, *_args):
-        row.set_header(
-            Gtk.Separator(
-                margin_start=9,
-                margin_end=9,
-            )
-            if row.separator
-            else None
-        )
-
     @Gtk.Template.Callback()
-    def _on_row_selected(self, _obj, row: NavigationRow | None):
-        if not row:
-            return
-
-        self.sidebar.select_row(row)
-        self.stack.props.visible_child = row.page.props.child
-
+    def _close_sidebar(self, *_args):
         if self.split_view.props.collapsed:
             self.split_view.props.show_sidebar = False
 

openemail/gtk/messages.py

@@ -18,6 +18,8 @@
 
 
 class _Messages(Adw.NavigationPage):
+    counter = Property(int)
+
     def __init__(
         self,
         model: Gio.ListModel,
@@ -47,6 +49,17 @@ def __init__(
 
         self.props.child = self.page
 
+        unread: Gtk.FilterListModel = self._get_object("unread")
+        unread.bind_property(
+            "n-items", self, "counter", GObject.BindingFlags.SYNC_CREATE
+        )
+
+        unread_filter = self._get_object("unread_filter")
+        store.settings.connect(
+            "changed::unread-messages",
+            lambda *_: unread_filter.changed(Gtk.FilterChange.MORE_STRICT),
+        )
+
     def _get_object(self, name: str) -> Any:  # noqa: ANN401
         return self.builder.get_object(name)
 

openemail/gtk/navigation_row.py

@@ -5,6 +5,7 @@ $People people {}
 
 template $Contacts: Adw.NavigationPage {
   title: _("Contacts");
+  counter: bind contact_requests.n-items;
 
   child: $Page page {
     title: bind template.title;
@@ -108,3 +109,11 @@ $Form address_form {
     type: address;
   }
 }
+
+FilterListModel contact_requests {
+  filter: BoolFilter contact_requests_filter {
+    expression: expr item as <$Profile>.contact-request;
+  };
+
+  model: bind people.all;
+}

openemail/gtk/ui/contacts.blp

@@ -119,45 +119,9 @@ template $Content: Adw.BreakpointBin {
             ]
           }
 
-          content: ScrolledWindow {
-            hscrollbar-policy: never;
-
-            child: ListBox sidebar {
-              row-selected => $_on_row_selected();
-
-              $NavigationRow {
-                page: bind inbox_page;
-              }
-
-              $NavigationRow {
-                page: bind outbox_page;
-              }
-
-              $NavigationRow {
-                page: bind sent_page;
-              }
-
-              $NavigationRow {
-                page: bind drafts_page;
-              }
-
-              $NavigationRow {
-                page: bind trash_page;
-              }
-
-              $NavigationRow {
-                page: bind broadcasts_page;
-                separator: true;
-              }
-
-              $NavigationRow {
-                page: bind contacts_page;
-              }
-
-              styles [
-                "navigation-sidebar",
-              ]
-            };
+          content: Adw.ViewSwitcherSidebar {
+            stack: stack;
+            activated => $_close_sidebar();
           };
         };
       };
@@ -171,6 +135,7 @@ template $Content: Adw.BreakpointBin {
           Adw.ViewStackPage inbox_page {
             icon-name: "inbox-symbolic";
             title: bind inbox.title;
+            badge-number: bind inbox.counter;
 
             child: $Inbox inbox {};
           }
@@ -192,27 +157,32 @@ template $Content: Adw.BreakpointBin {
           Adw.ViewStackPage drafts_page {
             icon-name: "drafts-symbolic";
             title: bind drafts.title;
+            badge-number: bind drafts.counter;
 
             child: $Drafts drafts {};
           }
 
           Adw.ViewStackPage trash_page {
             icon-name: "trash-symbolic";
             title: bind trash.title;
+            badge-number: bind trash.counter;
 
             child: $Trash trash {};
           }
 
           Adw.ViewStackPage broadcasts_page {
+            starts-section: true;
             icon-name: "broadcasts-symbolic";
             title: bind broadcasts.title;
+            badge-number: bind broadcasts.counter;
 
             child: $Broadcasts broadcasts {};
           }
 
           Adw.ViewStackPage contacts_page {
             icon-name: "contacts-symbolic";
             title: bind contacts.title;
+            badge-number: bind contacts.counter;
 
             child: $Contacts contacts {};
           }

openemail/gtk/ui/content.blp

@@ -9,7 +9,6 @@ blueprints = custom_target(
         'message-row.blp',
         'message-view.blp',
         'messages.blp',
-        'navigation-row.blp',
         'page.blp',
         'preferences.blp',
         'profile-settings.blp',

openemail/gtk/ui/meson.build

@@ -38,6 +38,20 @@ $Page page {
   };
 }
 
+FilterListModel unread {
+  filter: AnyFilter unread_filter {
+    BoolFilter {
+      expression: expr item as <$Message>.new;
+    }
+
+    BoolFilter {
+      expression: expr item as <$Message>.is_draft;
+    }
+  };
+
+  model: bind page.model;
+}
+
 /* Folder */
 Adw.StatusPage no_messages {
   icon-name: "mailbox-symbolic";

openemail/gtk/ui/messages.blp

@@ -10,7 +10,6 @@
     <file>message-row.ui</file>
     <file>message-view.ui</file>
     <file>messages.ui</file>
-    <file>navigation-row.ui</file>
     <file>page.ui</file>
     <file>preferences.ui</file>
     <file>profile-settings.ui</file>