Skip to content

Commit 3da845e

Browse files
committed
gui: remove the now-unused old qr background colors
1 parent 3b57691 commit 3da845e

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

main/gui.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ ESP_EVENT_DEFINE_BASE(GUI_EVENT);
3737

3838
const color_t GUI_BLOCKSTREAM_JADE_GREEN = 0x4C04;
3939
const color_t GUI_BLOCKSTREAM_BUTTONBORDER_GREY = 0x0421;
40-
#ifdef CONFIG_IDF_TARGET_ESP32S3
41-
// V2 QR codes scan better with a higher contrast background
42-
const color_t GUI_BLOCKSTREAM_QR_PALE = 0xFFFF;
43-
#else
44-
const color_t GUI_BLOCKSTREAM_QR_PALE = 0x494A;
45-
#endif
4640
const color_t GUI_BLOCKSTREAM_HIGHTLIGHT_DEFAULT = GUI_BLOCKSTREAM_JADE_GREEN;
4741
const color_t GUI_BLOCKSTREAM_HIGHTLIGHT_ORANGE = 0xE0D3;
4842
const color_t GUI_BLOCKSTREAM_HIGHTLIGHT_BLUE = 0xD318;

main/gui.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ extern color_t _fg;
1212
// Additional colour tokens
1313
extern const color_t GUI_BLOCKSTREAM_JADE_GREEN;
1414
extern const color_t GUI_BLOCKSTREAM_BUTTONBORDER_GREY;
15-
extern const color_t GUI_BLOCKSTREAM_QR_PALE;
1615

1716
extern const color_t GUI_BLOCKSTREAM_HIGHTLIGHT_DEFAULT;
1817
extern const color_t GUI_BLOCKSTREAM_HIGHTLIGHT_ORANGE;

main/ui/qrmode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ static void make_qrcode(gui_view_node_t* parent, Icon* icons, const size_t num_i
77
{
88
// qrcodes are a background fill node with the icon node on top
99
gui_view_node_t* fill;
10-
gui_make_fill(&fill, GUI_BLOCKSTREAM_QR_PALE, FILL_QR, parent);
10+
gui_make_fill(&fill, TFT_BLACK, FILL_QR, parent);
1111

1212
gui_view_node_t* icon;
13-
gui_make_icon(&icon, icons, TFT_BLACK, &GUI_BLOCKSTREAM_QR_PALE);
13+
gui_make_icon(&icon, icons, TFT_BLACK, &TFT_WHITE);
1414
gui_set_align(icon, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
1515
gui_set_parent(icon, fill);
1616
gui_set_icon_animation(icon, icons, num_icons, frames_per_qr_icon);

0 commit comments

Comments
 (0)