arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-04 13:52:35 +00:00
Code Issues Releases Wiki Activity

added ui header and icons

Browse Source
This commit is contained in:
chren 2016-10-06 16:16:59 +02:00
parent 3e9b6c09b0
commit 5a20a48745
11 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/recovery.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/reset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/wipe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
src/apps/management/layout_recovery_device.py
View File

@ -16,8 +16,7 @@ async def layout_recovery_device(session_id, message):
msg = 'Please enter ' + nth(message.word_count) + ' word' msg = 'Please enter ' + nth(message.word_count) + ' word'
ui.display.clear() ui.display.clear()
ui.display.text(10, 30, 'Recovering device', ui.header('Recovering device', ui.ICON_RECOVERY, ui.BLACK, ui.LIGHT_GREEN)
ui.BOLD, ui.LIGHT_GREEN, ui.BLACK)
ui.display.text(10, 74, msg, ui.BOLD, ui.WHITE, ui.BLACK) ui.display.text(10, 74, msg, ui.BOLD, ui.WHITE, ui.BLACK)
ui.display.text(10, 104, 'of your mnemonic.', ui.BOLD, ui.WHITE, ui.BLACK) ui.display.text(10, 104, 'of your mnemonic.', ui.BOLD, ui.WHITE, ui.BLACK)

3
src/apps/management/layout_reset_device.py
View File

@ -74,8 +74,7 @@ async def show_mnemonic_page(page, page_count, mnemonic):
from trezor.ui.scroll import render_scrollbar, animate_swipe from trezor.ui.scroll import render_scrollbar, animate_swipe
ui.display.clear() ui.display.clear()
ui.display.text( ui.header('Write down your seed', ui.ICON_RESET, ui.BLACK, ui.LIGHT_GREEN)
10, 34, 'Write down your seed', ui.BOLD, ui.LIGHT_GREEN, ui.BLACK)
render_scrollbar(page, page_count) render_scrollbar(page, page_count)
for pi, (wi, word) in enumerate(mnemonic[page]): for pi, (wi, word) in enumerate(mnemonic[page]):

3
src/apps/management/layout_wipe_device.py
View File

@ -10,9 +10,8 @@ async def layout_wipe_device(message, session_id):
from ..common import storage from ..common import storage
ui.display.clear() ui.display.clear()
ui.header('Wiping device', ui.ICON_WIPE, ui.BLACK, ui.LIGHT_GREEN)
content = Text( content = Text(
'Wiping device',
ui.BOLD, 'Do you really want to', 'wipe the device?', ui.BOLD, 'Do you really want to', 'wipe the device?',
ui.NORMAL, '', 'All data will be lost.') ui.NORMAL, '', 'All data will be lost.')
await hold_to_confirm(session_id, content) await hold_to_confirm(session_id, content)

BIN
src/trezor/res/recovery.toig Normal file
View File

Binary file not shown.

BIN
src/trezor/res/reset.toig Normal file
View File

Binary file not shown.

BIN
src/trezor/res/wipe.toig Normal file
View File

Binary file not shown.

11
src/trezor/ui/__init__.py
View File

@ -2,7 +2,7 @@ import math
import utime import utime
from TrezorUi import Display from TrezorUi import Display
from trezor import loop from trezor import loop, res
display = Display() display = Display()
@ -45,6 +45,10 @@ MONO = Display.FONT_MONO
NORMAL = Display.FONT_NORMAL NORMAL = Display.FONT_NORMAL
BOLD = Display.FONT_BOLD BOLD = Display.FONT_BOLD
# icons
ICON_RESET = 'trezor/res/reset.toig'
ICON_WIPE = 'trezor/res/wipe.toig'
ICON_RECOVERY = 'trezor/res/recovery.toig'
def in_area(pos: tuple, area: tuple) -> bool: def in_area(pos: tuple, area: tuple) -> bool:
x, y = pos x, y = pos
@ -70,6 +74,11 @@ def animate_pulse(func, ca, cb, speed=200000, delay=30000):
func(c) func(c)
yield loop.Sleep(delay) yield loop.Sleep(delay)
def header(title, icon=ICON_RESET, fg=BLACK, bg=PM_DARK_BLUE):
display.bar(0, 0, 240, 32, bg)
image = res.load(icon)
display.icon(8, 4, image, fg, bg)
display.text(8 + 24 + 8, 23, title, BOLD, fg, bg)
def rotate_coords(pos: tuple) -> tuple: def rotate_coords(pos: tuple) -> tuple:
r = display.orientation() r = display.orientation()

6
src/trezor/ui/text.py
View File

@ -1,8 +1,8 @@
from micropython import const from micropython import const
from trezor import ui from trezor import ui
TEXT_HEADER_HEIGHT = const(44) TEXT_HEADER_HEIGHT = const(32)
TEXT_LINE_HEIGHT = const(30) TEXT_LINE_HEIGHT = const(23)
TEXT_MARGIN_LEFT = const(10) TEXT_MARGIN_LEFT = const(10)
@ -14,8 +14,6 @@ class Text:
def render(self): def render(self):
offset = TEXT_LINE_HEIGHT offset = TEXT_LINE_HEIGHT
ui.display.text(TEXT_MARGIN_LEFT, offset,
self.header, ui.BOLD, ui.LIGHT_GREEN, ui.BLACK)
offset += TEXT_HEADER_HEIGHT offset += TEXT_HEADER_HEIGHT
style = ui.NORMAL style = ui.NORMAL
for item in self.content: for item in self.content: