refactor(core): make the power-off menu, a sub-menu with power-off an…

…d reboot action items - closes #123
ubopod · Jul 19, 2024 · ce72c6c · ce72c6c
1 parent f5f0913
commit ce72c6c
Show file tree

Hide file tree

Showing 16 changed files with 245 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - feat(notifications): add `progress` and `progress_weight` properties to `Notification` object and show the progress on the header of the app
 - feat(core): show the progress of the update using the new `progress` property of the `Notification` object
 - fix(camera): render the viewfinder on the display even if the display is paused - closes #78
+- refactor(core): make the power-off menu, a sub-menu with power-off and reboot action items - closes #123
 
 ## Version 0.15.4
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,7 +30,7 @@ python-redux = "^0.15.9"
 pyzbar = "^0.1.9"
 sdbus-networkmanager = { version = "^2.0.0", markers = "platform_machine=='aarch64'" }
 rpi_ws281x = { version = "^5.0.0", markers = "platform_machine=='aarch64'" }
-python-debouncer = "^0.1.4"
+python-debouncer = "^0.1.5"
 pulsectl = "^23.5.2"
 aiohttp = "^3.9.1"
 semver = "^3.0.2"
@@ -55,13 +55,13 @@ optional = true
 
 [tool.poetry.group.dev.dependencies]
 poethepoet = "^0.24.4"
-pyright = "^1.1.371"
+pyright = "^1.1.372"
 pytest = "^8.0.0"
 pytest-asyncio = "^0.23.5.post1"
 pytest-cov = "^4.1.0"
 pytest-timeout = "^2.3.1"
 pytest-xdist = "^3.5.0"
-ruff = "^0.5.1"
+ruff = "^0.5.3"
 tenacity = "^8.2.3"
 toml = "^0.10.2"
 pytest-mock = "^3.14.0"

diff --git a/tests/integration/results/test_core/app_runs_and_exits/store-desktop-000.jsonc b/tests/integration/results/test_core/app_runs_and_exits/store-desktop-000.jsonc
@@ -204,7 +204,6 @@
           }
         },
         {
-          "action": "<function:<lambda>>",
           "background_color": "#68B7FF",
           "color": [
             1,
@@ -214,9 +213,45 @@
           ],
           "icon": "󰐥",
           "is_short": true,
-          "label": "Turn off",
+          "label": "",
           "opacity": null,
-          "progress": null
+          "progress": null,
+          "sub_menu": {
+            "items": [
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰜉",
+                "is_short": false,
+                "label": "Reboot",
+                "opacity": null,
+                "progress": null
+              },
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰤂",
+                "is_short": false,
+                "label": "Power off",
+                "opacity": null,
+                "progress": null
+              }
+            ],
+            "placeholder": null,
+            "title": "󰐥Power"
+          }
         }
       ],
       "placeholder": null,

diff --git a/tests/integration/results/test_core/app_runs_and_exits/store-rpi-000.jsonc b/tests/integration/results/test_core/app_runs_and_exits/store-rpi-000.jsonc
@@ -204,7 +204,6 @@
           }
         },
         {
-          "action": "<function:<lambda>>",
           "background_color": "#68B7FF",
           "color": [
             1,
@@ -214,9 +213,45 @@
           ],
           "icon": "󰐥",
           "is_short": true,
-          "label": "Turn off",
+          "label": "",
           "opacity": null,
-          "progress": null
+          "progress": null,
+          "sub_menu": {
+            "items": [
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰜉",
+                "is_short": false,
+                "label": "Reboot",
+                "opacity": null,
+                "progress": null
+              },
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰤂",
+                "is_short": false,
+                "label": "Power off",
+                "opacity": null,
+                "progress": null
+              }
+            ],
+            "placeholder": null,
+            "title": "󰐥Power"
+          }
         }
       ],
       "placeholder": null,

