Skip to content

Commit 4ad4e1e

Browse files
ThomasFarstrikeThomasFarstrike
committed
Refactor to simplify imports
1 parent a4687a9 commit 4ad4e1e

File tree

59 files changed

+231
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+231
-194
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
import random
33
import lvgl as lv
44

5-
from mpos.apps import Activity, Intent
6-
import mpos.config
5+
from mpos import Activity, Intent, config
76
import mpos.ui
87

98
class Confetti(Activity):

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import time
22
import random
33

4-
from mpos.apps import Activity
5-
import mpos.ui
4+
from mpos import Activity, ui
65

76
try:
87
import lvgl as lv

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import lvgl as lv
22
import os
3-
from mpos.apps import Activity
4-
from mpos import TaskManager, sdcard
3+
from mpos import Activity, TaskManager, sdcard
54

65
class Main(Activity):
76

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from mpos.apps import Activity
2-
import mpos.ui
1+
import lvgl as lv
2+
from mpos import Activity, ui
33

44
indev_error_x = 160
55
indev_error_y = 120
@@ -35,11 +35,11 @@ def onCreate(self):
3535
def touch_cb(self, event):
3636
event_code=event.get_code()
3737
if event_code not in [19,23,25,26,27,28,29,30,49]:
38-
name = mpos.ui.get_event_name(event_code)
38+
name = ui.get_event_name(event_code)
3939
#print(f"lv_event_t: code={event_code}, name={name}") # target={event.get_target()}, user_data={event.get_user_data()}, param={event.get_param()}
4040
if event_code == lv.EVENT.PRESSING: # this is probably enough
4141
#if event_code in [lv.EVENT.PRESSED, lv.EVENT.PRESSING, lv.EVENT.LONG_PRESSED, lv.EVENT.LONG_PRESSED_REPEAT]:
42-
x, y = mpos.ui.get_pointer_xy()
42+
x, y = ui.get_pointer_xy()
4343
#canvas.set_px(x,y,lv.color_black(),lv.OPA.COVER) # draw a tiny point
4444
self.draw_rect(x,y)
4545
#self.draw_line(x,y)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mpos.apps import ActivityDoesntExist # should fail here
1+
from mpos import ActivityDoesntExist # should fail here
22

33
class Error(Activity):
44

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from mpos.apps import Activity
2-
import mpos.ui
1+
import lvgl as lv
2+
from mpos import Activity, ui
33

44
class FileManager(Activity):
55

@@ -40,7 +40,7 @@ def file_explorer_event_cb(self, event):
4040
# GET_SELF_SIZE
4141
# 47 STYLE CHANGED
4242
if event_code not in [2,19,23,24,25,26,27,28,29,30,31,32,33,47,49,52]:
43-
name = mpos.ui.get_event_name(event_code)
43+
name = ui.get_event_name(event_code)
4444
print(f"file_explorer_event_cb {event_code} with name {name}")
4545
if event_code == lv.EVENT.VALUE_CHANGED:
4646
path = self.file_explorer.explorer_get_current_path()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mpos.apps import Activity
1+
from mpos import Activity
22

33
class Hello(Activity):
44

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import gc
22
import os
33

4-
from mpos.apps import Activity
5-
import mpos.ui
4+
from mpos import Activity, ui
65
import mpos.ui.anim
76

87
class ImageView(Activity):

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from mpos.apps import Activity
2-
import mpos.sensor_manager as SensorManager
1+
from mpos import Activity, sensor_manager as SensorManager
32

43
class IMU(Activity):
54

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
import os
33
import time
44

5-
from mpos.apps import Activity, Intent
6-
import mpos.sdcard
5+
from mpos import Activity, Intent, sdcard
76
import mpos.ui
87
import mpos.audio.audioflinger as AudioFlinger
98

0 commit comments

Comments
 (0)