chore(format) add formatting for examples & demos, merge test config
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
#if LV_USE_DEMO_WIDGETS
|
||||
|
||||
#if LV_MEM_CUSTOM == 0 && LV_MEM_SIZE < (38ul * 1024ul)
|
||||
#error Insufficient memory for lv_demo_widgets. Please set LV_MEM_SIZE to at least 38KB (38ul * 1024ul). 48KB is recommended.
|
||||
#error Insufficient memory for lv_demo_widgets. Please set LV_MEM_SIZE to at least 38KB (38ul * 1024ul). 48KB is recommended.
|
||||
#endif
|
||||
|
||||
/*********************
|
||||
@@ -25,7 +25,7 @@ typedef enum {
|
||||
DISP_SMALL,
|
||||
DISP_MEDIUM,
|
||||
DISP_LARGE,
|
||||
}disp_size_t;
|
||||
} disp_size_t;
|
||||
|
||||
/**********************
|
||||
* STATIC PROTOTYPES
|
||||
@@ -35,8 +35,10 @@ static void analytics_create(lv_obj_t * parent);
|
||||
static void shop_create(lv_obj_t * parent);
|
||||
static void color_changer_create(lv_obj_t * parent);
|
||||
|
||||
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2, const char * text3);
|
||||
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category, const char * price);
|
||||
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2,
|
||||
const char * text3);
|
||||
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category,
|
||||
const char * price);
|
||||
|
||||
static void color_changer_event_cb(lv_event_t * e);
|
||||
static void color_event_cb(lv_event_t * e);
|
||||
@@ -114,7 +116,8 @@ void lv_demo_widgets(void)
|
||||
#else
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
#endif
|
||||
} else if(disp_size == DISP_MEDIUM) {
|
||||
}
|
||||
else if(disp_size == DISP_MEDIUM) {
|
||||
tab_h = 45;
|
||||
#if LV_FONT_MONTSERRAT_20
|
||||
font_large = &lv_font_montserrat_20;
|
||||
@@ -126,22 +129,24 @@ void lv_demo_widgets(void)
|
||||
#else
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_14 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
#endif
|
||||
} else { /* disp_size == DISP_SMALL */
|
||||
}
|
||||
else { /* disp_size == DISP_SMALL */
|
||||
tab_h = 45;
|
||||
#if LV_FONT_MONTSERRAT_18
|
||||
font_large = &lv_font_montserrat_18;
|
||||
#else
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_18 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_18 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
#endif
|
||||
#if LV_FONT_MONTSERRAT_12
|
||||
font_normal = &lv_font_montserrat_12;
|
||||
#else
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
|
||||
#endif
|
||||
}
|
||||
|
||||
#if LV_USE_THEME_DEFAULT
|
||||
lv_theme_default_init(NULL, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), LV_THEME_DEFAULT_DARK, font_normal);
|
||||
lv_theme_default_init(NULL, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), LV_THEME_DEFAULT_DARK,
|
||||
font_normal);
|
||||
#endif
|
||||
|
||||
lv_style_init(&style_text_muted);
|
||||
@@ -210,7 +215,7 @@ static void profile_create(lv_obj_t * parent)
|
||||
|
||||
lv_obj_t * dsc = lv_label_create(panel1);
|
||||
lv_obj_add_style(dsc, &style_text_muted, 0);
|
||||
lv_label_set_text(dsc, "This is a short description of me. Take a look at my profile!" );
|
||||
lv_label_set_text(dsc, "This is a short description of me. Take a look at my profile!");
|
||||
lv_label_set_long_mode(dsc, LV_LABEL_LONG_WRAP);
|
||||
|
||||
lv_obj_t * email_icn = lv_label_create(panel1);
|
||||
@@ -325,14 +330,14 @@ static void profile_create(lv_obj_t * parent)
|
||||
|
||||
static lv_coord_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_2_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
30, /*Boxes*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
30, /*Boxes*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
30, /*Boxes*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
30, /*Boxes*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
|
||||
@@ -382,27 +387,28 @@ static void profile_create(lv_obj_t * parent)
|
||||
/*Create the top panel*/
|
||||
static lv_coord_t grid_1_col_dsc[] = {LV_GRID_CONTENT, 1, LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_1_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Name*/
|
||||
LV_GRID_CONTENT, /*Description*/
|
||||
LV_GRID_CONTENT, /*Email*/
|
||||
-20,
|
||||
LV_GRID_CONTENT, /*Phone*/
|
||||
LV_GRID_CONTENT, /*Buttons*/
|
||||
LV_GRID_TEMPLATE_LAST};
|
||||
LV_GRID_CONTENT, /*Name*/
|
||||
LV_GRID_CONTENT, /*Description*/
|
||||
LV_GRID_CONTENT, /*Email*/
|
||||
-20,
|
||||
LV_GRID_CONTENT, /*Phone*/
|
||||
LV_GRID_CONTENT, /*Buttons*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
static lv_coord_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_2_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
|
||||
@@ -454,29 +460,30 @@ static void profile_create(lv_obj_t * parent)
|
||||
/*Create the top panel*/
|
||||
static lv_coord_t grid_1_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_1_row_dsc[] = {LV_GRID_CONTENT, /*Avatar*/
|
||||
LV_GRID_CONTENT, /*Name*/
|
||||
LV_GRID_CONTENT, /*Description*/
|
||||
LV_GRID_CONTENT, /*Email*/
|
||||
LV_GRID_CONTENT, /*Phone number*/
|
||||
LV_GRID_CONTENT, /*Button1*/
|
||||
LV_GRID_CONTENT, /*Button2*/
|
||||
LV_GRID_TEMPLATE_LAST};
|
||||
LV_GRID_CONTENT, /*Name*/
|
||||
LV_GRID_CONTENT, /*Description*/
|
||||
LV_GRID_CONTENT, /*Email*/
|
||||
LV_GRID_CONTENT, /*Phone number*/
|
||||
LV_GRID_CONTENT, /*Button1*/
|
||||
LV_GRID_CONTENT, /*Button2*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
lv_obj_set_grid_dsc_array(panel1, grid_1_col_dsc, grid_1_row_dsc);
|
||||
|
||||
|
||||
static lv_coord_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_2_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, LV_GRID_TEMPLATE_LAST /*Box*/
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
5, /*Separator*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, /*Box*/
|
||||
LV_GRID_CONTENT, /*Box title*/
|
||||
40, LV_GRID_TEMPLATE_LAST /*Box*/
|
||||
};
|
||||
|
||||
lv_obj_set_grid_dsc_array(panel2, grid_2_col_dsc, grid_2_row_dsc);
|
||||
@@ -638,7 +645,7 @@ static void analytics_create(lv_obj_t * parent)
|
||||
lv_chart_set_next_value(chart2, ser3, lv_rand(10, 80));
|
||||
|
||||
lv_meter_scale_t * scale;
|
||||
lv_meter_indicator_t *indic;
|
||||
lv_meter_indicator_t * indic;
|
||||
meter1 = create_meter_box(parent, "Monthly Target", "Revenue: 63%", "Sales: 44%", "Costs: 58%");
|
||||
lv_obj_add_flag(lv_obj_get_parent(meter1), LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
|
||||
scale = lv_meter_add_scale(meter1);
|
||||
@@ -715,7 +722,8 @@ static void analytics_create(lv_obj_t * parent)
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 0);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 20);
|
||||
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_RED, 3), lv_palette_darken(LV_PALETTE_RED, 3), true, 0);
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_RED, 3), lv_palette_darken(LV_PALETTE_RED,
|
||||
3), true, 0);
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 0);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 20);
|
||||
|
||||
@@ -723,7 +731,8 @@ static void analytics_create(lv_obj_t * parent)
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 20);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 40);
|
||||
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_BLUE, 3), lv_palette_darken(LV_PALETTE_BLUE, 3), true, 0);
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_BLUE, 3),
|
||||
lv_palette_darken(LV_PALETTE_BLUE, 3), true, 0);
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 20);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 40);
|
||||
|
||||
@@ -731,7 +740,8 @@ static void analytics_create(lv_obj_t * parent)
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 40);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 60);
|
||||
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_GREEN, 3), lv_palette_darken(LV_PALETTE_GREEN, 3), true, 0);
|
||||
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_GREEN, 3),
|
||||
lv_palette_darken(LV_PALETTE_GREEN, 3), true, 0);
|
||||
lv_meter_set_indicator_start_value(meter3, indic, 40);
|
||||
lv_meter_set_indicator_end_value(meter3, indic, 60);
|
||||
|
||||
@@ -758,7 +768,8 @@ static void analytics_create(lv_obj_t * parent)
|
||||
lv_obj_set_size(meter1, 200, 200);
|
||||
lv_obj_set_size(meter2, 200, 200);
|
||||
lv_obj_set_size(meter3, 200, 200);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
lv_coord_t meter_w = lv_obj_get_width(meter1);
|
||||
lv_obj_set_height(meter1, meter_w);
|
||||
lv_obj_set_height(meter2, meter_w);
|
||||
@@ -836,13 +847,14 @@ void shop_create(lv_obj_t * parent)
|
||||
lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 3, 1);
|
||||
lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 4, 1);
|
||||
lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_STRETCH, 0, 5);
|
||||
} else if(disp_size == DISP_MEDIUM) {
|
||||
}
|
||||
else if(disp_size == DISP_MEDIUM) {
|
||||
static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid1_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Title + Date*/
|
||||
LV_GRID_CONTENT, /*Amount + Hint*/
|
||||
200, /*Chart*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
LV_GRID_CONTENT, /*Title + Date*/
|
||||
LV_GRID_CONTENT, /*Amount + Hint*/
|
||||
200, /*Chart*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
lv_obj_update_layout(panel1);
|
||||
@@ -855,15 +867,16 @@ void shop_create(lv_obj_t * parent)
|
||||
lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_CENTER, 1, 1);
|
||||
lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_CENTER, 1, 1);
|
||||
lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_END, 0, 2, LV_GRID_ALIGN_STRETCH, 2, 1);
|
||||
} else if(disp_size == DISP_SMALL) {
|
||||
}
|
||||
else if(disp_size == DISP_SMALL) {
|
||||
static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid1_row_dsc[] = {
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
LV_GRID_CONTENT, /*Date*/
|
||||
LV_GRID_CONTENT, /*Amount*/
|
||||
LV_GRID_CONTENT, /*Hint*/
|
||||
LV_GRID_CONTENT, /*Chart*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
LV_GRID_CONTENT, /*Title*/
|
||||
LV_GRID_CONTENT, /*Date*/
|
||||
LV_GRID_CONTENT, /*Amount*/
|
||||
LV_GRID_CONTENT, /*Hint*/
|
||||
LV_GRID_CONTENT, /*Chart*/
|
||||
LV_GRID_TEMPLATE_LAST
|
||||
};
|
||||
|
||||
lv_obj_set_width(chart3, LV_PCT(95));
|
||||
@@ -883,7 +896,8 @@ void shop_create(lv_obj_t * parent)
|
||||
if(disp_size == DISP_SMALL) {
|
||||
lv_obj_add_flag(list, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
|
||||
lv_obj_set_height(list, LV_PCT(100));
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
lv_obj_set_height(list, LV_PCT(100));
|
||||
lv_obj_set_style_max_height(list, 300, 0);
|
||||
}
|
||||
@@ -907,7 +921,8 @@ void shop_create(lv_obj_t * parent)
|
||||
if(disp_size == DISP_SMALL) {
|
||||
lv_obj_add_flag(notifications, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
|
||||
lv_obj_set_height(notifications, LV_PCT(100));
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
lv_obj_set_height(notifications, LV_PCT(100));
|
||||
lv_obj_set_style_max_height(notifications, 300, 0);
|
||||
}
|
||||
@@ -947,8 +962,9 @@ void shop_create(lv_obj_t * parent)
|
||||
static void color_changer_create(lv_obj_t * parent)
|
||||
{
|
||||
static lv_palette_t palette[] = {
|
||||
LV_PALETTE_BLUE, LV_PALETTE_GREEN, LV_PALETTE_BLUE_GREY, LV_PALETTE_ORANGE,
|
||||
LV_PALETTE_RED, LV_PALETTE_PURPLE, LV_PALETTE_TEAL, _LV_PALETTE_LAST };
|
||||
LV_PALETTE_BLUE, LV_PALETTE_GREEN, LV_PALETTE_BLUE_GREY, LV_PALETTE_ORANGE,
|
||||
LV_PALETTE_RED, LV_PALETTE_PURPLE, LV_PALETTE_TEAL, _LV_PALETTE_LAST
|
||||
};
|
||||
|
||||
lv_obj_t * color_cont = lv_obj_create(parent);
|
||||
lv_obj_remove_style_all(color_cont);
|
||||
@@ -987,12 +1003,13 @@ static void color_changer_create(lv_obj_t * parent)
|
||||
lv_obj_set_style_bg_img_src(btn, LV_SYMBOL_TINT, 0);
|
||||
|
||||
if(disp_size == DISP_SMALL) {
|
||||
lv_obj_set_size(btn, LV_DPX(42), LV_DPX(42));
|
||||
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
|
||||
} else {
|
||||
lv_obj_set_size(btn, LV_DPX(50), LV_DPX(50));
|
||||
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
|
||||
}
|
||||
lv_obj_set_size(btn, LV_DPX(42), LV_DPX(42));
|
||||
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
|
||||
}
|
||||
else {
|
||||
lv_obj_set_size(btn, LV_DPX(50), LV_DPX(50));
|
||||
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
|
||||
}
|
||||
}
|
||||
|
||||
static void color_changer_anim_cb(void * var, int32_t v)
|
||||
@@ -1005,7 +1022,8 @@ static void color_changer_anim_cb(void * var, int32_t v)
|
||||
w = lv_map(v, 0, 256, LV_DPX(52), max_w);
|
||||
lv_obj_set_width(obj, w);
|
||||
lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10));
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
w = lv_map(v, 0, 256, LV_DPX(60), max_w);
|
||||
lv_obj_set_width(obj, w);
|
||||
lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10));
|
||||
@@ -1020,7 +1038,7 @@ static void color_changer_anim_cb(void * var, int32_t v)
|
||||
|
||||
}
|
||||
|
||||
static void color_changer_event_cb(lv_event_t *e)
|
||||
static void color_changer_event_cb(lv_event_t * e)
|
||||
{
|
||||
if(lv_event_get_code(e) == LV_EVENT_CLICKED) {
|
||||
lv_obj_t * color_cont = lv_event_get_user_data(e);
|
||||
@@ -1032,7 +1050,8 @@ static void color_changer_event_cb(lv_event_t *e)
|
||||
lv_anim_set_values(&a, 0, 256);
|
||||
lv_anim_set_time(&a, 200);
|
||||
lv_anim_start(&a);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
lv_anim_t a;
|
||||
lv_anim_init(&a);
|
||||
lv_anim_set_var(&a, color_cont);
|
||||
@@ -1065,7 +1084,8 @@ static void color_event_cb(lv_event_t * e)
|
||||
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use another palette as secondary*/
|
||||
if(palette_secondary >= _LV_PALETTE_LAST) palette_secondary = 0;
|
||||
|
||||
lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary), LV_THEME_DEFAULT_DARK, font_normal);
|
||||
lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary),
|
||||
LV_THEME_DEFAULT_DARK, font_normal);
|
||||
|
||||
lv_color_t color = lv_palette_main(*palette_primary);
|
||||
lv_style_set_text_color(&style_icon, color);
|
||||
@@ -1074,7 +1094,8 @@ static void color_event_cb(lv_event_t * e)
|
||||
}
|
||||
}
|
||||
|
||||
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2, const char * text3)
|
||||
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2,
|
||||
const char * text3)
|
||||
{
|
||||
lv_obj_t * cont = lv_obj_create(parent);
|
||||
lv_obj_set_height(cont, LV_SIZE_CONTENT);
|
||||
@@ -1114,7 +1135,7 @@ static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const
|
||||
lv_label_set_text(label3, text3);
|
||||
|
||||
if(disp_size == DISP_MEDIUM) {
|
||||
static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT,LV_GRID_FR(8), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT, LV_GRID_FR(8), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_row_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
|
||||
lv_obj_set_grid_dsc_array(cont, grid_col_dsc, grid_row_dsc);
|
||||
@@ -1146,7 +1167,8 @@ static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const
|
||||
|
||||
}
|
||||
|
||||
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category, const char * price)
|
||||
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category,
|
||||
const char * price)
|
||||
{
|
||||
static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, 5, LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
static lv_coord_t grid_row_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
|
||||
@@ -1257,9 +1279,10 @@ static void slider_event_cb(lv_event_t * e)
|
||||
lv_obj_t * obj = lv_event_get_target(e);
|
||||
|
||||
if(code == LV_EVENT_REFR_EXT_DRAW_SIZE) {
|
||||
lv_coord_t *s = lv_event_get_param(e);
|
||||
lv_coord_t * s = lv_event_get_param(e);
|
||||
*s = LV_MAX(*s, 60);
|
||||
} else if(code == LV_EVENT_DRAW_PART_END) {
|
||||
}
|
||||
else if(code == LV_EVENT_DRAW_PART_END) {
|
||||
lv_obj_draw_part_dsc_t * dsc = lv_event_get_param(e);
|
||||
if(dsc->part == LV_PART_KNOB && lv_obj_has_state(obj, LV_STATE_PRESSED)) {
|
||||
char buf[8];
|
||||
@@ -1310,7 +1333,8 @@ static void chart_event_cb(lv_event_t * e)
|
||||
if(lv_chart_get_type(obj) == LV_CHART_TYPE_BAR) {
|
||||
const char * month[] = {"I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII"};
|
||||
lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
const char * month[] = {"Jan", "Febr", "March", "Apr", "May", "Jun", "July", "Aug", "Sept", "Oct", "Nov", "Dec"};
|
||||
lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]);
|
||||
}
|
||||
@@ -1322,13 +1346,15 @@ static void chart_event_cb(lv_event_t * e)
|
||||
/*Add a line mask that keeps the area below the line*/
|
||||
if(dsc->p1 && dsc->p2) {
|
||||
lv_draw_mask_line_param_t line_mask_param;
|
||||
lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y, LV_DRAW_MASK_LINE_SIDE_BOTTOM);
|
||||
lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y,
|
||||
LV_DRAW_MASK_LINE_SIDE_BOTTOM);
|
||||
int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL);
|
||||
|
||||
/*Add a fade effect: transparent bottom covering top*/
|
||||
lv_coord_t h = lv_obj_get_height(obj);
|
||||
lv_draw_mask_fade_param_t fade_mask_param;
|
||||
lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP, obj->coords.y2);
|
||||
lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP,
|
||||
obj->coords.y2);
|
||||
int16_t fade_mask_id = lv_draw_mask_add(&fade_mask_param, NULL);
|
||||
|
||||
/*Draw a rectangle that will be affected by the mask*/
|
||||
@@ -1361,7 +1387,8 @@ static void chart_event_cb(lv_event_t * e)
|
||||
if(lv_chart_get_type(obj) == LV_CHART_TYPE_LINE) {
|
||||
dsc->rect_dsc->outline_color = lv_color_white();
|
||||
dsc->rect_dsc->outline_width = 2;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
dsc->rect_dsc->shadow_color = ser->color;
|
||||
dsc->rect_dsc->shadow_width = 15;
|
||||
dsc->rect_dsc->shadow_spread = 0;
|
||||
@@ -1380,11 +1407,13 @@ static void chart_event_cb(lv_event_t * e)
|
||||
if(ser == lv_chart_get_series_next(obj, NULL)) {
|
||||
txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2;
|
||||
txt_area.x2 = txt_area.x1 + text_size.x;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
txt_area.x2 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2;
|
||||
txt_area.x1 = txt_area.x2 - text_size.x;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2 - text_size.x / 2;
|
||||
txt_area.x2 = txt_area.x1 + text_size.x;
|
||||
txt_area.y2 = dsc->draw_area->y1 - LV_DPX(15);
|
||||
@@ -1408,7 +1437,8 @@ static void chart_event_cb(lv_event_t * e)
|
||||
label_dsc.color = lv_color_white();
|
||||
label_dsc.font = font_normal;
|
||||
lv_draw_label(dsc->draw_ctx, &label_dsc, &txt_area, buf, NULL);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
dsc->rect_dsc->outline_width = 0;
|
||||
dsc->rect_dsc->shadow_width = 0;
|
||||
}
|
||||
@@ -1455,15 +1485,15 @@ static void shop_chart_event_cb(lv_event_t * e)
|
||||
lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
|
||||
|
||||
a.y1 = a.y2 - 4; /*-4 to overlap the radius*/
|
||||
a.y2 = a.y1 + (clothes[dsc->id] * h) / 100;
|
||||
a.y2 = a.y1 + (clothes[dsc->id] * h) / 100;
|
||||
draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_BLUE);
|
||||
draw_rect_dsc.radius = 0;
|
||||
lv_draw_rect( dsc->draw_ctx, &draw_rect_dsc, &a);
|
||||
lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
|
||||
|
||||
a.y1 = a.y2;
|
||||
a.y2 = a.y1 + (services[dsc->id] * h) / 100;
|
||||
draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_GREEN);
|
||||
lv_draw_rect( dsc->draw_ctx, &draw_rect_dsc, &a);
|
||||
lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1509,7 +1539,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
|
||||
if(down1) {
|
||||
session_desktop -= 137;
|
||||
if(session_desktop < 1400) down1 = false;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
session_desktop += 116;
|
||||
if(session_desktop > 4500) down1 = true;
|
||||
}
|
||||
@@ -1517,7 +1548,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
|
||||
if(down2) {
|
||||
session_tablet -= 3;
|
||||
if(session_tablet < 1400) down2 = false;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
session_tablet += 9;
|
||||
if(session_tablet > 4500) down2 = true;
|
||||
}
|
||||
@@ -1525,7 +1557,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
|
||||
if(down3) {
|
||||
session_mobile -= 57;
|
||||
if(session_mobile < 1400) down3 = false;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
session_mobile += 76;
|
||||
if(session_mobile > 4500) down3 = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user