From 7e3c01e960e5bff2e33962590a3dbcc06102f1e9 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Thu, 30 Oct 2025 18:12:56 +0100 Subject: [PATCH] Fix restart_launcher() --- internal_filesystem/lib/mpos/__init__.py | 9 +++++++-- internal_filesystem/lib/mpos/app/__init__.py | 5 ----- internal_filesystem/lib/mpos/apps.py | 5 ----- internal_filesystem/lib/mpos/ui/__init__.py | 6 +++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/internal_filesystem/lib/mpos/__init__.py b/internal_filesystem/lib/mpos/__init__.py index 6a6700e3..cf496bde 100644 --- a/internal_filesystem/lib/mpos/__init__.py +++ b/internal_filesystem/lib/mpos/__init__.py @@ -1,12 +1,17 @@ -# Re-export common classes for convenience +# Core framework from .app.app import App from .app.activity import Activity from .content.intent import Intent from .navigator import ActivityNavigator from .content.pm import PackageManager -# Optional: re-export activities +# Common activities (optional) from .app.activities.chooser import ChooserActivity from .app.activities.view import ViewActivity from .app.activities.share import ShareActivity +__all__ = [ + "App", "Activity", "Intent", + "ActivityNavigator", "PackageManager", + "ChooserActivity", "ViewActivity", "ShareActivity" +] diff --git a/internal_filesystem/lib/mpos/app/__init__.py b/internal_filesystem/lib/mpos/app/__init__.py index 037aa24a..843db5e0 100644 --- a/internal_filesystem/lib/mpos/app/__init__.py +++ b/internal_filesystem/lib/mpos/app/__init__.py @@ -3,8 +3,3 @@ from .activity import Activity from .activities.chooser import ChooserActivity from .activities.view import ViewActivity from .activities.share import ShareActivity - -__all__ = [ - "App", "Activity", - "ChooserActivity", "ViewActivity", "ShareActivity" -] diff --git a/internal_filesystem/lib/mpos/apps.py b/internal_filesystem/lib/mpos/apps.py index 096a82c7..cdee2b39 100644 --- a/internal_filesystem/lib/mpos/apps.py +++ b/internal_filesystem/lib/mpos/apps.py @@ -1,10 +1,5 @@ import lvgl as lv -import uio -import ujson -import uos -import utime # for timing calls - import _thread import traceback diff --git a/internal_filesystem/lib/mpos/ui/__init__.py b/internal_filesystem/lib/mpos/ui/__init__.py index 1fd80833..3e25ba77 100644 --- a/internal_filesystem/lib/mpos/ui/__init__.py +++ b/internal_filesystem/lib/mpos/ui/__init__.py @@ -1,5 +1,4 @@ import lvgl as lv -#import mpos.apps import mpos.time import mpos.wifi from mpos.ui.anim import WidgetAnimator @@ -44,8 +43,9 @@ def set_foreground_app(appname): foreground_app_name = appname print(f"foreground app is: {foreground_app_name}") -#def show_launcher(): -# mpos.apps.restart_launcher() +def show_launcher(): + import mpos.apps + mpos.apps.restart_launcher() def init_rootscreen(): global horizontal_resolution, vertical_resolution