arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-26 09:52:34 +00:00
Code Issues Releases Wiki Activity

trezor.ui: remove PM colors and other visuals changes

Browse Source
This commit is contained in:
Peter Jensen 2017-03-27 21:36:04 +02:00
parent 6861e68f21
commit 36637c23f6
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/fido_u2f/u2f.py
View File

@ -26,7 +26,7 @@ def layout_u2f():
ui.display.bar(0, 0, 240, 240, ui.BLACK) ui.display.bar(0, 0, 240, 240, ui.BLACK)
# top header bar # top header bar
ui.display.text(10, 28, 'U2F Login', ui.BOLD, ui.PM_BLUE, ui.BLACK) ui.display.text(10, 28, 'U2F Login', ui.BOLD, ui.WHITE, ui.BLACK)
# content # content
ui.display.text_center(120, 70, '%s:' % action, ui.BOLD, ui.GREY, ui.BLACK) ui.display.text_center(120, 70, '%s:' % action, ui.BOLD, ui.GREY, ui.BLACK)

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

@ -16,7 +16,10 @@ def rgbcolor(r: int, g: int, b: int) -> int:
LIGHT_RED = rgbcolor(0xFF, 0x00, 0x00) LIGHT_RED = rgbcolor(0xFF, 0x00, 0x00)
RED = rgbcolor(0x66, 0x00, 0x00) #RED E4572E
RED = rgbcolor(0xE4, 0x57, 0x2E)
#ACTIVE DARK RED A64022
ACTIVE_RED = rgbcolor(0xA6, 0x40, 0x22)
PINK = rgbcolor(0xE9, 0x1E, 0x63) PINK = rgbcolor(0xE9, 0x1E, 0x63)
PURPLE = rgbcolor(0x9C, 0x27, 0xB0) PURPLE = rgbcolor(0x9C, 0x27, 0xB0)
DEEP_PURPLE = rgbcolor(0x67, 0x3A, 0xB7) DEEP_PURPLE = rgbcolor(0x67, 0x3A, 0xB7)
@ -25,7 +28,12 @@ BLUE = rgbcolor(0x21, 0x96, 0xF3)
LIGHT_BLUE = rgbcolor(0x03, 0xA9, 0xF4) LIGHT_BLUE = rgbcolor(0x03, 0xA9, 0xF4)
CYAN = rgbcolor(0x00, 0xBC, 0xD4) CYAN = rgbcolor(0x00, 0xBC, 0xD4)
TEAL = rgbcolor(0x00, 0x96, 0x88) TEAL = rgbcolor(0x00, 0x96, 0x88)
#GREEN 4CC148
GREEN = rgbcolor(0x4C, 0xC1, 0x48) GREEN = rgbcolor(0x4C, 0xC1, 0x48)
#ACTIVE DARK GREEN 1A8C14
ACTIVE_GREEN = rgbcolor(0x1A, 0x8C, 0x14)
LIGHT_GREEN = rgbcolor(0x87, 0xCE, 0x26) LIGHT_GREEN = rgbcolor(0x87, 0xCE, 0x26)
LIME = rgbcolor(0xCD, 0xDC, 0x39) LIME = rgbcolor(0xCD, 0xDC, 0x39)
YELLOW = rgbcolor(0xFF, 0xEB, 0x3B) YELLOW = rgbcolor(0xFF, 0xEB, 0x3B)
@ -40,16 +48,12 @@ BLUE_GRAY = rgbcolor(0x60, 0x7D, 0x8B)
BLACK = rgbcolor(0x00, 0x00, 0x00) BLACK = rgbcolor(0x00, 0x00, 0x00)
WHITE = rgbcolor(0xFA, 0xFA, 0xFA) WHITE = rgbcolor(0xFA, 0xFA, 0xFA)
# custom palette
BLACKISH = rgbcolor(0x20, 0x20, 0x20) BLACKISH = rgbcolor(0x20, 0x20, 0x20)
PM_DARK_BLUE = rgbcolor(0x1A, 0x29, 0x42)
PM_BLUE = rgbcolor(0x34, 0x98, 0xDB)
MONO = Display.FONT_MONO MONO = Display.FONT_MONO
NORMAL = Display.FONT_NORMAL NORMAL = Display.FONT_NORMAL
BOLD = Display.FONT_BOLD BOLD = Display.FONT_BOLD
# radius for buttons and other elemts # radius for buttons and other elements
BTN_RADIUS = const(2) BTN_RADIUS = const(2)
BACKLIGHT_NORMAL = const(60) BACKLIGHT_NORMAL = const(60)
@ -106,11 +110,11 @@ def animate_pulse(func, ca, cb, speed=200000, delay=30000):
yield loop.Sleep(delay) yield loop.Sleep(delay)
def header(title, icon=ICON_RESET, fg=BLACK, bg=PM_DARK_BLUE): def header(title, icon=ICON_RESET, fg=BLACK, bg=BLACK):
display.bar(0, 0, 240, 32, bg) display.bar(0, 0, 240, 32, bg)
if icon is not None: if icon is not None:
display.icon(8, 4, res.load(icon), fg, bg) display.icon(8, 4, res.load(icon), fg, bg)
display.text(8 + 24 + 8, 23, title, BOLD, fg, bg) display.text(8 + 24 + 2, 24, title, BOLD, fg, bg)
def rotate_coords(pos: tuple) -> tuple: def rotate_coords(pos: tuple) -> tuple:

