m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adapt launcher and Piggy to the Activity lifecycle

Browse Source
This commit is contained in:
Thomas Farstrike
2025-06-03 02:27:02 +02:00
parent 38b7a3b481
commit bbd5e57dab
4 changed files with 413 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
+260 -295
View File
File diff suppressed because it is too large Load Diff
internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py
+90 -87
View File
@@ -11,95 +11,98 @@
import uos
import lvgl as lv
import mpos.apps
import mpos.ui
# Create a container for the grid
main_screen = lv.obj()
cont = lv.obj(main_screen)
cont.set_style_border_width(0, 0)
cont.set_style_radius(0, 0)
cont.set_pos(0, mpos.ui.NOTIFICATION_BAR_HEIGHT) # leave some margin for the notification bar
cont.set_size(lv.pct(100), lv.pct(100))
cont.set_style_pad_all(10, 0)
cont.set_flex_flow(lv.FLEX_FLOW.ROW_WRAP)
mpos.ui.load_screen(main_screen)
class MainActivity(mpos.apps.Activity):
# Grid parameters
icon_size = 64 # Adjust based on your display
label_height = 24
iconcont_width = icon_size + label_height
iconcont_height = icon_size + label_height
import time
start = time.ticks_ms()
def load_icon(icon_path):
with open(icon_path, 'rb') as f:
image_data = f.read()
image_dsc = lv.image_dsc_t({
'data_size': len(image_data),
'data': image_data
})
return image_dsc
# Check and collect subdirectories from existing directories
apps_dir = "apps"
apps_dir_builtin = "builtin/apps"
seen_base_names = set()
app_list = []
# Check and collect unique subdirectories
for dir_path in [apps_dir, apps_dir_builtin]:
try:
if uos.stat(dir_path)[0] & 0x4000: # Verify directory exists
for d in uos.listdir(dir_path):
full_path = f"{dir_path}/{d}"
#print(f"full_path: {full_path}")
if uos.stat(full_path)[0] & 0x4000: # Check if it's a directory
base_name = d
if base_name not in seen_base_names: # Avoid duplicates
seen_base_names.add(base_name)
app = mpos.apps.parse_manifest(f"{full_path}/META-INF/MANIFEST.JSON")
if app.category != "launcher": # Skip launchers
app_list.append((app.name, full_path))
except OSError:
pass
# Sort apps alphabetically by app.name
app_list.sort(key=lambda x: x[0].lower()) # Case-insensitive sorting
# Create UI for each app
for app_name, app_dir_fullpath in app_list:
#print(f"Adding app {app_name} from {app_dir_fullpath}")
# Create container for each app (icon + label)
app_cont = lv.obj(cont)
app_cont.set_size(iconcont_width, iconcont_height)
app_cont.set_style_border_width(0, 0)
app_cont.set_style_pad_all(0, 0)
# Load and display icon
icon_path = f"{app_dir_fullpath}/res/mipmap-mdpi/icon_64x64.png"
image = lv.image(app_cont)
try:
image.set_src(load_icon(icon_path))
except Exception as e:
print(f"Error loading icon {icon_path}: {e} - loading default icon")
icon_path = "builtin/res/mipmap-mdpi/default_icon_64x64.png"
try:
image.set_src(load_icon(icon_path))
except Exception as e:
print(f"Error loading default icon {icon_path}: {e} - using symbol")
image.set_src(lv.SYMBOL.STOP)
image.align(lv.ALIGN.TOP_MID, 0, 0)
image.set_size(icon_size, icon_size)
label = lv.label(app_cont)
label.set_text(app_name) # Use app_name directly
label.set_long_mode(lv.label.LONG.WRAP)
label.set_width(iconcont_width)
label.align(lv.ALIGN.BOTTOM_MID, 0, 0)
label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
app_cont.add_event_cb(lambda e, path=app_dir_fullpath: mpos.apps.start_app(path), lv.EVENT.CLICKED, None)
end = time.ticks_ms()
print(f"Displaying all icons took: {end-start}ms")
def onCreate(self):
main_screen = lv.obj()
main_screen.set_style_border_width(0, 0)
main_screen.set_style_radius(0, 0)
main_screen.set_pos(0, mpos.ui.NOTIFICATION_BAR_HEIGHT) # leave some margin for the notification bar
main_screen.set_size(lv.pct(100), lv.pct(100))
main_screen.set_style_pad_all(10, 0)
main_screen.set_flex_flow(lv.FLEX_FLOW.ROW_WRAP)
mpos.ui.setContentView(self, main_screen)
def onResume(self, main_screen):
# Grid parameters
icon_size = 64 # Adjust based on your display
label_height = 24
iconcont_width = icon_size + label_height
iconcont_height = icon_size + label_height
import time
start = time.ticks_ms()
def load_icon(icon_path):
with open(icon_path, 'rb') as f:
image_data = f.read()
image_dsc = lv.image_dsc_t({
'data_size': len(image_data),
'data': image_data
})
return image_dsc
# Check and collect subdirectories from existing directories
apps_dir = "apps"
apps_dir_builtin = "builtin/apps"
seen_base_names = set()
app_list = []
# Check and collect unique subdirectories
for dir_path in [apps_dir, apps_dir_builtin]:
try:
if uos.stat(dir_path)[0] & 0x4000: # Verify directory exists
for d in uos.listdir(dir_path):
full_path = f"{dir_path}/{d}"
#print(f"full_path: {full_path}")
if uos.stat(full_path)[0] & 0x4000: # Check if it's a directory
base_name = d
if base_name not in seen_base_names: # Avoid duplicates
seen_base_names.add(base_name)
app = mpos.apps.parse_manifest(f"{full_path}/META-INF/MANIFEST.JSON")
if app.category != "launcher": # Skip launchers
app_list.append((app.name, full_path))
except OSError:
pass
# Sort apps alphabetically by app.name
app_list.sort(key=lambda x: x[0].lower()) # Case-insensitive sorting
# Create UI for each app
for app_name, app_dir_fullpath in app_list:
#print(f"Adding app {app_name} from {app_dir_fullpath}")
# Create container for each app (icon + label)
app_cont = lv.obj(main_screen)
app_cont.set_size(iconcont_width, iconcont_height)
app_cont.set_style_border_width(0, 0)
app_cont.set_style_pad_all(0, 0)
app_cont.set_style_bg_opa(lv.OPA.TRANSP,0) # prevent default style from adding slight gray to this container
# Load and display icon
icon_path = f"{app_dir_fullpath}/res/mipmap-mdpi/icon_64x64.png"
image = lv.image(app_cont)
try:
image.set_src(load_icon(icon_path))
except Exception as e:
print(f"Error loading icon {icon_path}: {e} - loading default icon")
icon_path = "builtin/res/mipmap-mdpi/default_icon_64x64.png"
try:
image.set_src(load_icon(icon_path))
except Exception as e:
print(f"Error loading default icon {icon_path}: {e} - using symbol")
image.set_src(lv.SYMBOL.STOP)
image.align(lv.ALIGN.TOP_MID, 0, 0)
image.set_size(icon_size, icon_size)
label = lv.label(app_cont)
label.set_text(app_name) # Use app_name directly
label.set_long_mode(lv.label.LONG.WRAP)
label.set_width(iconcont_width)
label.align(lv.ALIGN.BOTTOM_MID, 0, 0)
label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
app_cont.add_event_cb(lambda e, path=app_dir_fullpath: mpos.apps.start_app(path), lv.EVENT.CLICKED, None)
end = time.ticks_ms()
print(f"Displaying all icons took: {end-start}ms")
internal_filesystem/lib/mpos/apps.py
+19
View File
@@ -47,6 +47,10 @@ def execute_script(script_source, is_file, cwd=None):
print("Classes:", classes.keys())
print("Functions:", functions.keys())
print("Variables:", variables.keys())
MainActivity = script_globals.get("MainActivity")
if MainActivity:
loaded_activity = MainActivity()
loaded_activity.onCreate() # Call lifecycle method
except Exception as e:
print(f"Thread {thread_id}: exception during execution:")
# Print stack trace with exception type, value, and traceback
@@ -186,3 +190,18 @@ def auto_connect():
except Exception as e:
print("Couldn't execute {builtin_auto_connect} because exception {e}, continuing...")
class Activity:
def onCreate(self):
pass
def onStart(self, screen):
pass
def onResume(self, screen):
pass
def onPause(self, screen):
pass
def onStop(self, screen):
pass
def onDestroy(self, screen):
pass
internal_filesystem/lib/mpos/ui.py
+44 -30
View File
@@ -456,50 +456,64 @@ def close_top_layer_msgboxes():
else:
print(f"Top layer still has {child_count} children")
def clean_top_layer():
print("Cleaning top layer")
timer1.delete()
timer2.delete()
timer3.delete()
timer4.delete()
lv.layer_top().clean()
screen_stack = []
screen_stack = [] # Stack of (activity, screen) tuples
def empty_screen_stack():
global screen_stack
screen_stack.clear()
def load_screen(screen):
setContentView(None, screen) # for compatibility with old apps
# new_activity might be None for compatibility, can be removed if compatibility is no longer needed
def setContentView(new_activity, new_screen):
global screen_stack
topscreen = None
# Get current activity and screen
current_activity, current_screen = None, None
if len(screen_stack) > 0:
topscreen = screen_stack[-1]
if not topscreen or screen != topscreen:
print("Appending screen to screen_stack")
screen_stack.append(screen)
else:
print("Warning: not adding new screen to screen_stack because it's already there, just bringing to foreground.")
current_activity, current_screen = screen_stack[-1]
if current_activity and current_screen:
# Notify current activity it's being backgrounded:
current_activity.onPause(current_screen)
current_activity.onStop(current_screen)
# Start the new one:
print("Appending screen to screen_stack")
screen_stack.append((new_activity, new_screen))
close_top_layer_msgboxes() # otherwise they remain
lv.screen_load(screen)
if new_activity:
new_activity.onStart(new_screen) # Initialize UI elements
lv.screen_load(new_screen)
if new_activity:
new_activity.onResume(new_screen) # Screen is now active
def back_screen():
global screen_stack
if len(screen_stack) > 1:
#clean_top_layer()
#print("Adding notification bar and drawer to top layer")
#mpos.ui.create_notification_bar()
#mpos.ui.create_drawer()
#close_top_layer_msgboxes() # would be nicer to "cancel" all input events
print("Loading previous screen")
screen_stack.pop() # Remove current screen
prevscreen = screen_stack[-1] # load previous screen
lv.screen_load(prevscreen)
if len(screen_stack) == 1:
open_bar()
else:
if len(screen_stack) <= 1:
print("Warning: can't go back because screen_stack is empty.")
return False # No previous screen
#close_top_layer_msgboxes() # would be nicer to "cancel" all input events
print("Loading previous screen")
current_activity, current_screen = screen_stack.pop() # Remove current screen
if current_activity:
current_activity.onPause(current_screen)
current_activity.onStop(current_screen)
current_activity.onDestroy(current_screen)
# System deletes the screen
if current_screen:
current_screen.delete()
current_screen = None
prev_activity, prev_screen = screen_stack[-1] # load previous screen
lv.screen_load(prev_screen)
if prev_activity:
prev_activity.onResume(prev_screen)
if len(screen_stack) == 1:
open_bar()