From 8dddf28149226adbe281bce3f7903d08a4070f10 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Tue, 3 Jun 2025 02:57:26 +0200 Subject: [PATCH] Move setContentView() and finish() to Activity --- .../assets/displaywallet.py | 10 +++++----- .../apps/com.example.launcher/assets/launcher.py | 2 +- internal_filesystem/lib/mpos/apps.py | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py index c4283c2e..9872a1eb 100644 --- a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py +++ b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py @@ -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() diff --git a/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py b/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py index af90abc3..7a03ae07 100644 --- a/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py +++ b/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py @@ -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 diff --git a/internal_filesystem/lib/mpos/apps.py b/internal_filesystem/lib/mpos/apps.py index cb4e5c2c..dfee06e1 100644 --- a/internal_filesystem/lib/mpos/apps.py +++ b/internal_filesystem/lib/mpos/apps.py @@ -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()