Add spinner

requirements.txt

@@ -1,5 +1,7 @@
-prompt_toolkit==3.0.3
+prompt_toolkit>=3.0.31
 requests_oauthlib==1.3.0
 PyYAML==5.4
+bs4
+yaspin
 
 setuptools~=49.2.1

setup.py

@@ -12,11 +12,12 @@
     license="LICENSE",
     description="A Terminal Client for Microsoft To-Do.",
     install_requires=[
-        "prompt-toolkit",
+        "prompt-toolkit>=3.0.31",
         "pyyaml",
-        "requests",
+        "requests>=2.28.1",
         "requests_oauthlib",
         "bs4",
+        "yaspin>=2.2.0",
     ],
     include_package_data=True,
     entry_points="""

todocli/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.6"
+__version__ = "0.7.0"

todocli/interface.py

@@ -1,3 +1,5 @@
+from yaspin import yaspin
+
 from prompt_toolkit.application import Application
 from prompt_toolkit.key_binding import (
     KeyBindings,
@@ -51,9 +53,20 @@ def __init__(self):
         self.tasks = []
 
         # UI
-        self.prompt_window = Window(height=1)
-        self.left_window = Window(height=1)
-        self.right_window = Window(height=1)
+        self.DEFAULT_PROMPT_WINDOW = TextArea(
+            height=1,
+            prompt="",
+            style="class:input-field",
+            multiline=False,
+            wrap_lines=False,
+        )
+
+        self.prompt_window = self.DEFAULT_PROMPT_WINDOW
+        self.left_window = HSplit([Window()], align=VerticalAlign.TOP, padding=0)
+        self.right_window = HSplit([Window()], align=VerticalAlign.TOP, padding=0)
+
+        # Load lists
+        self.load_lists()
 
         # Creating an `Application` instance
         self.application = Application(
@@ -66,12 +79,6 @@ def __init__(self):
         self.application.run()
 
     def create_layout(self):
-        self.left_window = HSplit([Window()])
-
-        # Get folders to load on screen
-        self.load_lists()
-
-        self.right_window = HSplit([Window()], align=VerticalAlign.TOP, padding=0)
         body = VSplit(
             [
                 self.left_window,
@@ -81,13 +88,10 @@ def create_layout(self):
             padding=1,
         )
 
-        self.prompt_window = Window(
-            height=1, content=FormattedTextControl(""), align=WindowAlign.LEFT
-        )
-
         root_container = HSplit(
             [
                 # The titlebar.
+                DynamicContainer(lambda: self.prompt_window),
                 Window(
                     height=1,
                     content=FormattedTextControl([("class:title", " tod0 ")]),
@@ -97,7 +101,6 @@ def create_layout(self):
                 Window(height=1, char="-", style="class:line"),
                 body,
                 Window(height=1, char=".", style="class:line"),
-                DynamicContainer(lambda: self.prompt_window),
             ]
         )
 
@@ -112,27 +115,29 @@ def load_lists(self):
         self.list_focus_idx = 0
 
         # Retrieve folder data
-        self.lists = wrapper.get_lists()
+        with yaspin(text="Loading lists") as sp:
+            self.lists = wrapper.get_lists()
 
         # Layout interface
         self.left_window.children = [
             Window(FormattedTextControl(f.display_name), width=50) for f in self.lists
         ]
 
         # Highlight first folder
-        self.left_window.children[0].style = Tod0GUI.COLOR_LIST
+        self.left_window.children[self.list_focus_idx].style = Tod0GUI.COLOR_LIST
 
     def load_tasks(self):
         """
         Load tasks of currently focused folder
         """
 
         selected_list = self.lists[self.list_focus_idx]
-        self.tasks = wrapper.get_tasks(list_id=selected_list.id, num_tasks=100)
 
-        self.tasks_ui = []
+        with yaspin(text="Loading tasks") as sp:
+            self.tasks = wrapper.get_tasks(list_id=selected_list.id, num_tasks=100)
+
+        self.tasks_ui.clear()
         for idx, t in enumerate(self.tasks):
-            # global_tasks_ui.append(Window(FormattedTextControl(t.title), height=1))
             _task_ui = VSplit(
                 [
                     Window(FormattedTextControl(t.title), wrap_lines=True, height=2),
@@ -153,11 +158,18 @@ def load_tasks(self):
                 Window(FormattedTextControl("-- No Tasks --"))
             ]
         else:
-            self.right_window.children = self.tasks_ui[0 : Tod0GUI.NUM_TASKS_PER_PAGE]
+            self.right_window.children = [
+                t for t in self.tasks_ui[0 : Tod0GUI.NUM_TASKS_PER_PAGE]
+            ]
             self.task_focus_idx = 0
             self.tasks_ui[self.task_focus_idx].style = Tod0GUI.COLOR_TASK
         self.is_focus_on_list = False
 
+    def reset_prompt_window(self):
+        self.prompt_window = self.DEFAULT_PROMPT_WINDOW
+        self.application.layout.focus(self.prompt_window)
+        Tod0GUI.is_waiting_prompt = False
+
     """
     Key Bindings
     """
@@ -281,8 +293,6 @@ def _(event):
             """
             Go back to list scroll mode
             """
-            if self.tasks_ui:
-                self.tasks_ui[self.task_focus_idx].style = ""
             self.right_window.children = [Window()]
             self.is_focus_on_list = True
 
@@ -313,15 +323,18 @@ def confirm(buff):
                 user_input = input_field.text
                 if user_input == "y":
                     # Mark task as complete
-                    wrapper.complete_task(
-                        list_id=self.lists[self.list_focus_idx].id,
-                        task_id=self.tasks[self.task_focus_idx].id,
-                    )
+                    with yaspin(text="Marking as complete") as sp:
+                        wrapper.complete_task(
+                            list_id=self.lists[self.list_focus_idx].id,
+                            task_id=self.tasks[self.task_focus_idx].id,
+                        )
+
                     self.load_tasks()
+                    # self.refresh_layout()
 
                 # Return to normal state
                 Tod0GUI.is_waiting_prompt = False
-                self.prompt_window = Window()
+                self.reset_prompt_window()
 
             input_field.accept_handler = confirm
 
@@ -351,13 +364,13 @@ def get_name(buff):
                     user_input = input_field.text
                     if user_input:
                         # Create new list
-                        wrapper.create_list(user_input)
+                        with yaspin(text="Creating new list") as sp:
+                            wrapper.create_list(user_input)
                         # Refresh lists
                         self.load_lists()
 
                     # Return to normal state
-                    Tod0GUI.is_waiting_prompt = False
-                    self.prompt_window = Window()
+                    self.reset_prompt_window()
 
             else:
                 # We are creating a new task
@@ -374,15 +387,15 @@ def get_name(buff):
                     user_input = input_field.text
                     if user_input:
                         # Create new task
-                        wrapper.create_task(
-                            user_input, list_id=self.lists[self.list_focus_idx].id
-                        )
+                        with yaspin(text="Creating new task") as sp:
+                            wrapper.create_task(
+                                user_input, list_id=self.lists[self.list_focus_idx].id
+                            )
                         # Refresh tasks
                         self.load_tasks()
 
                     # Return to normal state
-                    Tod0GUI.is_waiting_prompt = False
-                    self.prompt_window = Window()
+                    self.reset_prompt_window()
 
             input_field.accept_handler = get_name
 
@@ -395,8 +408,7 @@ def _(event):
             Escape prompt
             """
             # Return to normal state
-            Tod0GUI.is_waiting_prompt = False
-            self.prompt_window = Window()
+            self.reset_prompt_window()
 
         @Condition
         def is_not_waiting_for_confirmation():