Refactor to simplify imports

internal_filesystem/apps/com.micropythonos.confetti/assets/confetti.py

@@ -2,8 +2,7 @@ import time
 import random
 import lvgl as lv
 
-from mpos.apps import Activity, Intent
-import mpos.config
+from mpos import Activity, Intent, config
 import mpos.ui
 
 class Confetti(Activity):

internal_filesystem/apps/com.micropythonos.connect4/assets/connect4.py

@@ -1,8 +1,7 @@
 import time
 import random
 
-from mpos.apps import Activity
-import mpos.ui
+from mpos import Activity, ui
 
 try:
     import lvgl as lv

internal_filesystem/apps/com.micropythonos.doom_launcher/assets/main.py

@@ -1,7 +1,6 @@
 import lvgl as lv
 import os
-from mpos.apps import Activity
-from mpos import TaskManager, sdcard
+from mpos import Activity, TaskManager, sdcard
 
 class Main(Activity):
 

internal_filesystem/apps/com.micropythonos.draw/assets/draw.py

@@ -1,5 +1,5 @@
-from mpos.apps import Activity
-import mpos.ui
+import lvgl as lv
+from mpos import Activity, ui
 
 indev_error_x = 160
 indev_error_y = 120
@@ -35,11 +35,11 @@ class Draw(Activity):
     def touch_cb(self, event):
         event_code=event.get_code()
         if event_code not in [19,23,25,26,27,28,29,30,49]:
-            name = mpos.ui.get_event_name(event_code)
+            name = ui.get_event_name(event_code)
             #print(f"lv_event_t: code={event_code}, name={name}") # target={event.get_target()}, user_data={event.get_user_data()}, param={event.get_param()}
             if event_code == lv.EVENT.PRESSING: # this is probably enough
             #if event_code in [lv.EVENT.PRESSED, lv.EVENT.PRESSING, lv.EVENT.LONG_PRESSED, lv.EVENT.LONG_PRESSED_REPEAT]:
-                x, y = mpos.ui.get_pointer_xy()
+                x, y = ui.get_pointer_xy()
                 #canvas.set_px(x,y,lv.color_black(),lv.OPA.COVER) # draw a tiny point
                 self.draw_rect(x,y)
                 #self.draw_line(x,y)

internal_filesystem/apps/com.micropythonos.errortest/assets/error.py

@@ -1,4 +1,4 @@
-from mpos.apps import ActivityDoesntExist # should fail here
+from mpos import ActivityDoesntExist # should fail here
 
 class Error(Activity):
 

internal_filesystem/apps/com.micropythonos.filemanager/assets/file_manager.py

@@ -1,5 +1,5 @@
-from mpos.apps import Activity
-import mpos.ui
+import lvgl as lv
+from mpos import Activity, ui
 
 class FileManager(Activity):
 
@@ -40,7 +40,7 @@ class FileManager(Activity):
         # GET_SELF_SIZE
         # 47 STYLE CHANGED
         if event_code not in [2,19,23,24,25,26,27,28,29,30,31,32,33,47,49,52]:
-            name = mpos.ui.get_event_name(event_code)
+            name = ui.get_event_name(event_code)
             print(f"file_explorer_event_cb {event_code} with name {name}")
             if event_code == lv.EVENT.VALUE_CHANGED:
                 path = self.file_explorer.explorer_get_current_path()

internal_filesystem/apps/com.micropythonos.helloworld/assets/hello.py

@@ -1,4 +1,4 @@
-from mpos.apps import Activity
+from mpos import Activity
 
 class Hello(Activity):
 

internal_filesystem/apps/com.micropythonos.imageview/assets/imageview.py

@@ -1,8 +1,7 @@
 import gc
 import os
 
-from mpos.apps import Activity
-import mpos.ui
+from mpos import Activity, ui
 import mpos.ui.anim
 
 class ImageView(Activity):

internal_filesystem/apps/com.micropythonos.imu/assets/imu.py

@@ -1,5 +1,4 @@
-from mpos.apps import Activity
-import mpos.sensor_manager as SensorManager
+from mpos import Activity, sensor_manager as SensorManager
 
 class IMU(Activity):
 

internal_filesystem/apps/com.micropythonos.musicplayer/assets/music_player.py

@@ -2,8 +2,7 @@ import machine
 import os
 import time
 
-from mpos.apps import Activity, Intent
-import mpos.sdcard
+from mpos import Activity, Intent, sdcard
 import mpos.ui
 import mpos.audio.audioflinger as AudioFlinger
 

internal_filesystem/apps/com.micropythonos.showbattery/assets/hello.py

@@ -49,8 +49,7 @@ battery power:
 import lvgl as lv
 import time
 
-import mpos.battery_voltage
-from mpos.apps import Activity
+from mpos import battery_voltage, Activity
 
 class Hello(Activity):
 

internal_filesystem/apps/com.micropythonos.showfonts/assets/showfonts.py

@@ -1,4 +1,4 @@
-from mpos.apps import Activity
+from mpos import Activity
 import lvgl as lv
 
 class ShowFonts(Activity):

internal_filesystem/apps/com.micropythonos.soundrecorder/assets/sound_recorder.py

@@ -2,8 +2,7 @@
 import os
 import time
 
-from mpos.apps import Activity
-import mpos.ui
+from mpos import Activity, ui
 import mpos.audio.audioflinger as AudioFlinger