From 29d3e8a2b98e68d39200d2698cb7aba2e9e5d54d Mon Sep 17 00:00:00 2001
From: Thomas Farstrike <thomasverstreken@protonmail.com>
Date: Sat, 10 Jan 2026 08:45:45 +0100
Subject: [PATCH] Promote setting_activity from app to framework

---
 .../apps/com.micropythonos.settings/assets/settings.py       | 3 +--
 internal_filesystem/lib/mpos/__init__.py                     | 5 ++++-
 internal_filesystem/lib/mpos/ui/__init__.py                  | 4 +++-
 .../assets => lib/mpos/ui}/setting_activity.py               | 0
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename internal_filesystem/{builtin/apps/com.micropythonos.settings/assets => lib/mpos/ui}/setting_activity.py (100%)

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 7e637f50..0608d0a7 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py
@@ -3,12 +3,11 @@ from mpos.apps import Activity, Intent
 from mpos.activity_navigator import ActivityNavigator
 
 from mpos.ui.keyboard import MposKeyboard
-from mpos import PackageManager
+from mpos import PackageManager, SettingActivity
 import mpos.config
 import mpos.ui
 import mpos.time
 
-from setting_activity import SettingActivity
 from calibrate_imu import CalibrateIMUActivity
 from check_imu_calibration import CheckIMUCalibrationActivity
 
diff --git a/internal_filesystem/lib/mpos/__init__.py b/internal_filesystem/lib/mpos/__init__.py
index 0746708d..711393e4 100644
--- a/internal_filesystem/lib/mpos/__init__.py
+++ b/internal_filesystem/lib/mpos/__init__.py
@@ -13,8 +13,11 @@ from .app.activities.chooser import ChooserActivity
 from .app.activities.view import ViewActivity
 from .app.activities.share import ShareActivity
 
+from .ui.setting_activity import SettingActivity
+
 __all__ = [
     "App", "Activity", "ConnectivityManager", "DownloadManager", "Intent",
     "ActivityNavigator", "PackageManager", "TaskManager",
-    "ChooserActivity", "ViewActivity", "ShareActivity"
+    "ChooserActivity", "ViewActivity", "ShareActivity",
+    "SettingActivity"
 ]
diff --git a/internal_filesystem/lib/mpos/ui/__init__.py b/internal_filesystem/lib/mpos/ui/__init__.py
index 0a7ce711..e7bfa508 100644
--- a/internal_filesystem/lib/mpos/ui/__init__.py
+++ b/internal_filesystem/lib/mpos/ui/__init__.py
@@ -14,6 +14,7 @@ from .display import (
 )
 from .event import get_event_name, print_event
 from .util import shutdown, set_foreground_app, get_foreground_app
+from .setting_activity import SettingActivity
 
 __all__ = [
     "setContentView", "back_screen", "remove_and_stop_current_activity", "remove_and_stop_all_activities"
@@ -26,5 +27,6 @@ __all__ = [
     "min_resolution", "max_resolution",
     "get_pointer_xy",
     "get_event_name", "print_event",
-    "shutdown", "set_foreground_app", "get_foreground_app"
+    "shutdown", "set_foreground_app", "get_foreground_app",
+    "SettingActivity"
 ]
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/setting_activity.py b/internal_filesystem/lib/mpos/ui/setting_activity.py
similarity index 100%
rename from internal_filesystem/builtin/apps/com.micropythonos.settings/assets/setting_activity.py
rename to internal_filesystem/lib/mpos/ui/setting_activity.py