Skip to content

Commit f0aaa71

Browse files
SettingsScreen: don't inherit from lv.obj
1 parent d8fd4f5 commit f0aaa71

File tree

1 file changed

+13
-10
lines changed
  • internal_filesystem/apps/com.lightningpiggy.displaywallet/assets

1 file changed

+13
-10
lines changed

internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010

1111
# Settings screen implementation
12-
class SettingsScreen(lv.obj):
12+
class SettingsScreen():
1313
def __init__(self):
14-
super().__init__(None)
14+
#super().__init__(None)
1515
self.prefs = mpos.config.SharedPreferences("com.lightningpiggy.displaywallet")
1616
self.settings = [
1717
{"title": "Wallet Type", "key": "wallet_type", "value_label": None},
@@ -22,19 +22,20 @@ def __init__(self):
2222
self.keyboard = None
2323
self.textarea = None
2424
self.msgbox = None
25-
self.create_ui()
25+
self.screen = self.create_ui()
2626

2727
def create_ui(self):
28+
screen = lv.obj()
2829
print("creating ui...")
29-
self.set_size(lv.pct(100), lv.pct(100))
30-
self.set_style_pad_all(10, 0)
31-
self.set_flex_flow(lv.FLEX_FLOW.COLUMN)
32-
self.set_style_border_width(0, 0)
30+
screen.set_size(lv.pct(100), lv.pct(100))
31+
screen.set_style_pad_all(10, 0)
32+
screen.set_flex_flow(lv.FLEX_FLOW.COLUMN)
33+
screen.set_style_border_width(0, 0)
3334

3435
# Create settings entries
3536
for setting in self.settings:
3637
# Container for each setting
37-
setting_cont = lv.obj(self)
38+
setting_cont = lv.obj(screen)
3839
setting_cont.set_width(lv.pct(100))
3940
setting_cont.set_height(lv.SIZE_CONTENT)
4041
setting_cont.set_style_border_width(1, 0)
@@ -72,7 +73,7 @@ def create_ui(self):
7273
self.keyboard.add_event_cb(self.keyboard_cb,lv.EVENT.READY,None)
7374
self.keyboard.add_event_cb(self.keyboard_cb,lv.EVENT.CANCEL,None)
7475
#self.keyboard.add_event_cb(self.keyboard_value_changed_cb,lv.EVENT.VALUE_CHANGED,None)
75-
76+
return screen
7677

7778
def hide_keyboard(self, event=None):
7879
print("hide_keyboard: hiding keyboard")
@@ -176,11 +177,13 @@ def close_popup(self, event):
176177
def settings_button_tap(event):
177178
global settings_screen
178179
if not settings_screen:
179-
settings_screen = SettingsScreen()
180+
settings_screen = SettingsScreen().screen
180181
lv.screen_load(settings_screen)
182+
#mpos.ui.startActivity(settings_screen)
181183

182184
def build_main_ui():
183185
appscreen.clean()
186+
appscreen.set_style_pad_all(10, 0)
184187
balance_label = lv.label(appscreen)
185188
balance_label.align(lv.ALIGN.TOP_LEFT, 0, 0)
186189
balance_label.set_style_text_font(lv.font_montserrat_20, 0)

0 commit comments

Comments
 (0)