diff --git a/tests/integration/results/test_services/all_services_register/store-desktop-000.jsonc b/tests/integration/results/test_services/all_services_register/store-desktop-000.jsonc
@@ -509,7 +509,6 @@
           }
         },
         {
-          "action": "<function:<lambda>>",
           "background_color": "#68B7FF",
           "color": [
             1,
@@ -519,9 +518,45 @@
           ],
           "icon": "󰐥",
           "is_short": true,
-          "label": "Turn off",
+          "label": "",
           "opacity": null,
-          "progress": null
+          "progress": null,
+          "sub_menu": {
+            "items": [
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰜉",
+                "is_short": false,
+                "label": "Reboot",
+                "opacity": null,
+                "progress": null
+              },
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰤂",
+                "is_short": false,
+                "label": "Power off",
+                "opacity": null,
+                "progress": null
+              }
+            ],
+            "placeholder": null,
+            "title": "󰐥Power"
+          }
         }
       ],
       "placeholder": null,

diff --git a/tests/integration/results/test_services/all_services_register/store-rpi-000.jsonc b/tests/integration/results/test_services/all_services_register/store-rpi-000.jsonc
@@ -509,7 +509,6 @@
           }
         },
         {
-          "action": "<function:<lambda>>",
           "background_color": "#68B7FF",
           "color": [
             1,
@@ -519,9 +518,45 @@
           ],
           "icon": "󰐥",
           "is_short": true,
-          "label": "Turn off",
+          "label": "",
           "opacity": null,
-          "progress": null
+          "progress": null,
+          "sub_menu": {
+            "items": [
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰜉",
+                "is_short": false,
+                "label": "Reboot",
+                "opacity": null,
+                "progress": null
+              },
+              {
+                "action": "<function:<lambda>>",
+                "background_color": "#68B7FF",
+                "color": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "icon": "󰤂",
+                "is_short": false,
+                "label": "Power off",
+                "opacity": null,
+                "progress": null
+              }
+            ],
+            "placeholder": null,
+            "title": "󰐥Power"
+          }
         }
       ],
       "placeholder": null,

diff --git a/ubo_app/display.py b/ubo_app/display.py
@@ -14,6 +14,7 @@
     from numpy._typing import NDArray
 
 
+from ubo_app.constants import BYTES_PER_PIXEL
 from ubo_app.utils import IS_RPI
 from ubo_app.utils.fake import Fake
 
@@ -101,12 +102,14 @@ def __init__(self: _State, splash_screen: bytes | None = None) -> None:
 
         self.block(
             (0, 0, WIDTH - 1, HEIGHT - 1),
-            bytes(WIDTH * HEIGHT * 2) if splash_screen is None else splash_screen,
+            bytes(WIDTH * HEIGHT * BYTES_PER_PIXEL)
+            if splash_screen is None
+            else splash_screen,
         )
         atexit.register(
             lambda: self.block(
                 (0, 0, WIDTH - 1, HEIGHT - 1),
-                bytes(WIDTH * HEIGHT * 2),
+                np.zeros((WIDTH, HEIGHT, BYTES_PER_PIXEL), dtype=np.uint8).tobytes(),
             ),
         )
 

diff --git a/ubo_app/menu_app/menu_central.py b/ubo_app/menu_app/menu_central.py
@@ -69,7 +69,7 @@ def __init__(self: MenuAppCentral, **kwargs: object) -> None:
 
         @autorun(lambda state: state.main.menu)
         @debounce(0.1, DebounceOptions(leading=True, trailing=True, time_window=0.1))
-        async def _(menu: Menu | None) -> None:
+        def _(menu: Menu | None) -> None:
             self = _self()
             if not self or not menu:
                 return

diff --git a/ubo_app/services/040-camera/setup.py b/ubo_app/services/040-camera/setup.py
@@ -13,6 +13,7 @@
 from debouncer import DebounceOptions, debounce
 from kivy.clock import Clock, mainthread
 from pyzbar.pyzbar import decode
+from typing_extensions import override
 from ubo_gui.page import PageWidget
 
 from ubo_app import display
@@ -59,11 +60,12 @@ def resize_image(
     wait=THROTTL_TIME,
     options=DebounceOptions(leading=True, trailing=False, time_window=THROTTL_TIME),
 )
-async def check_codes(codes: list[str]) -> None:
+def check_codes(codes: list[str]) -> None:
     dispatch(CameraReportBarcodeAction(codes=codes))
 
 
 class CameraApplication(PageWidget):
+    @override
     def go_back(self: CameraApplication) -> bool:
         return True