Skip to content

Initialize LVGL Theme #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Initialize LVGL Theme #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc667ea
initialize theme to default dark
AndrewLuGit May 10, 2023
ec50072
Update format.yml
AndrewLuGit May 10, 2023
0ea836f
use macro to configure dark theme
AndrewLuGit May 11, 2023
6a3a3a8
Merge branch 'bugfix/initialize-theme' of https://github.com/purduesi…
AndrewLuGit May 11, 2023
eec2cc3
remove multiple definition in lv_conf.h
AndrewLuGit May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 1 addition & 12 deletions include/liblvgl/lv_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdint.h> /*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
Expand Down Expand Up @@ -647,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

Expand Down
1 change: 0 additions & 1 deletion src/liblvgl/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ void display_initialize(void) {
printf("Error initializing input driver\n");
}

// lv_theme_set_current(lv_theme_alien_init(40, NULL));
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);
Expand Down