Rename package_manager and activity_navigator

ThomasFarstrike · ThomasFarstrike · commit 40610be51afa · 2025-11-01T08:12:20.000+01:00
diff --git 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 @@
 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
@@ -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
@@ -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 @@ def save_setting(self, setting):
             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
@@ -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/activity_navigator.py b/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
@@ -1,5 +1,3 @@
-#from mpos.navigator import ActivityNavigator
-
 import mpos.ui
 
 class Activity:
@@ -13,9 +11,9 @@ def onCreate(self):
         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 @@ def setContentView(self, screen):
         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
@@ -1,5 +1,5 @@
 import ujson
-from ..navigator import ActivityNavigator
+from ..activity_navigator import ActivityNavigator
 
 class App:
     def __init__(
