diff --git a/scenarios/MockUI/src/MockUI/basic/__init__.py b/scenarios/MockUI/src/MockUI/basic/__init__.py index e540e671..5be0f6cd 100644 --- a/scenarios/MockUI/src/MockUI/basic/__init__.py +++ b/scenarios/MockUI/src/MockUI/basic/__init__.py @@ -1,4 +1,4 @@ -from .ui_consts import BTN_HEIGHT, BTN_WIDTH, BACK_BTN_HEIGHT, BACK_BTN_WIDTH, MENU_PCT, PAD_SIZE, SWITCH_HEIGHT, SWITCH_WIDTH, STATUS_BTN_HEIGHT, STATUS_BTN_WIDTH, STATUS_BAR_PCT, CONTENT_PCT, BTC_ICON_WIDTH, BTC_ICON_ZOOM, ONE_LETTER_SYMBOL_WIDTH, TWO_LETTER_SYMBOL_WIDTH, THREE_LETTER_SYMBOL_WIDTH, MENU_TITLE_FONT_SIZE, MENU_ITEM_FONT_SIZE, GREEN, ORANGE, RED, GREEN_HEX, ORANGE_HEX, RED_HEX, WHITE_HEX, BLACK_HEX, TITLE_ROW_HEIGHT, TITLE_PADDING, MODAL_WIDTH_PCT, MODAL_HEIGHT_PCT, EXPLAINER_WIDTH_PCT, EXPLAINER_HEIGHT_PCT, EXPLAINER_OVERLAY_OPA, PIN_BTN_WIDTH, PIN_BTN_HEIGHT +from .ui_consts import BTN_HEIGHT, BTN_WIDTH, BACK_BTN_HEIGHT, BACK_BTN_WIDTH, MENU_PCT, PAD_SIZE, SWITCH_HEIGHT, SWITCH_WIDTH, STATUS_BTN_HEIGHT, STATUS_BTN_WIDTH, STATUS_BAR_PCT, CONTENT_PCT, BTC_ICON_WIDTH, BTC_ICON_ZOOM, ONE_LETTER_SYMBOL_WIDTH, TWO_LETTER_SYMBOL_WIDTH, THREE_LETTER_SYMBOL_WIDTH, MENU_TITLE_FONT_SIZE, MENU_ITEM_FONT_SIZE, GREEN, ORANGE, RED, WHITE, GREY, BLACK, GREEN_HEX, ORANGE_HEX, RED_HEX, WHITE_HEX, GREY_HEX, BLACK_HEX, TITLE_ROW_HEIGHT, TITLE_PADDING, MODAL_WIDTH_PCT, MODAL_HEIGHT_PCT, EXPLAINER_WIDTH_PCT, EXPLAINER_HEIGHT_PCT, EXPLAINER_OVERLAY_OPA, PIN_BTN_WIDTH, PIN_BTN_HEIGHT from .titled_screen import TitledScreen from .main_menu import MainMenu from .locked_menu import LockedMenu @@ -23,8 +23,8 @@ "BTC_ICON_WIDTH", "BTC_ICON_ZOOM", "MENU_TITLE_FONT_SIZE", "MENU_ITEM_FONT_SIZE", "ONE_LETTER_SYMBOL_WIDTH", "TWO_LETTER_SYMBOL_WIDTH", "THREE_LETTER_SYMBOL_WIDTH", - "GREEN", "ORANGE", "RED", - "GREEN_HEX", "ORANGE_HEX", "RED_HEX", "WHITE_HEX", "BLACK_HEX", + "GREEN", "ORANGE", "RED", "WHITE", "GREY", "BLACK", + "GREEN_HEX", "ORANGE_HEX", "RED_HEX", "WHITE_HEX", "GREY_HEX", "BLACK_HEX", "MainMenu", "LockedMenu", "DeviceBar", "WalletBar", "ActionScreen", "GenericMenu", "TitledScreen", "ModalOverlay", "SpecterGui", "BTC_ICONS" ] \ No newline at end of file diff --git a/scenarios/MockUI/src/MockUI/basic/device_bar.py b/scenarios/MockUI/src/MockUI/basic/device_bar.py index ec7b6cfc..0ca9680e 100644 --- a/scenarios/MockUI/src/MockUI/basic/device_bar.py +++ b/scenarios/MockUI/src/MockUI/basic/device_bar.py @@ -1,6 +1,6 @@ import lvgl as lv from ..stubs import Battery -from .ui_consts import BTC_ICON_WIDTH, GREEN_HEX, ORANGE_HEX, RED_HEX, STATUS_BTN_HEIGHT, STATUS_BTN_WIDTH +from .ui_consts import BTC_ICON_WIDTH, GREEN_HEX, ORANGE_HEX, RED_HEX, WHITE_HEX, GREY_HEX, STATUS_BTN_HEIGHT, STATUS_BTN_WIDTH from .symbol_lib import BTC_ICONS @@ -129,25 +129,25 @@ def lock_cb(self, e): else: # lock the device and force SpecterGui to show the locked screen self.gui.specter_state.lock() - # on_navigate will detect is_locked and show the locked screen - self.gui.on_navigate(None) + # show_menu will detect is_locked and show the locked screen + self.gui.show_menu(None) def peripheral_ico_clicked(self, e): if e.get_code() == lv.EVENT.CLICKED: if self.gui.ui_state.current_menu_id != "interfaces": - self.gui.on_navigate("interfaces") + self.gui.show_menu("interfaces") def lang_clicked(self, e): """Navigate to language selection menu when language label is clicked.""" if e.get_code() == lv.EVENT.CLICKED: if self.gui.ui_state.current_menu_id != "select_language": - self.gui.on_navigate("select_language") + self.gui.show_menu("select_language") def settings_cb(self, e): """Navigate to settings menu when settings button is clicked.""" if e.get_code() == lv.EVENT.CLICKED: if self.gui.ui_state.current_menu_id != "manage_settings": - self.gui.on_navigate("manage_settings") + self.gui.show_menu("manage_settings") def refresh(self, state): """Update visual elements from a SpecterState-like object.""" @@ -178,15 +178,15 @@ def refresh(self, state): if state.enabledQR: BTC_ICONS.QR_CODE(GREEN_HEX).add_to_parent(self.qr_img) else: - BTC_ICONS.QR_CODE(ORANGE_HEX).add_to_parent(self.qr_img) + BTC_ICONS.QR_CODE(GREY_HEX).add_to_parent(self.qr_img) else: self.qr_img.set_src(None) if state.hasUSB: if state.enabledUSB: - BTC_ICONS.USB(GREEN_HEX).add_to_parent(self.usb_img) + BTC_ICONS.USB(WHITE_HEX).add_to_parent(self.usb_img) else: - BTC_ICONS.USB(ORANGE_HEX).add_to_parent(self.usb_img) + BTC_ICONS.USB(GREY_HEX).add_to_parent(self.usb_img) else: self.usb_img.set_src(None) @@ -195,9 +195,9 @@ def refresh(self, state): if state.detectedSD: BTC_ICONS.SD_CARD(GREEN_HEX).add_to_parent(self.sd_img) else: - BTC_ICONS.SD_CARD(ORANGE_HEX).add_to_parent(self.sd_img) + BTC_ICONS.SD_CARD(WHITE_HEX).add_to_parent(self.sd_img) else: - BTC_ICONS.SD_CARD(RED_HEX).add_to_parent(self.sd_img) + BTC_ICONS.SD_CARD(GREY_HEX).add_to_parent(self.sd_img) else: self.sd_img.set_src(None) @@ -206,9 +206,9 @@ def refresh(self, state): if state.detectedSmartCard: BTC_ICONS.SMARTCARD(GREEN_HEX).add_to_parent(self.smartcard_img) else: - BTC_ICONS.SMARTCARD(ORANGE_HEX).add_to_parent(self.smartcard_img) + BTC_ICONS.SMARTCARD(WHITE_HEX).add_to_parent(self.smartcard_img) else: - BTC_ICONS.SMARTCARD(RED_HEX).add_to_parent(self.smartcard_img) + BTC_ICONS.SMARTCARD(GREY_HEX).add_to_parent(self.smartcard_img) else: self.smartcard_img.set_src(None) diff --git a/scenarios/MockUI/src/MockUI/basic/ui_consts.py b/scenarios/MockUI/src/MockUI/basic/ui_consts.py index dee0925f..51c99e6b 100644 --- a/scenarios/MockUI/src/MockUI/basic/ui_consts.py +++ b/scenarios/MockUI/src/MockUI/basic/ui_consts.py @@ -47,5 +47,9 @@ ORANGE_HEX = lv.color_hex(0xFF9A00) RED = const("#F10000") RED_HEX = lv.color_hex(0xF10000) +WHITE = const("#FFFFFF") WHITE_HEX = lv.color_hex(0xFFFFFF) +GREY = const("#606060") +GREY_HEX = lv.color_hex(0x606060) +BLACK = const("#000000") BLACK_HEX = lv.color_hex(0x000000) \ No newline at end of file