From caab563461a2a1131a3b6d0472e2746121cb6787 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Thu, 30 Oct 2025 13:09:27 +0100 Subject: [PATCH] Simplify and fix settings app --- .../apps/com.micropythonos.settings/assets/settings.py | 3 ++- internal_filesystem/lib/mpos/apps.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py index 0d83c988..433fffe4 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py @@ -1,4 +1,5 @@ -from mpos.apps import Activity, ActivityNavigator, Intent +from mpos.apps import Activity, Intent +from mpos.navigator import ActivityNavigator import mpos.config import mpos.ui diff --git a/internal_filesystem/lib/mpos/apps.py b/internal_filesystem/lib/mpos/apps.py index f9e4a984..096a82c7 100644 --- a/internal_filesystem/lib/mpos/apps.py +++ b/internal_filesystem/lib/mpos/apps.py @@ -21,7 +21,7 @@ def good_stack_size(): return stacksize # Run the script in the current thread: -def execute_script(script_source, is_file, cwd=None, classname=None, app=None): +def execute_script(script_source, is_file, cwd=None, classname=None): import utime # for timing read and compile thread_id = _thread.get_ident() compile_name = 'script' if not is_file else script_source @@ -123,7 +123,7 @@ def start_app(fullname): print(f"WARNING: start_app can't start {fullname} because it doesn't have a main_launcher_activity") return start_script_fullpath = f"{app.installed_path}/{app.main_launcher_activity.get('entrypoint')}" - execute_script(start_script_fullpath, True, app.installed_path + "/assets/", app.main_launcher_activity.get("classname"), app) + execute_script(start_script_fullpath, True, app.installed_path + "/assets/", app.main_launcher_activity.get("classname")) # Launchers have the bar, other apps don't have it if app.is_valid_launcher(): mpos.ui.topmenu.open_bar() @@ -143,4 +143,3 @@ def restart_launcher(): start_app(app.fullname) break -