From 40610be51afaaa6a0879e4353905a9645c571df9 Mon Sep 17 00:00:00 2001
From: Thomas Farstrike <thomasverstreken@protonmail.com>
Date: Sat, 1 Nov 2025 08:12:20 +0100
Subject: [PATCH] Rename package_manager and activity_navigator

---
 .../apps/com.micropythonos.appstore/assets/appstore.py |  2 +-
 .../apps/com.micropythonos.launcher/assets/launcher.py |  2 +-
 .../apps/com.micropythonos.settings/assets/settings.py |  4 ++--
 internal_filesystem/lib/mpos/__init__.py               |  2 +-
 .../lib/mpos/{navigator.py => activity_navigator.py}   |  0
 internal_filesystem/lib/mpos/app/activity.py           | 10 ++++------
 internal_filesystem/lib/mpos/app/app.py                |  2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)
 rename internal_filesystem/lib/mpos/{navigator.py => activity_navigator.py} (100%)

diff --git a/internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py b/internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py
index 49e19a11..35ec8fe5 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py
@@ -9,7 +9,7 @@ import _thread
 from mpos.apps import Activity, Intent
 from mpos.app import App
 import mpos.ui
-from mpos.content.pm import PackageManager
+from mpos.content.package_manager import PackageManager
 
 
 class AppStore(Activity):
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py b/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py
index 569b5af5..912b19af 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py
@@ -11,7 +11,7 @@
 import lvgl as lv
 import mpos.apps
 import mpos.ui
-from mpos.content.pm import PackageManager
+from mpos.content.package_manager import PackageManager
 from mpos import Activity
 import time
 import uhashlib
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 433fffe4..ed53bea2 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py
@@ -1,5 +1,5 @@
 from mpos.apps import Activity, Intent
-from mpos.navigator import ActivityNavigator
+from mpos.activity_navigator import ActivityNavigator
 
 import mpos.config
 import mpos.ui
@@ -295,7 +295,7 @@ class SettingActivity(Activity):
             if self.active_radio_index == 1:
                 from mpos.bootloader import ResetIntoBootloader
                 intent = Intent(activity_class=ResetIntoBootloader)
-                ActivityNavigator.startActivity(intent)
+                self.startActivity(intent)
                 return
 
         ui = setting.get("ui")
diff --git a/internal_filesystem/lib/mpos/__init__.py b/internal_filesystem/lib/mpos/__init__.py
index e8f9b23c..eda6eba5 100644
--- a/internal_filesystem/lib/mpos/__init__.py
+++ b/internal_filesystem/lib/mpos/__init__.py
@@ -2,7 +2,7 @@
 from .app.app import App
 from .app.activity import Activity
 from .content.intent import Intent
-from .navigator import ActivityNavigator
+from .activity_navigator import ActivityNavigator
 from .content.package_manager import PackageManager
 
 # Common activities (optional)
diff --git a/internal_filesystem/lib/mpos/navigator.py b/internal_filesystem/lib/mpos/activity_navigator.py
similarity index 100%
rename from internal_filesystem/lib/mpos/navigator.py
rename to internal_filesystem/lib/mpos/activity_navigator.py
diff --git a/internal_filesystem/lib/mpos/app/activity.py b/internal_filesystem/lib/mpos/app/activity.py
index 6d0942fb..4518803f 100644
--- a/internal_filesystem/lib/mpos/app/activity.py
+++ b/internal_filesystem/lib/mpos/app/activity.py
@@ -1,5 +1,3 @@
-#from mpos.navigator import ActivityNavigator
-
 import mpos.ui
 
 class Activity:
@@ -13,9 +11,9 @@ class Activity:
         pass
     def onStart(self, screen):
         pass
-    def onResume(self, screen):
+    def onResume(self, screen): # app gets foreground
         pass
-    def onPause(self, screen):
+    def onPause(self, screen): # app goes to background
         pass
     def onStop(self, screen):
         pass
@@ -26,11 +24,11 @@ class Activity:
         mpos.ui.setContentView(self, screen)
 
     def startActivity(self, intent):
-        from mpos.navigator import ActivityNavigator
+        from mpos.activity_navigator import ActivityNavigator
         ActivityNavigator.startActivity(intent)
 
     def startActivityForResult(self, intent, result_callback):
-        from mpos.navigator import ActivityNavigator
+        from mpos.activity_navigator import ActivityNavigator
         ActivityNavigator.startActivityForResult(intent, result_callback)
 
     def initError(self, e):
diff --git a/internal_filesystem/lib/mpos/app/app.py b/internal_filesystem/lib/mpos/app/app.py
index c83962c4..b8c3dd42 100644
--- a/internal_filesystem/lib/mpos/app/app.py
+++ b/internal_filesystem/lib/mpos/app/app.py
@@ -1,5 +1,5 @@
 import ujson
-from ..navigator import ActivityNavigator
+from ..activity_navigator import ActivityNavigator
 
 class App:
     def __init__(