refactor(color): UI layout logic to better handle different screen sizes and orientations (#6134)

This commit is contained in:
philmoz
2025-05-06 13:49:58 +10:00
committed by GitHub
parent 719324e46d
commit fa54a44f3d
422 changed files with 390029 additions and 394862 deletions
@@ -47,56 +47,56 @@ LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444, (LZ4Bitmap*)__bmp_usb_plugged);
#define BL_FOREGROUND COLOR_WHITE
#define BL_SELECTED COLOR2FLAGS(RGB(11, 65, 244)) // deep blue
LAYOUT_VAL(LINE_X1, 28, 28, LS(28))
LAYOUT_VAL(LINE_W, 422, 422, LS(422))
LAYOUT_VAL(LINE_H, 2, 2, 2)
LAYOUT_VAL_SCALED(LINE_X1, 28)
LAYOUT_VAL_SCALED(LINE_W, 422)
static constexpr coord_t LINE_H = 2;
LAYOUT_VAL(TITLE_X1, 88, 88, LS(88))
LAYOUT_VAL(TITLE_Y1, 28, 28, LS(28))
LAYOUT_VAL(TITLE_Y2, 56, 56, LS(56))
LAYOUT_VAL_SCALED(TITLE_X1, 88)
LAYOUT_VAL_SCALED(TITLE_Y1, 28)
LAYOUT_VAL_SCALED(TITLE_Y2, 56)
LAYOUT_VAL(FOOTER_Y1, 30, 30, LS(30))
LAYOUT_VAL(FOOTER_Y2, 38, 38, LS(38))
LAYOUT_VAL_SCALED(FOOTER_Y1, 30)
LAYOUT_VAL_SCALED(FOOTER_Y2, 38)
LAYOUT_VAL(SYM_X, 102, 102, LS(102))
LAYOUT_VAL(SYM_X2, 100, 100, LS(100))
LAYOUT_VAL(LBL_X, 124, 124, LS(124))
LAYOUT_VAL(SYM_Y, 75, 75, LS(75))
LAYOUT_VAL(SYM_H, 35, 35, LS(35))
LAYOUT_VAL_SCALED(SYM_X, 102)
LAYOUT_VAL_SCALED(SYM_X2, 100)
LAYOUT_VAL_SCALED(LBL_X, 124)
LAYOUT_VAL_SCALED(SYM_Y, 75)
LAYOUT_VAL_SCALED(SYM_H, 35)
LAYOUT_VAL(BOX_GAP, 8, 8, LS(8))
LAYOUT_VAL(BOX_Y, 72, 72, LS(72))
LAYOUT_VAL(BOX_H, 26, 26, LS(26))
LAYOUT_VAL_SCALED(BOX_GAP, 8)
LAYOUT_VAL_SCALED(BOX_Y, 72)
LAYOUT_VAL_SCALED(BOX_H, 26)
LAYOUT_VAL(OPTBOX_X, 92, 92, LS(92))
LAYOUT_VAL_SCALED(OPTBOX_X, 92)
LAYOUT_VAL(USB_ICN_X, 60, 60, LS(60))
LAYOUT_VAL(USB_PLG_X, 136, 136, LS(136))
LAYOUT_VAL(USB_ICN_Y, 106, 106, LS(106))
LAYOUT_VAL(USB_TXT_X, 195, 195, LS(195))
LAYOUT_VAL(USB_TXT_Y1, 97, 97, LS(97))
LAYOUT_VAL(USB_TXT_Y2, 72, 72, LS(72))
LAYOUT_VAL_SCALED(USB_ICN_X, 60)
LAYOUT_VAL_SCALED(USB_PLG_X, 136)
LAYOUT_VAL_SCALED(USB_ICN_Y, 106)
LAYOUT_VAL_SCALED(USB_TXT_X, 195)
LAYOUT_VAL_SCALED(USB_TXT_Y1, 97)
LAYOUT_VAL_SCALED(USB_TXT_Y2, 72)
LAYOUT_VAL(FILENAM_X1, 94, 94, LS(94))
LAYOUT_VAL(FILENAM_X2, 124, 124, LS(124))
LAYOUT_VAL(FILENAM_Y1, 75, 75, LS(75))
LAYOUT_VAL(FILENAM_H, 25, 25, LS(25))
LAYOUT_VAL(FILESEL_X, 119, 119, LS(119))
LAYOUT_VAL(FILESEL_W, 278, 278, LS(278))
LAYOUT_VAL_SCALED(FILENAM_X1, 94)
LAYOUT_VAL_SCALED(FILENAM_X2, 124)
LAYOUT_VAL_SCALED(FILENAM_Y1, 75)
LAYOUT_VAL_SCALED(FILENAM_H, 25)
LAYOUT_VAL_SCALED(FILESEL_X, 119)
LAYOUT_VAL_SCALED(FILESEL_W, 278)
LAYOUT_VAL(NLSYM_X, 305, 305, LS(305))
LAYOUT_VAL(RTNTXT_X, 335, 335, LS(335))
LAYOUT_VAL_SCALED(NLSYM_X, 305)
LAYOUT_VAL_SCALED(RTNTXT_X, 335)
LAYOUT_VAL(DIRMSG_X, 90, 90, LS(90))
LAYOUT_VAL(DIRMSG_Y, 168, 168, LS(168))
LAYOUT_VAL_SCALED(DIRMSG_X, 90)
LAYOUT_VAL_SCALED(DIRMSG_Y, 168)
LAYOUT_VAL(PROGRESS_X, 70, 70, LS(70))
LAYOUT_VAL(PROGRESS_W, 340, 340, LS(340))
LAYOUT_VAL(PROGRESS_H, 31, 31, LS(31))
LAYOUT_VAL_SCALED(PROGRESS_X, 70)
LAYOUT_VAL_SCALED(PROGRESS_W, 340)
LAYOUT_VAL_SCALED(PROGRESS_H, 31)
LAYOUT_VAL(VERCHK_X, 168, 168, LS(168))
LAYOUT_VAL(VERCHK_Y, 138, 138, LS(138))
LAYOUT_VAL(VERCHK_ICN_X, 78, 78, LS(78))
LAYOUT_VAL_SCALED(VERCHK_X, 168)
LAYOUT_VAL_SCALED(VERCHK_Y, 138)
LAYOUT_VAL_SCALED(VERCHK_ICN_X, 78)
extern BitmapBuffer * lcd;
-5
View File
@@ -1229,11 +1229,6 @@
// SDRAM
#define SDRAM_BANK2
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD true
#define LANDSCAPE_LCD_LRG false
#if defined(RADIO_T15)
#define LCD_W 480
#define LCD_H 320
-5
View File
@@ -440,11 +440,6 @@
// SDRAM
#define SDRAM_BANK1
#define PORTRAIT_LCD true
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD false
#define LANDSCAPE_LCD_LRG false
#define LCD_W 320
#define LCD_H 480
@@ -32,6 +32,7 @@
#include "bootloader/firmware_files.h"
#include <lvgl/lvgl.h>
#include "etx_lv_theme.h"
#define RADIO_MENU_LEN 2
@@ -80,7 +81,7 @@ static void bootloaderDrawTitle(const char* text)
static void bootloaderDrawFooter()
{
if (LCD_W > LCD_H)
if (LANDSCAPE)
lcd->drawSolidFilledRect(DEFAULT_PADDING, LCD_H - (DEFAULT_PADDING + 10), LCD_W - DOUBLE_PADDING, 2, BL_FOREGROUND);
else
lcd->drawSolidFilledRect(DEFAULT_PADDING, LCD_H - (DOUBLE_PADDING + 4), LCD_W - DOUBLE_PADDING, 2, BL_FOREGROUND);
@@ -142,7 +143,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
pos -= menuItemX - 8;
lcd->drawSolidRect(menuItemX - 8, 72 + (opt * 35), pos, 26, 2, BL_SELECTED);
if (LCD_W > LCD_H) {
if (LANDSCAPE) {
lcd->drawBitmap(menuItemX - 40, LCD_H - 106, (const BitmapBuffer*)&BMP_PLUG_USB);
lcd->drawText(menuItemX + 95, LCD_H - 97, TR_BL_USB_PLUGIN, BL_FOREGROUND);
lcd->drawText(menuItemX + 95, LCD_H - 72, TR_BL_USB_MASS_STORE, BL_FOREGROUND);
@@ -173,7 +174,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
lcd->drawSolidRect(menuItemX - 8, 72 + (opt * 35), pos, 26, 2, BL_SELECTED);
bootloaderDrawFooter();
if (LCD_W > LCD_H) {
if (LANDSCAPE) {
lcd->drawText(DEFAULT_PADDING, LCD_H - DEFAULT_PADDING,
LV_SYMBOL_SD_CARD " " TR_BL_ERASE_KEY, BL_FOREGROUND);
lcd->drawText(LCD_W - 175, LCD_H - DEFAULT_PADDING,
@@ -271,7 +272,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
MESSAGE_TOP + DEFAULT_PADDING, tag.flavour,
BL_FOREGROUND);
lcd->drawText(LCD_W > LCD_H ? DOUBLE_PADDING : DEFAULT_PADDING, MESSAGE_TOP, LV_SYMBOL_OK, BL_GREEN);
lcd->drawText(LANDSCAPE ? DOUBLE_PADDING : DEFAULT_PADDING, MESSAGE_TOP, LV_SYMBOL_OK, BL_GREEN);
}
}
}
@@ -281,7 +282,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
if (st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
int padding = DOUBLE_PADDING;
if (LCD_W > LCD_H)
if (LANDSCAPE)
padding = DEFAULT_PADDING;
if (st == ST_FILE_LIST) {
lcd->drawText(padding, LCD_H - padding,
@@ -299,7 +300,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
}
if (st != ST_FLASHING) {
if (LCD_W > LCD_H) {
if (LANDSCAPE) {
lcd->drawText(LCD_W - 175, LCD_H - DEFAULT_PADDING,
LV_SYMBOL_NEW_LINE " " TR_BL_EXIT_KEY, BL_FOREGROUND);
} else {
-7
View File
@@ -939,20 +939,13 @@
#define SDRAM_BANK1
#if defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
#define PORTRAIT_LCD true
#define LANDSCAPE_LCD_STD false
#define LCD_W 320
#define LCD_H 480
#else
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD_STD true
#define LCD_W 480
#define LCD_H 320
#endif
#define LANDSCAPE_LCD_LRG false
#define LANDSCAPE_LCD_SML false
#define LCD_PHYS_W 320
#define LCD_PHYS_H 480
-5
View File
@@ -505,11 +505,6 @@
#define MIXER_SCHEDULER_TIMER_IRQn TIM8_BRK_TIM12_IRQn
#define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_BRK_TIM12_IRQHandler
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD true
#define LANDSCAPE_LCD_LRG false
#define PORTRAIT_LCD false
#define LCD_W 480
#define LCD_H 320
-5
View File
@@ -360,11 +360,6 @@
#define MIXER_SCHEDULER_TIMER_IRQn TIM12_IRQn
#define MIXER_SCHEDULER_TIMER_IRQHandler TIM12_IRQHandler
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD false
#define LANDSCAPE_LCD_LRG true
#define LCD_W 800
#define LCD_H 480