refactor(color): use LVGL styles and objects for UI, legacy cleanup (#4407)

This commit is contained in:
philmoz
2024-04-05 17:33:14 +10:00
committed by GitHub
parent 5ff5c2ab8e
commit f28c1150ed
392 changed files with 18929 additions and 19492 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

@@ -0,0 +1,2 @@
30,0,30,0,
0xf5,0x01,0x00,0x00,0x16,0x00,0x01,0x00,0x9e,0x22,0x59,0x73,0x8d,0x8d,0x73,0x59,0x22,0x00,0x01,0x00,0x43,0x13,0x7d,0xd0,0xff,0x01,0x00,0x3a,0xd0,0x7d,0x13,0x1c,0x00,0xf7,0x03,0x07,0x76,0xf0,0xff,0xff,0xf8,0xbb,0x9a,0x83,0x83,0x9a,0xbb,0xf8,0xff,0xff,0xf0,0x76,0x07,0x1d,0x00,0x72,0x1a,0xca,0xff,0xff,0xc7,0x52,0x0c,0x0d,0x00,0x75,0x0c,0x52,0xc7,0xff,0xff,0xca,0x1a,0x1d,0x00,0x58,0x2f,0xe4,0xff,0xe4,0x54,0x4b,0x00,0x54,0x54,0xe4,0xff,0xe4,0x2f,0x3a,0x00,0x4a,0xe4,0xff,0xc7,0x18,0x6a,0x00,0x52,0x18,0xc7,0xff,0xe4,0x1a,0x74,0x00,0x40,0xca,0xff,0xc7,0x08,0x09,0x00,0x80,0x06,0x7d,0xcb,0xd0,0xd0,0xce,0x88,0x0d,0x0c,0x00,0x41,0x08,0xc7,0xff,0xca,0x7c,0x00,0x32,0x76,0xff,0xe4,0x3a,0x00,0x12,0x58,0xb3,0x00,0x12,0x70,0x3e,0x00,0x30,0xe4,0xff,0x76,0xcb,0x00,0x23,0xf0,0xff,0x74,0x00,0x12,0x8f,0x1e,0x00,0x13,0xa7,0x7c,0x00,0x83,0xff,0xf0,0x13,0x00,0x00,0x7d,0xff,0xc7,0x6d,0x00,0x12,0x90,0x1e,0x00,0x13,0xa8,0x0f,0x00,0x81,0xc7,0xff,0x7d,0x00,0x00,0xd0,0xff,0x52,0x0d,0x00,0x24,0x37,0x6b,0x1e,0x00,0x21,0x59,0x37,0x11,0x00,0x71,0x52,0xff,0xd0,0x00,0x22,0xff,0xf8,0xe8,0x00,0x42,0x67,0xf9,0xac,0x6e,0x1e,0x00,0x41,0x86,0x95,0xf9,0x62,0xf8,0x00,0x61,0xf8,0xff,0x22,0x59,0xff,0xbb,0x2a,0x00,0xe1,0xd7,0xfb,0xf6,0x29,0xbd,0xfe,0xff,0xff,0xff,0xc8,0x2a,0xec,0xfb,0xd5,0x13,0x00,0x61,0xbb,0xff,0x59,0x73,0xff,0x9a,0x11,0x01,0xe1,0xfb,0xfb,0xfb,0xcf,0x61,0x29,0x2d,0x2d,0x2b,0x55,0xc5,0xfb,0xfb,0xfb,0x0b,0x01,0x60,0x9a,0xff,0x73,0x8d,0xff,0x83,0x0a,0x00,0xf0,0x01,0x47,0xfb,0xf3,0x9c,0x7d,0xde,0xfb,0xfb,0xfb,0xfb,0xe9,0x8a,0x9c,0xf2,0xfb,0x47,0x14,0x00,0x35,0x83,0xff,0x8d,0x1e,0x00,0xd4,0x35,0x64,0x86,0x1a,0xd9,0xfb,0xfb,0xe9,0x1a,0x73,0x61,0x26,0xf9,0x1e,0x00,0x03,0x5a,0x00,0xf3,0x01,0x47,0xc7,0x37,0xfb,0xfb,0x93,0x76,0xfb,0xfb,0x8a,0x78,0xfb,0xfb,0x49,0xb1,0x47,0x5a,0x00,0x03,0x96,0x00,0xf3,0x01,0x47,0xdc,0x23,0xf9,0xfb,0x79,0x8d,0xfb,0xfb,0x9c,0x66,0xfb,0xfb,0x37,0xc3,0x47,0x96,0x00,0x03,0xd2,0x00,0xf3,0x01,0x47,0xfb,0x62,0x29,0x47,0x23,0xe9,0xfb,0xfb,0xf2,0x29,0x4c,0x3a,0x45,0xfb,0x46,0xd2,0x00,0x03,0x0e,0x01,0x60,0x47,0xfb,0xfb,0xd7,0xba,0xfa,0x96,0x00,0x63,0xfa,0xb7,0xc9,0xfb,0xfb,0x47,0x0e,0x01,0x03,0x4a,0x01,0x29,0x30,0xfb,0x01,0x00,0x14,0x30,0x4a,0x01,0x02,0x86,0x01,0x28,0x04,0xe5,0x1d,0x00,0x24,0xe5,0x04,0x86,0x01,0x03,0xc2,0x01,0x26,0x50,0xf7,0x1d,0x00,0x25,0xf7,0x50,0xc2,0x01,0x04,0xfe,0x01,0x41,0x33,0x9d,0xc7,0xcd,0x01,0x00,0x37,0xc7,0x9d,0x33,0xfe,0x01,0x0f,0x3a,0x02,0x0b,0x0f,0x76,0x02,0x0c,0x0f,0xb2,0x02,0x0c,0x0f,0xee,0x02,0x0c,0x0f,0x2a,0x03,0x0c,0x1e,0x00,0x66,0x03,0x50,0x00,0x00,0x00,0x00,0x00,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

+38 -25
View File
@@ -28,6 +28,8 @@
#if defined(COLORLCD)
#include "bitmaps.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
@@ -36,7 +38,7 @@ void convert_RGB565_to_RGB888(uint8_t* dst, const BitmapBuffer* src, coord_t w,
{
for (int y = 0; y < src->height(); y++) {
for (int x = 0; x < src->width(); x++) {
RGB_SPLIT(*src->getPixelPtr(x, y), r, g, b);
RGB_SPLIT(*src->getPixelPtrAbs(x, y), r, g, b);
*(dst++) = (uint8_t)(r << 3);
*(dst++) = (uint8_t)(g << 2);
*(dst++) = (uint8_t)(b << 3);
@@ -81,7 +83,7 @@ bool checkScreenshot_colorlcd(const BitmapBuffer* dc, const char* test)
for (int y = 0; y < LCD_H; y++) {
for (int x = 0; x < LCD_W; x++) {
if (*testPict->getPixelPtr(x, y) != *dc->getPixelPtr(x, y)) {
if (*testPict->getPixelPtrAbs(x, y) != *dc->getPixelPtrAbs(x, y)) {
dumpImage(filename, dc);
return false;
}
@@ -99,11 +101,11 @@ TEST(Lcd_colorlcd, lines)
dc.setClippingRect(50, 400, 50, 230);
for (int x = 10; x <= 100; x += 10) {
dc.drawLine(x, x, x + 200, x + 50, 0xF0, COLOR_THEME_SECONDARY1);
dc.drawLine(x, x, x + 200, x + 50, DOTTED, COLOR_THEME_SECONDARY1);
}
for (int x = 200; x >= 100; x -= 10) {
dc.drawLine(x, x, x - 50, x + 100, 0xF0, COLOR_THEME_SECONDARY1);
dc.drawLine(x, x, x - 50, x + 100, DOTTED, COLOR_THEME_SECONDARY1);
}
dc.clearClippingRect();
@@ -117,7 +119,7 @@ TEST(Lcd_colorlcd, vline)
dc.clear(COLOR_THEME_SECONDARY3);
for (int x = 0; x < 100; x += 2) {
dc.drawSolidVerticalLine(x, x / 2, 12, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(x, x / 2, 12, SOLID, COLOR_THEME_SECONDARY1);
}
EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "vline"));
}
@@ -187,7 +189,7 @@ TEST(Lcd_colorlcd, transparency)
for (int n = 0; n < 10; n++) {
int x = 120 + n * 20;
int y = 80 + n * 10;
int color = COLOR(n / 2 + 5);
int color = COLOR((n / 2 + 4));
int size = 100;
dc.drawFilledRect(x, y, size, size, SOLID, color, OPACITY(8));
}
@@ -230,22 +232,27 @@ TEST(Lcd_colorlcd, clipping)
dc.clear(COLOR_THEME_SECONDARY3);
dc.drawSolidVerticalLine(100, 0, LCD_H, COLOR_THEME_SECONDARY1);
dc.drawSolidVerticalLine(400, 0, LCD_H, COLOR_THEME_SECONDARY1);
coord_t x1 = LCD_W / 4;
coord_t x2 = x1 * 3;
coord_t y1 = LCD_H / 4;
coord_t y2 = y1 * 3;
dc.drawSolidHorizontalLine(0, 50, LCD_W, COLOR_THEME_SECONDARY1);
dc.drawSolidHorizontalLine(0, 200, LCD_W, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(x1, 0, LCD_H, SOLID, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(x2, 0, LCD_H, SOLID, COLOR_THEME_SECONDARY1);
dc.setClippingRect(100, 400, 50, 200);
dc.drawHorizontalLine(0, y1, LCD_W, SOLID, COLOR_THEME_SECONDARY1);
dc.drawHorizontalLine(0, y2, LCD_W, SOLID, COLOR_THEME_SECONDARY1);
dc.drawSolidHorizontalLine(0, 80, LCD_W, COLOR_THEME_SECONDARY1);
dc.drawHorizontalLine(0, 81, LCD_W, SOLID, COLOR_THEME_SECONDARY1);
dc.setClippingRect(x1, x2, y1, y2);
dc.drawSolidVerticalLine(150, 0, LCD_H, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(151, 0, LCD_H, SOLID, COLOR_THEME_SECONDARY1);
dc.drawHorizontalLine(0, y1 + 30, LCD_W, SOLID, COLOR_THEME_SECONDARY1);
dc.drawHorizontalLine(0, y1 + 31, LCD_W, SOLID, COLOR_THEME_SECONDARY1);
dc.drawSolidRect(70, 20, 50, 50, 2, COLOR_THEME_SECONDARY1);
dc.drawRect(380, 20, 50, 50, 2, SOLID, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(x1 + 50, 0, LCD_H, SOLID, COLOR_THEME_SECONDARY1);
dc.drawVerticalLine(x1 + 51, 0, LCD_H, SOLID, COLOR_THEME_SECONDARY1);
dc.drawSolidRect(x1 - 30, y1 - 30, 50, 50, 2, COLOR_THEME_SECONDARY1);
dc.drawRect(x2 - 20, y1 - 30, 50, 50, 2, SOLID, COLOR_THEME_SECONDARY1);
dc.clearClippingRect();
EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "clipping"));
@@ -268,22 +275,28 @@ TEST(Lcd_colorlcd, bitmap)
EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "bitmap"));
}
static const uint8_t mask_menu_radio[] = {
#include "images/color/mask_menu_radio.lbm"
};
extern MaskBitmap* _decompressed_mask(const uint8_t* lz4_compressed);
TEST(Lcd_colorlcd, masks)
{
BitmapBuffer dc(BMP_RGB565, LCD_W, LCD_H);
dc.clear(COLOR_THEME_SECONDARY3);
BitmapBuffer* mask =
BitmapBuffer::loadMask(TESTS_PATH "/images/color/mask_menu_radio.png");
for (int i = 0; i < LCD_W; i += mask->width()) {
for (int j = 0; j < LCD_H; j += mask->height()) {
dc.drawMask(i, j, mask, COLOR2FLAGS(BLACK));
MaskBitmap* mask = _decompressed_mask(mask_menu_radio);
for (int i = 0; i < LCD_W; i += mask->width) {
for (int j = 0; j < LCD_H; j += mask->height) {
dc.drawBitmapPattern(i, j, mask, COLOR_BLACK);
}
}
EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "masks"));
delete mask;
free(mask);
}
#if 0
@@ -345,9 +358,9 @@ TEST(Lcd_colorlcd, darkmode)
{
BitmapBuffer dc(BMP_RGB565, LCD_W, LCD_H);
dc.clear(COLOR2FLAGS(BLACK));
dc.clear(COLOR_BLACK);
dc.drawText(20, 28, "The quick brown fox jumps over the lazy dog", COLOR2FLAGS(WHITE));
dc.drawText(20, 28, "The quick brown fox jumps over the lazy dog", COLOR_WHITE);
dc.drawSolidFilledRect(28, 56, 422, 2, COLOR2FLAGS(RGB(0xFF, 0, 0)));
dc.drawBitmapPattern(LCD_W/2 - LBM_USB_PLUGGED_W/2,
LCD_H/2 - LBM_USB_PLUGGED_H/2,