Experiment with a cleaner stylesheet.

main.py

@@ -7,7 +7,7 @@ import threading
 
 import task_manager
 
-APP_TITLE = "Org-mob"
+APP_TITLE = "Org-Convergence"
 DOCS_PATH = os.environ["ORG_PATH"]
 STYLE_FILE_PATH = os.path.join(
     os.path.dirname(os.path.abspath(__file__)),
@@ -58,7 +58,10 @@ class MainWindow(Gtk.Window):
         self.set_child(self.scrollview)
 
         self.loading += 1
-        self.task_manager.get_task_list(self.on_task_list_ready)
+        self.task_manager.get_task_list(
+            self.on_task_list_update,
+            self.on_task_list_ready,
+        )
 
     ## Rendering
     def build_agenda_task_row(self, task):
@@ -94,21 +97,14 @@ class MainWindow(Gtk.Window):
                 self.progress_spinner.stop()
 
     ## Callbacks
-    def on_task_list_ready(self, agenda):
+    def on_task_list_update(self, new_rows):
-        # TODO: Avoid reconstructing the whole list every time
+        for item in new_rows.with_hour:
-        i = 0
-        child = self.task_list.get_first_child()
-        while child is not None:
-            was = child
-            child = child.get_next_sibling()
-            i += 1
-            self.task_list.remove(was)
-
-        for item in agenda.with_hour:
             self.task_list.append(self.build_agenda_task_row(item))
 
-        for item in agenda.no_hour:
+        for item in new_rows.no_hour:
             self.task_list.append(self.build_agenda_task_row(item))
+
+    def on_task_list_ready(self, success):
         self.on_ready()
 
     ## Reactions
@@ -123,7 +119,7 @@ class Application(Gtk.Application):
     """ Main Aplication class """
 
     def __init__(self):
-        super().__init__(application_id='com.codigoparallevar.gtk4-organizer',
+        super().__init__(application_id='com.codigoparallevar.org-convergence',
                          flags=Gio.ApplicationFlags.FLAGS_NONE)
         self.task_manager = task_manager.TaskManager(DOCS_PATH)
 
@@ -140,7 +136,9 @@ class Application(Gtk.Application):
                 application=self,
                 task_manager=self.task_manager,
             )
-            win.set_default_size(600, 400)
+
+            # PinePhone screen is 720x1440 (portrait) but, has 2x pixel density
+            win.set_default_size(360, 720)
 
         win.present()
 

style.css

@@ -1,7 +1,4 @@
 #task-list {
-	border: 1px solid #cdc7c2;
-	padding: 1ex;
-	margin: 1ex;
 }
 
 #task-list .state-button,
@@ -10,11 +7,7 @@
 }
 
 window {
-	background-color: #d6d5d4;
 }
 
 #task-list .task-name {
-	border: none;
-	border-bottom: 1px solid #ccc;
-	border-radius: 0;
 }

task_manager.py

@@ -91,22 +91,19 @@ class TaskManager:
 
         self.docs = docs
 
-    def get_task_list(self, callback):
+    def get_task_list(self, progress_callback, complete_callback):
         def aux():
             if self.docs is None:
                 last_result = None
+                # No docs read yet, load them iteratively
                 for doc in self.load():
-                    result = self.get_agenda()
+                    result = self.get_agenda_from_doc(doc)
-                    if ((last_result is None)
+                    GObject.idle_add(progress_callback, result)
-                    or (len(result.with_hour) != len(last_result.with_hour)) 
-                    or  (len(result.no_hour) != len(last_result.no_hour))):
-                        print("Loaded:", doc._path)
-                        GObject.idle_add(callback, result)
-                print("Load completed")
             else:
                 result = self.get_agenda()
                 print("Result", result)
-                GObject.idle_add(callback, result)
+                GObject.idle_add(progress_callback, result)
+            GObject.idle_add(complete_callback, True)
 
         thread = threading.Thread(target=aux)
         thread.start()
@@ -153,3 +150,39 @@ class TaskManager:
             with_hour=sorted(items_with_hour, key=lambda x: x.scheduled.time),
             no_hour=other_items,
         )
+
+    def get_agenda_from_doc(self, doc: OrgDoc) -> Agenda:
+        headline_count = 0
+        items_in_agenda = []
+        now = datetime.now()
+
+        for hl in doc.getAllHeadlines():
+            headline_count += 1
+
+            if (
+                hl.scheduled
+                and isinstance(hl.scheduled, OrgTime)
+                and hl.scheduled.time.active
+            ):
+                if is_today(hl.scheduled):
+                    items_in_agenda.append(hl)
+                elif (hl.scheduled.time.to_datetime() < now) and hl.is_todo:
+                    items_in_agenda.append(hl)
+
+        items_with_hour = [
+            item
+            for item in items_in_agenda
+            if item.scheduled and is_today(item.scheduled) and item.scheduled.time.hour
+        ]
+        other_items = [
+            item
+            for item in items_in_agenda
+            if not (
+                item.scheduled and is_today(item.scheduled) and item.scheduled.time.hour
+            )
+        ]
+
+        return Agenda(
+            with_hour=sorted(items_with_hour, key=lambda x: x.scheduled.time),
+            no_hour=other_items,
+        )