Simplify imports

ThomasFarstrike · ThomasFarstrike · commit 89537246abd6 · 2026-01-13T10:35:04.000+01:00
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py b/internal_filesystem/builtin/apps/com.micropythonos.launcher/assets/launcher.py
@@ -10,7 +10,7 @@
 # Most of this time is actually spent reading and parsing manifests.
 import lvgl as lv
 import mpos.apps
-from mpos import ui, PackageManager, Activity, pct_of_display_width
+from mpos import NOTIFICATION_BAR_HEIGHT, PackageManager, Activity, pct_of_display_width
 import time
 import uhashlib
 import ubinascii
@@ -28,9 +28,9 @@ def onCreate(self):
         main_screen = lv.obj()
         main_screen.set_style_border_width(0, lv.PART.MAIN)
         main_screen.set_style_radius(0, 0)
-        main_screen.set_pos(0, mpos.ui.topmenu.NOTIFICATION_BAR_HEIGHT)
+        main_screen.set_pos(0, NOTIFICATION_BAR_HEIGHT)
         main_screen.set_style_pad_hor(pct_of_display_width(2), 0)
-        main_screen.set_style_pad_ver(mpos.ui.topmenu.NOTIFICATION_BAR_HEIGHT, 0)
+        main_screen.set_style_pad_ver(NOTIFICATION_BAR_HEIGHT, 0)
         main_screen.set_flex_flow(lv.FLEX_FLOW.ROW_WRAP)
         self.setContentView(main_screen)
 
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py b/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py
@@ -52,7 +52,6 @@ def onCreate(self):
         self.force_update = lv.checkbox(self.main_screen)
         self.force_update.set_text("Force Update")
         self.force_update.add_event_cb(lambda *args: self.force_update_clicked(), lv.EVENT.VALUE_CHANGED, None)
-        #self.force_update.add_event_cb(lambda e: mpos.ui.print_event(e), lv.EVENT.ALL, None)
         self.force_update.align_to(self.current_version_label, lv.ALIGN.OUT_BOTTOM_LEFT, 0, pct_of_display_height(5))
         self.install_button = lv.button(self.main_screen)
         self.install_button.align(lv.ALIGN.TOP_RIGHT, 0, 0)
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py
@@ -95,5 +95,5 @@ def format_internal_data_partition(self, new_value):
         PackageManager.refresh_apps()
 
     def theme_changed(self, new_value):
-        import mpos.ui
-        mpos.ui.set_theme(self.prefs)
+        from mpos import set_theme
+        set_theme(self.prefs)
