Skip to content

Commit

Permalink
refactor(core): rearange menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@sassanh
sassanh committed Sep 9, 2024
1 parent dc5fbb0 commit c3fee39
Show file tree
Hide file tree
Showing 11 changed files with 204 additions and 249 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration_delivery.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ jobs:
- name: Extract Version from CHANGELOG.md
run: |
VERSION_CHANGELOG=$(sed -n '3 s/## Version //p' CHANGELOG.md)
VERSION_CHANGELOG=$(sed -n '/## Version /s/## Version //p' CHANGELOG.md | head -n 1)
echo "VERSION_CHANGELOG=$VERSION_CHANGELOG"
if [ "${{ steps.extract-version.outputs.VERSION }}" != "$VERSION_CHANGELOG" ]; then
echo "Error: Version extracted from CHANGELOG.md does not match the version in pyproject.toml"
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changelog

## Version 0.16.1
## Upcoming

- feat(lightdm): set wayland as the default session for lightdm after installing raspberrypi-ui-mods
- refactor(core): rearange menus

## Version 0.16.0

Expand Down
30 changes: 15 additions & 15 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ubo-app"
version = "0.16.1"
version = "0.16.0"
description = "Ubo main app, running on device initialization. A platform for running other apps."
authors = ["Sassan Haradji <[email protected]>"]
license = "Apache-2.0"
Expand Down Expand Up @@ -94,20 +94,20 @@ test = "pytest --cov=ubo_app"
sanity = ["typecheck", "lint", "test"]
build-docker-images = "sh -c 'docker buildx build . -f scripts/Dockerfile.dev -t ubo-app-dev && docker buildx build . -f scripts/Dockerfile.test -t ubo-app-test'"

"device:deploy" = "poe deploy-to-device"
"device:deploy:deps" = "poe deploy-to-device --deps"
"device:deploy:kill" = "poe deploy-to-device --kill"
"device:deploy:restart" = "poe deploy-to-device --restart"
"device:deploy:bootstrap" = "poe deploy-to-device --bootstrap --restart"
"device:deploy:complete" = "poe deploy-to-device --deps --bootstrap --restart"
"device:deploy:env" = "poe deploy-to-device --env"

"device:test" = "poe test-on-device --copy --run --results"
"device:test:deps" = "poe test-on-device --deps"
"device:test:copy" = "poe test-on-device --copy"
"device:test:run" = "poe test-on-device --run"
"device:test:results" = "poe test-on-device --results"
"device:test:complete" = "poe test-on-device --deps --copy --run --results"
"device:deploy" = "scripts/deploy.sh"
"device:deploy:deps" = "scripts/deploy.sh --deps"
"device:deploy:kill" = "scripts/deploy.sh --kill"
"device:deploy:restart" = "scripts/deploy.sh --restart"
"device:deploy:bootstrap" = "scripts/deploy.sh --bootstrap --restart"
"device:deploy:complete" = "scripts/deploy.sh --deps --bootstrap --restart"
"device:deploy:env" = "scripts/deploy.sh --env"

"device:test" = "scripts/test_on_device.sh --copy --run --results"
"device:test:deps" = "scripts/test_on_device.sh --deps"
"device:test:copy" = "scripts/test_on_device.sh --copy"
"device:test:run" = "scripts/test_on_device.sh --run"
"device:test:results" = "scripts/test_on_device.sh --results"
"device:test:complete" = "scripts/test_on_device.sh --deps --copy --run --results"