12
src/trezor/ui/button.py
View File

@ -4,7 +4,7 @@ from . import display, in_area, rotate_coords, Widget
DEFAULT_BUTTON = { DEFAULT_BUTTON = {
'bg-color': ui.BLACKISH, 'bg-color': ui.BLACK,
'fg-color': ui.WHITE, 'fg-color': ui.WHITE,
'text-style': ui.NORMAL, 'text-style': ui.NORMAL,
'border-color': ui.BLACK, 'border-color': ui.BLACK,
@ -27,16 +27,16 @@ DEFAULT_BUTTON_DISABLED = {
CANCEL_BUTTON = { CANCEL_BUTTON = {
'bg-color': ui.RED, 'bg-color': ui.RED,
'fg-color': ui.LIGHT_RED, 'fg-color': ui.WHITE,
'text-style': ui.BOLD, 'text-style': ui.BOLD,
'border-color': ui.RED, 'border-color': ui.RED,
'radius': ui.BTN_RADIUS, 'radius': ui.BTN_RADIUS,
} }
CANCEL_BUTTON_ACTIVE = { CANCEL_BUTTON_ACTIVE = {
'bg-color': ui.RED, 'bg-color': ui.ACTIVE_RED,
'fg-color': ui.WHITE, 'fg-color': ui.WHITE,
'text-style': ui.BOLD, 'text-style': ui.BOLD,
'border-color': ui.RED, 'border-color': ui.ACTIVE_RED,
'radius': ui.BTN_RADIUS, 'radius': ui.BTN_RADIUS,
} }
@ -48,10 +48,10 @@ CONFIRM_BUTTON = {
'radius': ui.BTN_RADIUS, 'radius': ui.BTN_RADIUS,
} }
CONFIRM_BUTTON_ACTIVE = { CONFIRM_BUTTON_ACTIVE = {
'bg-color': ui.GREEN, 'bg-color': ui.ACTIVE_GREEN,
'fg-color': ui.WHITE, 'fg-color': ui.WHITE,
'text-style': ui.BOLD, 'text-style': ui.BOLD,
'border-color': ui.GREEN, 'border-color': ui.ACTIVE_GREEN,
'radius': ui.BTN_RADIUS, 'radius': ui.BTN_RADIUS,
} }

2
src/trezor/ui/loader.py
View File

@ -11,7 +11,7 @@ DEFAULT_LOADER = {
} }
DEFAULT_LOADER_ACTIVE = { DEFAULT_LOADER_ACTIVE = {
'bg-color': ui.BLACK, 'bg-color': ui.BLACK,
'fg-color': ui.LIGHT_GREEN, 'fg-color': ui.ACTIVE_GREEN,
'icon': None, 'icon': None,
'icon-fg-color': None, 'icon-fg-color': None,
} }