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

Move setContentView() and finish() to Activity

Browse Source
This commit is contained in:
Thomas Farstrike
2025-06-03 02:57:26 +02:00
parent c115926814
commit 8dddf28149
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
+5 -5
View File
@@ -43,7 +43,7 @@ class MainActivity(Activity):
snap_label.set_text(lv.SYMBOL.SETTINGS)
snap_label.center()
settings_button.add_event_cb(self.settings_button_tap,lv.EVENT.CLICKED,None)
mpos.ui.setContentView(self, main_screen)
self.setContentView(main_screen)
def onStart(self, main_screen):
self.main_ui_set_defaults()
@@ -172,7 +172,7 @@ class SettingsActivity(Activity):
setting_cont.add_event_cb(
lambda e, s=setting: self.startSettingActivity(s), lv.EVENT.CLICKED, None
)
mpos.ui.setContentView(self, screen)
self.setContentView(screen)
def onResume(self, screen):
wallet_type = self.prefs.get_string("wallet_type", "lnbits")
@@ -282,8 +282,8 @@ class SettingActivity(Activity):
cancel_label = lv.label(cancel_btn)
cancel_label.set_text("Cancel")
cancel_label.center()
cancel_btn.add_event_cb(lambda e: mpos.ui.back_screen(), lv.EVENT.CLICKED, None)
mpos.ui.setContentView(self, settings_screen_detail)
cancel_btn.add_event_cb(lambda e: self.finish(), lv.EVENT.CLICKED, None)
self.setContentView(settings_screen_detail)
def hide_keyboard(self, event=None):
print("hide_keyboard: hiding keyboard")
@@ -352,5 +352,5 @@ class SettingActivity(Activity):
editor.put_string(setting["key"], new_value)
editor.commit()
setting["value_label"].set_text(new_value if new_value else "Not set")
mpos.ui.back_screen()
self.finish()
internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py
+1 -1
View File
@@ -25,7 +25,7 @@ class MainActivity(mpos.apps.Activity):
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)
self.setContentView(main_screen)
def onResume(self, main_screen):
# Grid parameters
internal_filesystem/lib/mpos/apps.py
+6
View File
@@ -205,3 +205,9 @@ class Activity:
pass
def onDestroy(self, screen):
pass
def setContentView(self, screen):
mpos.ui.setContentView(self, screen)
def finish(self):
mpos.ui.back_screen()