[tool.poe.tasks.test-on-device]
args = [
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/results/test_core/app_runs_and_exits/store-desktop-000.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@
1,
1
],
"icon": "󰇄",
"icon": "󰕈",
"is_short": false,
"key": "Desktop",
"label": "Desktop",
"key": "OS",
"label": "OS",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [],
"placeholder": "No settings in this category",
"title": "󰇄Desktop"
"title": "󰕈OS"
}
},
{
Expand All @@ -141,17 +141,17 @@
1,
1
],
"icon": "󰖤",
"icon": "󰔊",
"is_short": false,
"key": "Accessibility",
"label": "Accessibility",
"key": "Speech",
"label": "Speech",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [],
"placeholder": "No settings in this category",
"title": "󰖤Accessibility"
"title": "󰔊Speech"
}
},
{
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/results/test_core/app_runs_and_exits/store-rpi-000.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@
1,
1
],
"icon": "󰇄",
"icon": "󰕈",
"is_short": false,
"key": "Desktop",
"label": "Desktop",
"key": "OS",
"label": "OS",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [],
"placeholder": "No settings in this category",
"title": "󰇄Desktop"
"title": "󰕈OS"
}
},
{
Expand All @@ -141,17 +141,17 @@
1,
1
],
"icon": "󰖤",
"icon": "󰔊",
"is_short": false,
"key": "Accessibility",
"label": "Accessibility",
"key": "Speech",
"label": "Speech",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [],
"placeholder": "No settings in this category",
"title": "󰖤Accessibility"
"title": "󰔊Speech"
}
},
{
Expand Down
158 changes: 68 additions & 90 deletions tests/integration/results/test_services/all_services_register/store-desktop-000.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,10 @@
1,
1
],
"icon": "󰇄",
"icon": "󰕈",
"is_short": false,
"key": "Desktop",
"label": "Desktop",
"key": "OS",
"label": "OS",
"opacity": null,
"progress": null,
"sub_menu": {
Expand Down Expand Up @@ -560,13 +560,13 @@
"icon": "[color=#008000]󰪥[/color]",
"is_short": false,
"key": "lightdm",
"label": "LightDM",
"label": "Desktop",
"opacity": null,
"progress": null
}
],
"placeholder": "No settings in this category",
"title": "󰇄Desktop"
"title": "󰕈OS"
}
},
{
Expand All @@ -578,10 +578,10 @@
1,
1
],
"icon": "󰖤",
"icon": "󰔊",
"is_short": false,
"key": "Accessibility",
"label": "Accessibility",
"key": "Speech",
"label": "Speech",
"opacity": null,
"progress": null,
"sub_menu": {
Expand All @@ -596,122 +596,99 @@
1,
1
],
"icon": "󰔊",
"icon": "󰱑",
"is_short": false,
"key": "voice",
"label": "Voice",
"label": "Voice Engine",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [
{
"_type": "SubMenuItem",
"background_color": "#68B7FF",
"_type": "ActionItem",
"action": "<function:_engine_selector>",
"background_color": "#03F7AE",
"color": [
1,
1,
1,
1
],
"icon": "󰱑",
"icon": "󰱒",
"is_short": false,
"key": null,
"label": "Voice Engine",
"label": "Piper",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadlessMenu",
"items": [
{
"_type": "ActionItem",
"action": "<function:_engine_selector>",
"background_color": "#03F7AE",
"color": [
1,
1,
1,
1
],
"icon": "󰱒",
"is_short": false,
"key": null,
"label": "Piper",
"opacity": null,
"progress": null
},
{
"_type": "ActionItem",
"action": "<function:_engine_selector>",
"background_color": "#68B7FF",
"color": [
1,
1,
1,
1
],
"icon": "󰄱",
"is_short": false,
"key": null,
"label": "Picovoice",
"opacity": null,
"progress": null
}
],
"placeholder": null,
"title": "󰱑Voice Engine"
}
"progress": null
},
{
"_type": "SubMenuItem",
"_type": "ActionItem",
"action": "<function:_engine_selector>",
"background_color": "#68B7FF",
"color": [
1,
1,
1,
1
],
"icon": "󰔊",
"icon": "󰄱",
"is_short": false,
"key": null,
"label": "Picovoice Settings",
"label": "Picovoice",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadedMenu",
"heading": "󰔊 Picovoice",
"items": [
{
"_type": "ActionItem",
"action": "<function:input_access_key>",
"background_color": "#68B7FF",
"color": [
1,
1,
1,
1
],
"icon": "󰐲",
"is_short": false,
"key": null,
"label": "Set Access Key",
"opacity": null,
"progress": null
}
],
"placeholder": null,
"sub_heading": "Set the access key\nCurrent value: Fake",
"title": "Picovoice Settings"
}
"progress": null
}
],
"placeholder": null,
"title": "󰱑Voice Engine"
}
},
{
"_type": "SubMenuItem",
"background_color": "#68B7FF",
"color": [
1,
1,
1,
1
],
"icon": "󰔊",
"is_short": false,
"key": "voice",
"label": "Picovoice Settings",
"opacity": null,
"progress": null,
"sub_menu": {
"_type": "HeadedMenu",
"heading": "󰔊 Picovoice",
"items": [
{
"_type": "ActionItem",
"action": "<function:input_access_key>",
"background_color": "#68B7FF",
"color": [
1,
1,
1,
1
],
"icon": "󰐲",
"is_short": false,
"key": null,
"label": "Set Access Key",
"opacity": null,
"progress": null
}
],
"placeholder": null,
"title": "󰔊Voice"
"sub_heading": "Set the access key\nCurrent value: Fake",
"title": "Picovoice Settings"
}
}
],
"placeholder": "No settings in this category",
"title": "󰖤Accessibility"
"title": "󰔊Speech"
}
},
{
Expand Down Expand Up @@ -916,14 +893,15 @@
},
"path": [],
"settings_items_priorities": {
"Desktop": 0,
"Docker": null,
"IP Addresses": 0,
"LightDM": 0,
"Picovoice Settings": 0,
"RPi Connect": null,
"SSH": 1,
"Users": 1,
"VSCode": null,
"Voice": 0,
"Voice Engine": 1,
"WiFi": 2
}
},
Expand Down
Loading

0 comments on commit c3fee39

Please sign in to comment.