From fc667eab26f2f65af6ffd7b30a4668cc34e115a0 Mon Sep 17 00:00:00 2001 From: Andrew Lu Date: Wed, 10 May 2023 16:51:30 -0700 Subject: [PATCH 1/4] initialize theme to default dark --- src/liblvgl/display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/liblvgl/display.c b/src/liblvgl/display.c index 8ab561e..f512418 100644 --- a/src/liblvgl/display.c +++ b/src/liblvgl/display.c @@ -117,7 +117,12 @@ void display_initialize(void) { printf("Error initializing input driver\n"); } - // lv_theme_set_current(lv_theme_alien_init(40, NULL)); + lv_theme_t *th = lv_theme_default_init(lv_disp_get_default(), + lv_palette_main(LV_PALETTE_BLUE), + lv_palette_main(LV_PALETTE_CYAN), + true, + LV_FONT_DEFAULT); + lv_disp_set_theme(lv_disp_get_default(), th); lv_obj_t* page = lv_obj_create(NULL); lv_obj_set_size(page, LV_HOR_RES_MAX, LV_VER_RES_MAX); lv_scr_load(page); From ec50072c1302a6e1c3088f4d6054c7bc86814da0 Mon Sep 17 00:00:00 2001 From: Andrew Lu Date: Wed, 10 May 2023 19:59:05 -0400 Subject: [PATCH 2/4] Update format.yml --- .github/workflows/format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 0569d56..ee024e1 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -12,7 +12,7 @@ jobs: steps: # check out HEAD on the branch - name: checkout code - uses: actions/checkout@3 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} # format the latest commit From 0ea836f2b15801107c0b299a72dc2c480e31a61d Mon Sep 17 00:00:00 2001 From: Andrew Lu Date: Wed, 10 May 2023 18:36:48 -0700 Subject: [PATCH 3/4] use macro to configure dark theme --- include/liblvgl/lv_conf.h | 10 +--------- src/liblvgl/display.c | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/liblvgl/lv_conf.h b/include/liblvgl/lv_conf.h index d4763fd..812074d 100644 --- a/include/liblvgl/lv_conf.h +++ b/include/liblvgl/lv_conf.h @@ -485,15 +485,7 @@ typedef void * lv_font_user_data_t; * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ #define LV_USE_THEME_MONO 1 -#define LV_THEME_DEFAULT_INCLUDE /*Include a header for the init. function*/ -#define LV_THEME_DEFAULT_INIT lv_theme_material_init -#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) -#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) -#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 -#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 -#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 +#define CONFIG_LV_THEME_DEFAULT_DARK 1 /*================= * Text settings diff --git a/src/liblvgl/display.c b/src/liblvgl/display.c index f512418..3fb8d46 100644 --- a/src/liblvgl/display.c +++ b/src/liblvgl/display.c @@ -117,12 +117,6 @@ void display_initialize(void) { printf("Error initializing input driver\n"); } - lv_theme_t *th = lv_theme_default_init(lv_disp_get_default(), - lv_palette_main(LV_PALETTE_BLUE), - lv_palette_main(LV_PALETTE_CYAN), - true, - LV_FONT_DEFAULT); - lv_disp_set_theme(lv_disp_get_default(), th); lv_obj_t* page = lv_obj_create(NULL); lv_obj_set_size(page, LV_HOR_RES_MAX, LV_VER_RES_MAX); lv_scr_load(page); From eec2cc361247ac7c59cef584f858b1a0a51d8243 Mon Sep 17 00:00:00 2001 From: Andrew Lu Date: Wed, 10 May 2023 18:53:36 -0700 Subject: [PATCH 4/4] remove multiple definition in lv_conf.h --- include/liblvgl/lv_conf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/liblvgl/lv_conf.h b/include/liblvgl/lv_conf.h index 812074d..b83d8eb 100644 --- a/include/liblvgl/lv_conf.h +++ b/include/liblvgl/lv_conf.h @@ -639,9 +639,6 @@ typedef void * lv_obj_user_data_t; /*Label (dependencies: -*/ #define LV_USE_LABEL 1 #if LV_USE_LABEL != 0 -/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/ -# define LV_LABEL_DEF_SCROLL_SPEED 25 - /* Waiting period at beginning/end of animation cycle */ # define LV_LABEL_WAIT_CHAR_COUNT 3