refactor(btn, img): rename btn to button and img to image

demos/benchmark/assets/img_benchmark_cogwheel_alpha256.c

@@ -21,11 +21,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_BENCHMARK_COGWHEEL_ALPHA256
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_BENCHMARK_COGWHEEL_ALPHA256
-    #define LV_ATTRIBUTE_IMG_IMG_BENCHMARK_COGWHEEL_ALPHA256
+    #define LV_ATTRIBUTE_IMAGE_IMG_BENCHMARK_COGWHEEL_ALPHA256
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_BENCHMARK_COGWHEEL_ALPHA256 uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_BENCHMARK_COGWHEEL_ALPHA256 uint8_t
 img_benchmark_cogwheel_alpha256_map[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6d, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -129,7 +129,7 @@ img_benchmark_cogwheel_alpha256_map[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x09, 0x0c, 0x0c, 0x0b, 0x10, 0x18, 0x12, 0x0b, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const lv_img_dsc_t img_benchmark_cogwheel_alpha256 = {
+const lv_image_dsc_t img_benchmark_cogwheel_alpha256 = {
     .header.cf = LV_COLOR_FORMAT_A8,
     .header.always_zero = 0,
     .header.w = 100,

demos/benchmark/assets/img_benchmark_cogwheel_argb.c

@@ -6,11 +6,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_COGWHEEL_ARGB
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_ARGB
-    #define LV_ATTRIBUTE_IMG_IMG_COGWHEEL_ARGB
+    #define LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_ARGB
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_ARGB uint8_t img_benchmark_cogwheel_argb_map[] = {
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_ARGB uint8_t img_benchmark_cogwheel_argb_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Alpha 8 bit, Red: 3 bit, Green: 3 bit, Blue: 2 bit*/
     0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x08, 0x97, 0xff, 0x72, 0xff, 0x72, 0xff, 0x72, 0xff, 0x72, 0xff, 0x72, 0xff, 0x92, 0xff, 0xdb, 0x6c, 0xff, 0x03, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
@@ -421,7 +421,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_ARGB uint8_t img_benc
 #endif
 };
 
-const lv_img_dsc_t img_benchmark_cogwheel_argb = {
+const lv_image_dsc_t img_benchmark_cogwheel_argb = {
     .header.always_zero = 0,
     .header.w = 100,
     .header.h = 100,

demos/benchmark/assets/img_benchmark_cogwheel_indexed16.c

@@ -6,11 +6,12 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_COGWHEEL_INDEXED16
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_INDEXED16
-    #define LV_ATTRIBUTE_IMG_IMG_COGWHEEL_INDEXED16
+    #define LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_INDEXED16
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_INDEXED16 uint8_t img_benchmark_cogwheel_indexed16_map[] = {
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_INDEXED16 uint8_t img_benchmark_cogwheel_indexed16_map[] =
+{
     0x00, 0x00, 0x00, 0x00,   /*Color of index 0*/
     0x6c, 0x5e, 0x4a, 0xff,   /*Color of index 1*/
     0x72, 0x64, 0x50, 0xff,   /*Color of index 2*/
@@ -130,7 +131,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_INDEXED16 uint8_t img
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const lv_img_dsc_t img_benchmark_cogwheel_indexed16 = {
+const lv_image_dsc_t img_benchmark_cogwheel_indexed16 = {
     .header.always_zero = 0,
     .header.w = 100,
     .header.h = 100,

demos/benchmark/assets/img_benchmark_cogwheel_rgb.c

@@ -6,11 +6,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_COGWHEEL_RGB
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_RGB
-    #define LV_ATTRIBUTE_IMG_IMG_COGWHEEL_RGB
+    #define LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_RGB
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_RGB uint8_t img_benchmark_cogwheel_rgb_map[] = {
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_RGB uint8_t img_benchmark_cogwheel_rgb_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Red: 3 bit, Green: 3 bit, Blue: 2 bit*/
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x97, 0x72, 0x72, 0x72, 0x72, 0x72, 0x92, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -322,7 +322,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_IMG_COGWHEEL_RGB uint8_t img_bench
 #endif
 };
 
-const lv_img_dsc_t img_benchmark_cogwheel_rgb = {
+const lv_image_dsc_t img_benchmark_cogwheel_rgb = {
     .header.always_zero = 0,
     .header.w = 100,
     .header.h = 100,

demos/benchmark/lv_demo_benchmark.c

@@ -79,14 +79,14 @@ static uint32_t disp_ori_timer_period;
 static uint32_t anim_ori_timer_period;
 
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
-    LV_IMG_DECLARE(img_benchmark_cogwheel_rgb565a8);
+    LV_IMAGE_DECLARE(img_benchmark_cogwheel_rgb565a8);
 #else
-    LV_IMG_DECLARE(img_benchmark_cogwheel_argb);
+    LV_IMAGE_DECLARE(img_benchmark_cogwheel_argb);
 #endif
-LV_IMG_DECLARE(img_benchmark_cogwheel_rgb);
+LV_IMAGE_DECLARE(img_benchmark_cogwheel_rgb);
-LV_IMG_DECLARE(img_benchmark_cogwheel_chroma_keyed);
+LV_IMAGE_DECLARE(img_benchmark_cogwheel_chroma_keyed);
-LV_IMG_DECLARE(img_benchmark_cogwheel_indexed16);
+LV_IMAGE_DECLARE(img_benchmark_cogwheel_indexed16);
-LV_IMG_DECLARE(img_benchmark_cogwheel_alpha256);
+LV_IMAGE_DECLARE(img_benchmark_cogwheel_alpha256);
 
 #if LV_USE_FONT_COMPRESSED
     LV_FONT_DECLARE(lv_font_benchmark_montserrat_12_compr_az);
@@ -269,14 +269,14 @@ static void shadow_large_ofs_cb(void)
 static void img_rgb_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, false, false, false);
 }
 
 static void img_argb_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
 
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, false, false, false);
@@ -288,7 +288,7 @@ static void img_argb_cb(void)
 static void img_index_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_indexed16, false, false, false);
 
 }
@@ -296,7 +296,7 @@ static void img_index_cb(void)
 static void img_alpha_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_alpha256, false, false, false);
 }
 
@@ -304,8 +304,8 @@ static void img_alpha_cb(void)
 static void img_rgb_recolor_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
-    lv_style_set_img_recolor_opa(&style_common, LV_OPA_50);
+    lv_style_set_image_recolor_opa(&style_common, LV_OPA_50);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, false, false, false);
 
 }
@@ -313,8 +313,8 @@ static void img_rgb_recolor_cb(void)
 static void img_argb_recolor_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
-    lv_style_set_img_recolor_opa(&style_common, LV_OPA_50);
+    lv_style_set_image_recolor_opa(&style_common, LV_OPA_50);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, false, false, false);
 #else
@@ -325,8 +325,8 @@ static void img_argb_recolor_cb(void)
 static void img_index_recolor_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
-    lv_style_set_img_recolor_opa(&style_common, LV_OPA_50);
+    lv_style_set_image_recolor_opa(&style_common, LV_OPA_50);
     img_create(&style_common, &img_benchmark_cogwheel_indexed16, false, false, false);
 
 }
@@ -334,21 +334,21 @@ static void img_index_recolor_cb(void)
 static void img_rgb_rot_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, true, false, false);
 }
 
 static void img_rgb_rot_aa_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, true, false, true);
 }
 
 static void img_argb_rot_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, true, false, false);
 #else
@@ -359,7 +359,7 @@ static void img_argb_rot_cb(void)
 static void img_argb_rot_aa_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, true, false, true);
 #else
@@ -370,7 +370,7 @@ static void img_argb_rot_aa_cb(void)
 static void img_rgb_zoom_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, false, true, false);
 
 }
@@ -378,7 +378,7 @@ static void img_rgb_zoom_cb(void)
 static void img_rgb_zoom_aa_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, false, true, true);
 
 
@@ -387,7 +387,7 @@ static void img_rgb_zoom_aa_cb(void)
 static void img_argb_zoom_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, false, true, false);
 #else
@@ -399,7 +399,7 @@ static void img_argb_zoom_cb(void)
 static void img_argb_zoom_aa_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, false, true, true);
 #else
@@ -520,10 +520,10 @@ static void sub_shadow_cb(void)
 
 }
 
-static void sub_img_cb(void)
+static void sub_image_cb(void)
 {
     lv_style_reset(&style_common);
-    lv_style_set_img_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
+    lv_style_set_image_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER);
     lv_style_set_blend_mode(&style_common, LV_BLEND_MODE_SUBTRACTIVE);
 #if LV_DEMO_BENCHMARK_RGB565A8 && LV_COLOR_DEPTH == 16
     img_create(&style_common, &img_benchmark_cogwheel_rgb565a8, false, false, false);
@@ -619,7 +619,7 @@ static scene_dsc_t scenes[] = {
     {.name = "Substr. rectangle",            .weight = 10, .create_cb = sub_rectangle_cb},
     {.name = "Substr. border",               .weight = 10, .create_cb = sub_border_cb},
     {.name = "Substr. shadow",               .weight = 10, .create_cb = sub_shadow_cb},
-    {.name = "Substr. image",                .weight = 10, .create_cb = sub_img_cb},
+    {.name = "Substr. image",                .weight = 10, .create_cb = sub_image_cb},
     {.name = "Substr. line",                 .weight = 10, .create_cb = sub_line_cb},
     {.name = "Substr. arc",                  .weight = 10, .create_cb = sub_arc_cb},
     {.name = "Substr. text",                 .weight = 10, .create_cb = sub_text_cb},
@@ -1108,15 +1108,15 @@ static void img_create(lv_style_t * style, const void * src, bool rotate, bool z
 {
     uint32_t i;
     for(i = 0; i < (uint32_t)IMG_NUM; i++) {
-        lv_obj_t * obj = lv_img_create(scene_bg);
+        lv_obj_t * obj = lv_image_create(scene_bg);
         lv_obj_remove_style_all(obj);
         lv_obj_add_style(obj, style, 0);
-        lv_img_set_src(obj, src);
+        lv_image_set_src(obj, src);
-        lv_obj_set_style_img_recolor(obj, lv_color_hex(rnd_next(0, 0xFFFFF0)), 0);
+        lv_obj_set_style_image_recolor(obj, lv_color_hex(rnd_next(0, 0xFFFFF0)), 0);
 
-        if(rotate) lv_img_set_angle(obj, rnd_next(0, 3599));
+        if(rotate) lv_image_set_angle(obj, rnd_next(0, 3599));
-        if(zoom) lv_img_set_zoom(obj, rnd_next(IMG_ZOOM_MIN, IMG_ZOOM_MAX));
+        if(zoom) lv_image_set_zoom(obj, rnd_next(IMG_ZOOM_MIN, IMG_ZOOM_MAX));
-        lv_img_set_antialias(obj, aa);
+        lv_image_set_antialias(obj, aa);
 
         fall_anim(obj);
     }

demos/flex_layout/lv_demo_flex_layout_view.c

@@ -114,7 +114,7 @@ void view_create(lv_obj_t * par, view_t * ui)
 
 static lv_obj_t * btn_create(lv_obj_t * par, const char * str, lv_color_t color)
 {
-    lv_obj_t * btn = lv_btn_create(par);
+    lv_obj_t * btn = lv_button_create(par);
     lv_obj_set_width(btn, lv_pct(30));
     lv_obj_set_height(btn, 30);
     lv_obj_set_style_border_width(btn, 0, LV_PART_MAIN);

demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c

@@ -60,11 +60,11 @@ void view_ctrl_pad_create(lv_obj_t * par, view_t * ui)
     lv_obj_set_style_radius(tv, 0, 0);
     lv_obj_set_style_bg_color(tv, lv_color_hex(0xffffff), 0);
 
-    lv_obj_t * btns = lv_tabview_get_tab_btns(tv);
+    lv_obj_t * buttons = lv_tabview_get_tab_buttons(tv);
-    lv_obj_set_style_outline_width(btns, 0,  LV_PART_ITEMS | LV_STATE_FOCUS_KEY);
+    lv_obj_set_style_outline_width(buttons, 0,  LV_PART_ITEMS | LV_STATE_FOCUS_KEY);
-    lv_obj_set_style_outline_width(btns, 0,   LV_STATE_FOCUS_KEY);
+    lv_obj_set_style_outline_width(buttons, 0,   LV_STATE_FOCUS_KEY);
-    lv_obj_set_style_bg_color(btns, lv_color_white(), LV_PART_ITEMS | LV_STATE_CHECKED);
+    lv_obj_set_style_bg_color(buttons, lv_color_white(), LV_PART_ITEMS | LV_STATE_CHECKED);
-    lv_obj_set_height(btns, 40);
+    lv_obj_set_height(buttons, 40);
 
     ui->ctrl_pad.tab.view = tv;
 
@@ -188,7 +188,7 @@ static lv_obj_t * spinbox_ctrl_create(lv_obj_t * par, lv_style_prop_t prop, lv_o
         lv_style_set_text_color(&btn_style, lv_theme_get_color_primary(par));
     }
 
-    lv_obj_t * btn_dec = lv_btn_create(cont_spinbox);
+    lv_obj_t * btn_dec = lv_button_create(cont_spinbox);
     lv_obj_set_width(btn_dec, 30);
     lv_obj_add_style(btn_dec, &btn_style, LV_PART_MAIN);
     label = lv_label_create(btn_dec);
@@ -208,7 +208,7 @@ static lv_obj_t * spinbox_ctrl_create(lv_obj_t * par, lv_style_prop_t prop, lv_o
     lv_spinbox_set_digit_format(spinbox, 3, 0);
     lv_spinbox_step_prev(spinbox);
 
-    lv_obj_t * btn_inc = lv_btn_create(cont_spinbox);
+    lv_obj_t * btn_inc = lv_button_create(cont_spinbox);
     lv_obj_set_width(btn_inc, 30);
     lv_obj_add_style(btn_inc, &btn_style, LV_PART_MAIN);
     label = lv_label_create(btn_inc);

demos/keypad_encoder/lv_demo_keypad_encoder.c

@@ -102,7 +102,7 @@ static void selectors_create(lv_obj_t * parent)
     obj = lv_calendar_create(parent);
     lv_obj_add_flag(obj, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
 
-    obj = lv_btnmatrix_create(parent);
+    obj = lv_buttonmatrix_create(parent);
     lv_obj_add_flag(obj, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
 
     obj = lv_checkbox_create(parent);
@@ -130,13 +130,13 @@ static void selectors_create(lv_obj_t * parent)
         lv_obj_set_height(list, lv_obj_get_content_height(parent));
     }
 
-    lv_list_add_btn(list, LV_SYMBOL_OK, "Apply");
+    lv_list_add_button(list, LV_SYMBOL_OK, "Apply");
-    lv_list_add_btn(list, LV_SYMBOL_CLOSE, "Close");
+    lv_list_add_button(list, LV_SYMBOL_CLOSE, "Close");
-    lv_list_add_btn(list, LV_SYMBOL_EYE_OPEN, "Show");
+    lv_list_add_button(list, LV_SYMBOL_EYE_OPEN, "Show");
-    lv_list_add_btn(list, LV_SYMBOL_EYE_CLOSE, "Hide");
+    lv_list_add_button(list, LV_SYMBOL_EYE_CLOSE, "Hide");
-    lv_list_add_btn(list, LV_SYMBOL_TRASH, "Delete");
+    lv_list_add_button(list, LV_SYMBOL_TRASH, "Delete");
-    lv_list_add_btn(list, LV_SYMBOL_COPY, "Copy");
+    lv_list_add_button(list, LV_SYMBOL_COPY, "Copy");
-    lv_list_add_btn(list, LV_SYMBOL_PASTE, "Paste");
+    lv_list_add_button(list, LV_SYMBOL_PASTE, "Paste");
 }
 
 static void text_input_create(lv_obj_t * parent)
@@ -162,11 +162,11 @@ static void text_input_create(lv_obj_t * parent)
 
 static void msgbox_create(void)
 {
-    static const char * btns[] = {"Ok", "Cancel", ""};
+    static const char * buttons[] = {"Ok", "Cancel", ""};
-    lv_obj_t * mbox = lv_msgbox_create(NULL, "Hi", "Welcome to the keyboard and encoder demo", btns, false);
+    lv_obj_t * mbox = lv_msgbox_create(NULL, "Hi", "Welcome to the keyboard and encoder demo", buttons, false);
     lv_obj_add_event(mbox, msgbox_event_cb, LV_EVENT_ALL, NULL);
-    lv_group_focus_obj(lv_msgbox_get_btns(mbox));
+    lv_group_focus_obj(lv_msgbox_get_buttons(mbox));
-    lv_obj_add_state(lv_msgbox_get_btns(mbox), LV_STATE_FOCUS_KEY);
+    lv_obj_add_state(lv_msgbox_get_buttons(mbox), LV_STATE_FOCUS_KEY);
     lv_group_focus_freeze(g, true);
 
     lv_obj_align(mbox, LV_ALIGN_CENTER, 0, 0);
@@ -182,7 +182,7 @@ static void msgbox_event_cb(lv_event_t * e)
     lv_obj_t * msgbox = lv_event_get_current_target(e);
 
     if(code == LV_EVENT_VALUE_CHANGED) {
-        const char * txt = lv_msgbox_get_active_btn_text(msgbox);
+        const char * txt = lv_msgbox_get_active_button_text(msgbox);
         if(txt) {
             lv_msgbox_close(msgbox);
             lv_group_focus_freeze(g, false);

demos/keypad_encoder/lv_demo_keypad_encoder.py

@@ -45,7 +45,7 @@ class KeyboardEncoder:
         obj = lv.calendar(parent)
         obj.add_flag(lv.obj.FLAG.SCROLL_ON_FOCUS)
 
-        obj = lv.btnmatrix(parent)
+        obj = lv.buttonmatrix(parent)
         obj.add_flag(lv.obj.FLAG.SCROLL_ON_FOCUS)
         obj = lv.checkbox(parent)
         obj.add_flag(lv.obj.FLAG.SCROLL_ON_FOCUS);
@@ -71,13 +71,13 @@ class KeyboardEncoder:
         if list.get_height() > parent.get_content_height() :
             list.set_height(parent.get_content_height())
 
-            list.add_btn(lv.SYMBOL.OK, "Apply")
+            list.add_button(lv.SYMBOL.OK, "Apply")
-            list.add_btn(lv.SYMBOL.CLOSE, "Close")
+            list.add_button(lv.SYMBOL.CLOSE, "Close")
-            list.add_btn(lv.SYMBOL.EYE_OPEN, "Show")
+            list.add_button(lv.SYMBOL.EYE_OPEN, "Show")
-            list.add_btn(lv.SYMBOL.EYE_CLOSE, "Hide")
+            list.add_button(lv.SYMBOL.EYE_CLOSE, "Hide")
-            list.add_btn(lv.SYMBOL.TRASH, "Delete")
+            list.add_button(lv.SYMBOL.TRASH, "Delete")
-            list.add_btn(lv.SYMBOL.COPY, "Copy")
+            list.add_button(lv.SYMBOL.COPY, "Copy")
-            list.add_btn(lv.SYMBOL.PASTE, "Paste")
+            list.add_button(lv.SYMBOL.PASTE, "Paste")
 
     def text_input_create(self,parent) :
 
@@ -102,11 +102,11 @@ class KeyboardEncoder:
 
     def msgbox_create(self):
 
-        btns = ["Ok", "Cancel", ""]
+        buttons = ["Ok", "Cancel", ""]
-        mbox = lv.msgbox(None, "Hi", "Welcome to the keyboard and encoder demo", btns, False)
+        mbox = lv.msgbox(None, "Hi", "Welcome to the keyboard and encoder demo", buttons, False)
         mbox.add_event(self.msgbox_event_cb, lv.EVENT.ALL, None)
-        lv.group_focus_obj(mbox.get_btns())
+        lv.group_focus_obj(mbox.get_buttons())
-        mbox.get_btns().add_state(lv.STATE.FOCUS_KEY)
+        mbox.get_buttons().add_state(lv.STATE.FOCUS_KEY)
         self.g.focus_freeze(True)
 
         mbox.align(lv.ALIGN.CENTER, 0, 0)
@@ -122,7 +122,7 @@ class KeyboardEncoder:
         msgbox = e.get_target()
 
         if code == lv.EVENT.VALUE_CHANGED:
-            txt = msgbox.get_active_btn_text()
+            txt = msgbox.get_active_button_text()
             if txt:
                 msgbox.close()
                 self.g.focus_freeze(False)

demos/multilang/assets/emojis/img_emoji_artist_palette.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_ARTIST_PALETTE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ARTIST_PALETTE
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_ARTIST_PALETTE
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ARTIST_PALETTE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_ARTIST_PALETTE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ARTIST_PALETTE uint8_t
 img_emoji_artist_palette_map[] = {
     0xfe, 0xfa, 0xff, 0xff, 0xf0, 0xf4, 0xf9, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xf0, 0xfa, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfc, 0xf3, 0xe9, 0xff, 0xef, 0xff, 0xed, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xe4, 0xf7, 0xfc, 0xff, 0xcd, 0xe6, 0xf0, 0xff, 0xcb, 0xe5, 0xf3, 0xff, 0xe6, 0xf6, 0xff, 0xff, 0xfb, 0xfa, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xf0, 0xfe, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff,
     0xfd, 0xfc, 0xff, 0xff, 0xf0, 0xff, 0xec, 0xff, 0xf3, 0xff, 0xea, 0xff, 0xfa, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xf2, 0xf6, 0xf7, 0xff, 0xb2, 0xd8, 0xea, 0xff, 0x82, 0xca, 0xf4, 0xff, 0x85, 0xaa, 0xee, 0xff, 0x88, 0xb4, 0xf3, 0xff, 0x89, 0xc3, 0xf7, 0xff, 0x82, 0xc7, 0xef, 0xff, 0x78, 0xbe, 0xdc, 0xff, 0x82, 0xbe, 0xd6, 0xff, 0xa5, 0xd4, 0xe9, 0xff, 0xc7, 0xed, 0xff, 0xff, 0xf2, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xfc, 0xff,
@@ -45,7 +45,7 @@ img_emoji_artist_palette_map[] = {
     0xff, 0xfe, 0xfb, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xf3, 0xfc, 0xff, 0xff, 0xdf, 0xf8, 0xff, 0xff, 0xc2, 0xea, 0xfc, 0xff, 0xad, 0xdf, 0xf3, 0xff, 0xa7, 0xd9, 0xff, 0xff, 0xa1, 0xd2, 0xfa, 0xff, 0xac, 0xd6, 0xf9, 0xff, 0xcb, 0xec, 0xff, 0xff, 0xe8, 0xfc, 0xff, 0xff, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_artist_palette = {
+const lv_image_dsc_t img_emoji_artist_palette = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_books.c

@@ -18,11 +18,12 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_BOOKS
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_BOOKS
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_BOOKS
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_BOOKS
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_BOOKS uint8_t img_emoji_books_map[] = {
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_BOOKS uint8_t img_emoji_books_map[]
+= {
     0xff, 0xf6, 0xfc, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xfa, 0xf7, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xe2, 0xff, 0xfd, 0xff, 0xff, 0xf7, 0xf8, 0xff, 0xf7, 0xf0, 0xf3, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xec, 0xf3, 0xf6, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xfe, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xf9, 0xfe, 0xff,
     0xfd, 0xff, 0xff, 0xff, 0xe4, 0xff, 0xf7, 0xff, 0xfb, 0xff, 0xf9, 0xff, 0xef, 0xff, 0xff, 0xff, 0xdd, 0xd0, 0xd8, 0xff, 0x65, 0x5f, 0x60, 0xff, 0x37, 0x5e, 0x44, 0xff, 0xd5, 0x92, 0x77, 0xff, 0xe4, 0xa3, 0x8e, 0xff, 0xe6, 0xb2, 0x9b, 0xff, 0xe2, 0xbf, 0xa5, 0xff, 0xe2, 0xc7, 0xad, 0xff, 0xf1, 0xdc, 0xc6, 0xff, 0xec, 0xe5, 0xd1, 0xff, 0xdc, 0xea, 0xd8, 0xff, 0xea, 0xff, 0xf5, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfe, 0xfa, 0xff, 0xff,
     0xf6, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xf5, 0xff, 0xf1, 0xf3, 0xdd, 0xff, 0xe7, 0xf9, 0xec, 0xff, 0xba, 0xb0, 0xb6, 0xff, 0x50, 0x47, 0x44, 0xff, 0x4e, 0x56, 0x2e, 0xff, 0xe1, 0x87, 0x4e, 0xff, 0xf4, 0x7b, 0x49, 0xff, 0xe3, 0x70, 0x3d, 0xff, 0xeb, 0x7b, 0x47, 0xff, 0xef, 0x79, 0x48, 0xff, 0xf5, 0x7e, 0x51, 0xff, 0xe4, 0x78, 0x4f, 0xff, 0xd1, 0x7b, 0x57, 0xff, 0xff, 0xbd, 0x9a, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfe, 0xff, 0xff,
@@ -44,7 +45,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI
     0xff, 0xf9, 0xf2, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xf4, 0xf5, 0xf9, 0xff, 0xe9, 0xee, 0xf7, 0xff, 0xeb, 0xf4, 0xfd, 0xff, 0xf8, 0xfe, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xf6, 0xf9, 0xf7, 0xff, 0xfa, 0xfd, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xfc, 0xff, 0xfd, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xf7, 0xf7, 0xf7, 0xff, 0xf9, 0xf9, 0xf9, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_books = {
+const lv_image_dsc_t img_emoji_books = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_camera_with_flash.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_CAMERA_WITH_FLASH
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAMERA_WITH_FLASH
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_CAMERA_WITH_FLASH
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAMERA_WITH_FLASH
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_CAMERA_WITH_FLASH uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAMERA_WITH_FLASH uint8_t
 img_emoji_camera_with_flash_map[] = {
     0xf1, 0xff, 0xf8, 0xff, 0xfe, 0xfa, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xf4, 0xff, 0xfc, 0xff, 0xf3, 0xff, 0xf8, 0xff, 0xfc, 0xfd, 0xf4, 0xff, 0xff, 0xf6, 0xf5, 0xff, 0xed, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xd1, 0xff, 0xf7, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xbe, 0xf3, 0xf6, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xf7, 0xff,
     0xf8, 0xff, 0xfc, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xf5, 0xfb, 0xff, 0xff, 0xf9, 0xf7, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xd3, 0xf1, 0xff, 0xff, 0xeb, 0xf3, 0xff, 0xff, 0xc5, 0xe1, 0xec, 0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xff, 0xff, 0xc6, 0xe4, 0xf7, 0xff, 0xfd, 0xf9, 0xff, 0xff, 0xfa, 0xfc, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
@@ -45,7 +45,7 @@ img_emoji_camera_with_flash_map[] = {
     0xec, 0xec, 0xec, 0xff, 0xe4, 0xe4, 0xe4, 0xff, 0xe1, 0xe1, 0xe1, 0xff, 0xe5, 0xe5, 0xe5, 0xff, 0xe9, 0xe9, 0xe9, 0xff, 0xe8, 0xe8, 0xe8, 0xff, 0xe4, 0xe4, 0xe4, 0xff, 0xe3, 0xe3, 0xe3, 0xff, 0xdf, 0xdf, 0xdf, 0xff, 0xe8, 0xe8, 0xe8, 0xff, 0xe3, 0xe3, 0xe3, 0xff, 0xdf, 0xdf, 0xdf, 0xff, 0xe6, 0xe6, 0xe6, 0xff, 0xe5, 0xe5, 0xe5, 0xff, 0xe4, 0xe4, 0xe4, 0xff, 0xf0, 0xf0, 0xf0, 0xff, 0xe3, 0xe3, 0xe3, 0xff, 0xf3, 0xf3, 0xf3, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_camera_with_flash = {
+const lv_image_dsc_t img_emoji_camera_with_flash = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_cat_face.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_CAT_FACE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAT_FACE
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_CAT_FACE
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAT_FACE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_CAT_FACE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_CAT_FACE uint8_t
 img_emoji_cat_face_map[] = {
     0xd9, 0xf9, 0xf4, 0xff, 0xff, 0xf6, 0xff, 0xff, 0xe4, 0xff, 0xff, 0xff, 0xf9, 0xf2, 0xf5, 0xff, 0xee, 0xff, 0xf8, 0xff, 0xfb, 0xff, 0xf6, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xe4, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xf7, 0xfe, 0xfb, 0xff, 0xf8, 0xff, 0xfb, 0xff, 0xff, 0xfc, 0xfc, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xf5, 0xfc, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff,
     0xcf, 0xff, 0xfc, 0xff, 0xff, 0xf0, 0xff, 0xff, 0x96, 0xe4, 0xfb, 0xff, 0xa7, 0xe3, 0xff, 0xff, 0xeb, 0xf3, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xf3, 0xff, 0xf7, 0xff, 0xed, 0xfc, 0xe7, 0xff, 0xff, 0xff, 0xf6, 0xff, 0xf2, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xdb, 0xf7, 0xff, 0xff, 0x85, 0xe5, 0xfc, 0xff, 0x25, 0xdc, 0xec, 0xff, 0xec, 0xf9, 0xff, 0xff, 0xfa, 0xfd, 0xff, 0xff,
@@ -45,7 +45,7 @@ img_emoji_cat_face_map[] = {
     0xff, 0xf7, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfe, 0xf8, 0xff, 0xff, 0xfd, 0xfb, 0xff, 0xff, 0xfc, 0xfc, 0xff, 0xff, 0xfb, 0xfb, 0xff, 0xff, 0xfb, 0xfc, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_cat_face = {
+const lv_image_dsc_t img_emoji_cat_face = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_deciduous_tree.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_DECIDUOUS_TREE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DECIDUOUS_TREE
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_DECIDUOUS_TREE
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DECIDUOUS_TREE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_DECIDUOUS_TREE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DECIDUOUS_TREE uint8_t
 img_emoji_deciduous_tree_map[] = {
     0xfa, 0xff, 0xfc, 0xff, 0xf8, 0xff, 0xfe, 0xff, 0xfb, 0xff, 0xfe, 0xff, 0xfa, 0xf2, 0xf3, 0xff, 0xff, 0xfd, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0xff, 0xe9, 0xf2, 0xe8, 0xff, 0xe6, 0xff, 0xf4, 0xff, 0xae, 0xef, 0xd6, 0xff, 0xdb, 0xfd, 0xec, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xf7, 0xfa, 0xff, 0xfb, 0xf8, 0xfa, 0xff, 0xf6, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xff,
     0xff, 0xf7, 0xf7, 0xff, 0xfa, 0xff, 0xfd, 0xff, 0xf3, 0xff, 0xfc, 0xff, 0xef, 0xff, 0xfb, 0xff, 0xef, 0xff, 0xf9, 0xff, 0xd8, 0xf8, 0xe7, 0xff, 0x8b, 0xbf, 0xa8, 0xff, 0x64, 0xa9, 0x8e, 0xff, 0x62, 0xbc, 0x99, 0xff, 0x73, 0xb3, 0x96, 0xff, 0xad, 0xcb, 0xb8, 0xff, 0xf7, 0xff, 0xf5, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xf6, 0xf6, 0xf6, 0xff, 0xf5, 0xf2, 0xf4, 0xff,
@@ -45,7 +45,7 @@ img_emoji_deciduous_tree_map[] = {
     0xfb, 0xff, 0xff, 0xff, 0xf9, 0xfb, 0xfb, 0xff, 0xfc, 0xfa, 0xfa, 0xff, 0xfd, 0xfb, 0xfb, 0xff, 0xfe, 0xfb, 0xfd, 0xff, 0xe0, 0xe0, 0xe6, 0xff, 0xb0, 0xb2, 0xbd, 0xff, 0xa8, 0xae, 0xbb, 0xff, 0xa7, 0xad, 0xba, 0xff, 0xb4, 0xb6, 0xc1, 0xff, 0xe4, 0xe4, 0xea, 0xff, 0xfc, 0xf9, 0xfb, 0xff, 0xfa, 0xf8, 0xf8, 0xff, 0xff, 0xfd, 0xfd, 0xff, 0xfb, 0xfd, 0xfd, 0xff, 0xfb, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_deciduous_tree = {
+const lv_image_dsc_t img_emoji_deciduous_tree = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 16,

demos/multilang/assets/emojis/img_emoji_dog_face.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_DOG_FACE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DOG_FACE
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_DOG_FACE
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DOG_FACE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_DOG_FACE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_DOG_FACE uint8_t
 img_emoji_dog_face_map[] = {
     0xfb, 0xfd, 0xff, 0xff, 0xee, 0xf1, 0xf6, 0xff, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf0, 0xf2, 0xec, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfe, 0xff, 0xfa, 0xff, 0xf8, 0xfc, 0xf6, 0xff, 0xfa, 0xff, 0xfc, 0xff, 0xee, 0xfa, 0xf4, 0xff, 0xf0, 0xfe, 0xf8, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff,
     0xf5, 0xf7, 0xf7, 0xff, 0xf7, 0xf9, 0xf9, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xf6, 0xfa, 0xf5, 0xff, 0xf8, 0xfc, 0xf7, 0xff, 0xfd, 0xff, 0xfc, 0xff, 0xf6, 0xfa, 0xf5, 0xff, 0xf7, 0xfa, 0xf8, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0xfc, 0xfd, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff,
@@ -45,7 +45,7 @@ img_emoji_dog_face_map[] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xfe, 0xfc, 0xff, 0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_dog_face = {
+const lv_image_dsc_t img_emoji_dog_face = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_earth_globe_europe_africa.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_EARTH_GLOBE_EUROPE_AFRICA uint8_t
 img_emoji_earth_globe_europe_africa_map[] = {
     0xff, 0xf3, 0xec, 0xff, 0xd4, 0xff, 0xf2, 0xff, 0xff, 0xfd, 0xef, 0xff, 0xf2, 0xfd, 0xf5, 0xff, 0xff, 0xf5, 0xff, 0xff, 0xef, 0xfc, 0xff, 0xff, 0xff, 0xec, 0xf2, 0xff, 0xf6, 0xf9, 0xe9, 0xff, 0xc6, 0xe7, 0xcc, 0xff, 0xff, 0xde, 0xd3, 0xff, 0xff, 0xf4, 0xea, 0xff, 0xf2, 0xff, 0xf7, 0xff, 0xff, 0xf9, 0xf6, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff,
     0xed, 0xfc, 0xff, 0xff, 0xe6, 0xed, 0xff, 0xff, 0xfd, 0xfb, 0xff, 0xff, 0xf4, 0xfa, 0xef, 0xff, 0xfb, 0xf9, 0xd0, 0xff, 0xd5, 0xca, 0x8e, 0xff, 0xd7, 0xba, 0x7d, 0xff, 0xda, 0x84, 0x56, 0xff, 0xcd, 0xaa, 0x54, 0xff, 0xe4, 0x92, 0x4b, 0xff, 0xdd, 0x91, 0x56, 0xff, 0xc6, 0xa8, 0x77, 0xff, 0xcc, 0xc3, 0xa2, 0xff, 0xe3, 0xe3, 0xd3, 0xff, 0xff, 0xfa, 0xf9, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xf6, 0xfb, 0xfa, 0xff,
@@ -45,7 +45,7 @@ img_emoji_earth_globe_europe_africa_map[] = {
     0xf3, 0xfb, 0xf4, 0xff, 0xec, 0xfa, 0xf4, 0xff, 0xf4, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfe, 0xf9, 0xff, 0xff, 0xfe, 0xf5, 0xff, 0xff, 0xf3, 0xe4, 0xff, 0xf1, 0xd9, 0xc5, 0xff, 0xff, 0xd1, 0xb5, 0xff, 0xff, 0xd3, 0xb6, 0xff, 0xff, 0xdc, 0xbe, 0xff, 0xff, 0xee, 0xd0, 0xff, 0xfb, 0xff, 0xec, 0xff, 0xed, 0xff, 0xf8, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_earth_globe_europe_africa = {
+const lv_image_dsc_t img_emoji_earth_globe_europe_africa = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 19,

demos/multilang/assets/emojis/img_emoji_flexed_biceps.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_FLEXED_BICEPS
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_FLEXED_BICEPS
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_FLEXED_BICEPS
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_FLEXED_BICEPS
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_FLEXED_BICEPS uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_FLEXED_BICEPS uint8_t
 img_emoji_flexed_biceps_map[] = {
     0xfa, 0xff, 0xff, 0xff, 0xf4, 0xff, 0xfe, 0xff, 0xff, 0xfb, 0xfb, 0xff, 0xe9, 0xfe, 0xf6, 0xff, 0xef, 0xfd, 0xfb, 0xff, 0xff, 0xf5, 0xff, 0xff, 0xde, 0xfd, 0xff, 0xff, 0xc7, 0xf9, 0xff, 0xff, 0xc8, 0xde, 0xff, 0xff, 0xe4, 0xef, 0xff, 0xff, 0xfa, 0xfa, 0xff, 0xff, 0xf9, 0xfc, 0xff, 0xff, 0xe8, 0xf6, 0xf0, 0xff, 0xee, 0xff, 0xfb, 0xff, 0xf3, 0xff, 0xfe, 0xff, 0xf0, 0xf8, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xfe, 0xfe, 0xff, 0xda, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfd, 0xe7, 0xff, 0xff, 0x71, 0xd6, 0xef, 0xff, 0x3a, 0xc4, 0xe1, 0xff, 0x1e, 0xc8, 0xea, 0xff, 0x58, 0xd0, 0xed, 0xff, 0xbb, 0xeb, 0xfd, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfc, 0xfb, 0xff, 0xff, 0xfd, 0xfb, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xf4, 0xf6, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -45,7 +45,7 @@ img_emoji_flexed_biceps_map[] = {
     0xff, 0xfe, 0xfb, 0xff, 0xf8, 0xff, 0xfe, 0xff, 0xe1, 0xfe, 0xff, 0xff, 0xe2, 0xfd, 0xff, 0xff, 0xe9, 0xf2, 0xff, 0xff, 0xe1, 0xe3, 0xff, 0xff, 0xcc, 0xdc, 0xff, 0xff, 0xbf, 0xde, 0xff, 0xff, 0xa7, 0xde, 0xf9, 0xff, 0xab, 0xdd, 0xfb, 0xff, 0xae, 0xdb, 0xfc, 0xff, 0xac, 0xdb, 0xfa, 0xff, 0xae, 0xe0, 0xf7, 0xff, 0xc2, 0xe9, 0xf8, 0xff, 0xe2, 0xf3, 0xfc, 0xff, 0xfb, 0xfc, 0xff, 0xff, 0xf3, 0xfc, 0xff, 0xff, 0xf6, 0xfe, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_flexed_biceps = {
+const lv_image_dsc_t img_emoji_flexed_biceps = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_movie_camera.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_MOVIE_CAMERA
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_MOVIE_CAMERA
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_MOVIE_CAMERA
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_MOVIE_CAMERA
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_MOVIE_CAMERA uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_MOVIE_CAMERA uint8_t
 img_emoji_movie_camera_map[] = {
     0xff, 0xff, 0xff, 0xff, 0xf9, 0xf9, 0xf9, 0xff, 0xf3, 0xf3, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0xfb, 0xff, 0xe5, 0xe5, 0xe5, 0xff, 0xd9, 0xd9, 0xd9, 0xff, 0xe0, 0xe0, 0xe0, 0xff, 0xfa, 0xfa, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xeb, 0xeb, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xf7, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xca, 0xca, 0xca, 0xff, 0x86, 0x86, 0x86, 0xff, 0x55, 0x55, 0x55, 0xff, 0x48, 0x48, 0x48, 0xff, 0x55, 0x55, 0x55, 0xff, 0x76, 0x76, 0x76, 0xff, 0xb9, 0xb9, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xfa, 0xfa, 0xfa, 0xff, 0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xf9, 0xf9, 0xf9, 0xff,
@@ -45,7 +45,7 @@ img_emoji_movie_camera_map[] = {
     0xef, 0xef, 0xef, 0xff, 0xb4, 0xb4, 0xb4, 0xff, 0xc5, 0xc5, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf9, 0xf9, 0xff, 0xfd, 0xfd, 0xfd, 0xff, 0xf9, 0xf9, 0xf9, 0xff, 0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfa, 0xfa, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_movie_camera = {
+const lv_image_dsc_t img_emoji_movie_camera = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_red_heart.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_RED_HEART
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_RED_HEART
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_RED_HEART
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_RED_HEART
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_RED_HEART uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_RED_HEART uint8_t
 img_emoji_red_heart_map[] = {
     0xff, 0xee, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xfb, 0xff, 0xee, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xf1, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xf2, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfa, 0xf3, 0xfa, 0xff, 0xfb, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf4, 0xff, 0xf6, 0xff, 0xee, 0xff, 0xfd, 0xfe, 0xf5, 0xff, 0xff, 0xf7, 0xfd, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xf8, 0xfe, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xfb, 0xff, 0xf8, 0xfd, 0xff, 0xff, 0xd1, 0xd4, 0xff, 0xff, 0xa0, 0x9d, 0xff, 0xff, 0x97, 0x93, 0xfc, 0xff, 0x9e, 0xa2, 0xe3, 0xff, 0xca, 0xd0, 0xed, 0xff, 0xf8, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xe2, 0xff, 0xfd, 0xff, 0xf7, 0xff, 0xe9, 0xeb, 0xff, 0xff, 0xce, 0xce, 0xff, 0xff, 0xa8, 0xa9, 0xff, 0xff, 0x94, 0x98, 0xe6, 0xff, 0xb2, 0xb9, 0xf2, 0xff, 0xde, 0xe7, 0xff, 0xff, 0xed, 0xef, 0xf9, 0xff, 0xfd, 0xff, 0xff, 0xff,
@@ -45,7 +45,7 @@ img_emoji_red_heart_map[] = {
     0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xf9, 0xff, 0xfb, 0xfc, 0xf8, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xec, 0xfc, 0xff, 0xff, 0xed, 0xf9, 0xff, 0xff, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xf9, 0xf4, 0xff, 0xfe, 0xfb, 0xf7, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_red_heart = {
+const lv_image_dsc_t img_emoji_red_heart = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/emojis/img_emoji_rocket.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_ROCKET
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ROCKET
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_ROCKET
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ROCKET
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_ROCKET uint8_t img_emoji_rocket_map[]
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_ROCKET uint8_t img_emoji_rocket_map[]
 = {
     0xff, 0xf8, 0xf4, 0xff, 0xff, 0xfe, 0xfb, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf8, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xec, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xeb, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xff, 0xfd, 0xff, 0xff,
     0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xfb, 0xfb, 0xff, 0xf2, 0xf7, 0xf6, 0xff, 0xf5, 0xfa, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xea, 0xf0, 0xeb, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xfd, 0xf6, 0xff, 0xff, 0xee, 0xfb, 0xfd, 0xff, 0xef, 0xf4, 0xff, 0xff, 0xea, 0xe1, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0xff,
@@ -45,7 +45,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI
     0xfd, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xf8, 0xfd, 0xfc, 0xff, 0xf6, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_rocket = {
+const lv_image_dsc_t img_emoji_rocket = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 16,

demos/multilang/assets/emojis/img_emoji_soccer_ball.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_EMOJI_SOCCER_BALL
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_EMOJI_SOCCER_BALL
-    #define LV_ATTRIBUTE_IMG_IMG_EMOJI_SOCCER_BALL
+    #define LV_ATTRIBUTE_IMAGE_IMG_EMOJI_SOCCER_BALL
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_EMOJI_SOCCER_BALL uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_EMOJI_SOCCER_BALL uint8_t
 img_emoji_soccer_ball_map[] = {
     0xfa, 0xfc, 0xfd, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xf5, 0xf7, 0xf8, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xee, 0xf0, 0xf1, 0xff, 0xec, 0xee, 0xef, 0xff, 0xde, 0xe0, 0xe0, 0xff, 0xc9, 0xcb, 0xcb, 0xff, 0xf4, 0xf6, 0xf6, 0xff, 0xf6, 0xf8, 0xf8, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfb, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xfd, 0xff, 0xff, 0xff, 0xf2, 0xf4, 0xf5, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xfb, 0xfc, 0xff, 0xf4, 0xf6, 0xf7, 0xff, 0xe9, 0xeb, 0xec, 0xff, 0xac, 0xae, 0xaf, 0xff, 0x5a, 0x5c, 0x5d, 0xff, 0x5b, 0x5d, 0x5d, 0xff, 0x3d, 0x3f, 0x3f, 0xff, 0x62, 0x64, 0x64, 0xff, 0x97, 0x99, 0x99, 0xff, 0xeb, 0xed, 0xed, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfa, 0xfc, 0xfc, 0xff, 0xf8, 0xf8, 0xf8, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
@@ -45,7 +45,7 @@ img_emoji_soccer_ball_map[] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xf7, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xed, 0xed, 0xed, 0xff, 0xf1, 0xf1, 0xf1, 0xff, 0xee, 0xf3, 0xf4, 0xff, 0xea, 0xee, 0xef, 0xff, 0xf2, 0xf6, 0xf7, 0xff, 0xf0, 0xf2, 0xf3, 0xff, 0xf1, 0xf3, 0xf4, 0xff, 0xfd, 0xfc, 0xfe, 0xff, 0xfa, 0xf9, 0xfb, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-const lv_img_dsc_t img_emoji_soccer_ball = {
+const lv_image_dsc_t img_emoji_soccer_ball = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 18,

demos/multilang/assets/img_multilang_like.c

@@ -18,11 +18,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_MULTILANG_LIKE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_MULTILANG_LIKE
-    #define LV_ATTRIBUTE_IMG_IMG_MULTILANG_LIKE
+    #define LV_ATTRIBUTE_IMAGE_IMG_MULTILANG_LIKE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_MULTILANG_LIKE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_MULTILANG_LIKE uint8_t
 img_multilang_like_map[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0a, 0xff, 0xff, 0xff, 0x72, 0xff, 0xff, 0xff, 0x6a, 0xff, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x93, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43,7 +43,7 @@ img_multilang_like_map[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const lv_img_dsc_t img_multilang_like = {
+const lv_image_dsc_t img_multilang_like = {
     .header.cf = LV_COLOR_FORMAT_ARGB8888,
     .header.always_zero = 0,
     .header.w = 20,

demos/multilang/lv_demo_multilang.c

@@ -50,26 +50,26 @@ extern lv_font_t font_multilang_large;
  **********************/
 #define CARD_INFO_SET(_image, _name, _description) {.image = _image, .name = _name, .description = _description}
 
-LV_IMG_DECLARE(img_multilang_avatar_1)
+LV_IMAGE_DECLARE(img_multilang_avatar_1)
-LV_IMG_DECLARE(img_multilang_avatar_2)
+LV_IMAGE_DECLARE(img_multilang_avatar_2)
-LV_IMG_DECLARE(img_multilang_avatar_3)
+LV_IMAGE_DECLARE(img_multilang_avatar_3)
-LV_IMG_DECLARE(img_multilang_avatar_4)
+LV_IMAGE_DECLARE(img_multilang_avatar_4)
-LV_IMG_DECLARE(img_multilang_avatar_5)
+LV_IMAGE_DECLARE(img_multilang_avatar_5)
-LV_IMG_DECLARE(img_multilang_avatar_6)
+LV_IMAGE_DECLARE(img_multilang_avatar_6)
-LV_IMG_DECLARE(img_multilang_avatar_7)
+LV_IMAGE_DECLARE(img_multilang_avatar_7)
-LV_IMG_DECLARE(img_multilang_avatar_8)
+LV_IMAGE_DECLARE(img_multilang_avatar_8)
-LV_IMG_DECLARE(img_multilang_avatar_9)
+LV_IMAGE_DECLARE(img_multilang_avatar_9)
-LV_IMG_DECLARE(img_multilang_avatar_10)
+LV_IMAGE_DECLARE(img_multilang_avatar_10)
-LV_IMG_DECLARE(img_multilang_avatar_11)
+LV_IMAGE_DECLARE(img_multilang_avatar_11)
-LV_IMG_DECLARE(img_multilang_avatar_12)
+LV_IMAGE_DECLARE(img_multilang_avatar_12)
-LV_IMG_DECLARE(img_multilang_avatar_13)
+LV_IMAGE_DECLARE(img_multilang_avatar_13)
-LV_IMG_DECLARE(img_multilang_avatar_14)
+LV_IMAGE_DECLARE(img_multilang_avatar_14)
-LV_IMG_DECLARE(img_multilang_avatar_15)
+LV_IMAGE_DECLARE(img_multilang_avatar_15)
-LV_IMG_DECLARE(img_multilang_avatar_16)
+LV_IMAGE_DECLARE(img_multilang_avatar_16)
-LV_IMG_DECLARE(img_multilang_avatar_17)
+LV_IMAGE_DECLARE(img_multilang_avatar_17)
-LV_IMG_DECLARE(img_multilang_avatar_18)
+LV_IMAGE_DECLARE(img_multilang_avatar_18)
-LV_IMG_DECLARE(img_multilang_avatar_22)
+LV_IMAGE_DECLARE(img_multilang_avatar_22)
-LV_IMG_DECLARE(img_multilang_avatar_25)
+LV_IMAGE_DECLARE(img_multilang_avatar_25)
 
 static card_info_t card_info[] = {
     CARD_INFO_SET(&img_multilang_avatar_5, "Zhang Wei", "对编程和技术充满热情。 开源倡导者🚀"),
@@ -107,18 +107,18 @@ static const void * get_imgfont_path(const lv_font_t * font,
     LV_UNUSED(unicode_next);
     LV_UNUSED(font);
 
-    LV_IMG_DECLARE(img_emoji_artist_palette);
+    LV_IMAGE_DECLARE(img_emoji_artist_palette);
-    LV_IMG_DECLARE(img_emoji_books);
+    LV_IMAGE_DECLARE(img_emoji_books);
-    LV_IMG_DECLARE(img_emoji_camera_with_flash);
+    LV_IMAGE_DECLARE(img_emoji_camera_with_flash);
-    LV_IMG_DECLARE(img_emoji_cat_face);
+    LV_IMAGE_DECLARE(img_emoji_cat_face);
-    LV_IMG_DECLARE(img_emoji_deciduous_tree);
+    LV_IMAGE_DECLARE(img_emoji_deciduous_tree);
-    LV_IMG_DECLARE(img_emoji_dog_face);
+    LV_IMAGE_DECLARE(img_emoji_dog_face);
-    LV_IMG_DECLARE(img_emoji_earth_globe_europe_africa);
+    LV_IMAGE_DECLARE(img_emoji_earth_globe_europe_africa);
-    LV_IMG_DECLARE(img_emoji_flexed_biceps);
+    LV_IMAGE_DECLARE(img_emoji_flexed_biceps);
-    LV_IMG_DECLARE(img_emoji_movie_camera);
+    LV_IMAGE_DECLARE(img_emoji_movie_camera);
-    LV_IMG_DECLARE(img_emoji_red_heart);
+    LV_IMAGE_DECLARE(img_emoji_red_heart);
-    LV_IMG_DECLARE(img_emoji_soccer_ball);
+    LV_IMAGE_DECLARE(img_emoji_soccer_ball);
-    LV_IMG_DECLARE(img_emoji_rocket);
+    LV_IMAGE_DECLARE(img_emoji_rocket);
 
     *offset_y = -1;
     switch(unicode) {
@@ -316,8 +316,8 @@ static void card_create(lv_obj_t * parent, card_info_t * info)
     lv_obj_add_style(card, &style_card, 0);
     lv_obj_clear_flag(card, LV_OBJ_FLAG_CLICKABLE | LV_OBJ_FLAG_SCROLLABLE | LV_OBJ_FLAG_SCROLL_CHAIN_HOR);
 
-    lv_obj_t * avatar = lv_img_create(card);
+    lv_obj_t * avatar = lv_image_create(card);
-    lv_img_set_src(avatar, info->image);
+    lv_image_set_src(avatar, info->image);
     lv_obj_set_grid_cell(avatar, LV_GRID_ALIGN_CENTER, 0, 1, LV_GRID_ALIGN_CENTER, 0, 4);
     lv_obj_add_style(avatar, &style_avatar, 0);
 
@@ -332,14 +332,14 @@ static void card_create(lv_obj_t * parent, card_info_t * info)
     lv_obj_set_style_text_color(description, lv_color_hex(0x5b5b5b), 0);
     lv_obj_set_style_text_line_space(description, -3, 0);
 
-    lv_obj_t * btn = lv_btn_create(card);
+    lv_obj_t * btn = lv_button_create(card);
     lv_obj_clear_flag(card, LV_OBJ_FLAG_SCROLL_CHAIN_HOR);
     lv_obj_set_grid_cell(btn, LV_GRID_ALIGN_START, 2, 1, LV_GRID_ALIGN_CENTER, 3, 1);
     lv_obj_add_style(btn, &style_btn, 0);
 
-    LV_IMG_DECLARE(img_multilang_like);
+    LV_IMAGE_DECLARE(img_multilang_like);
-    lv_obj_t * btn_img = lv_img_create(btn);
+    lv_obj_t * btn_img = lv_image_create(btn);
-    lv_img_set_src(btn_img, &img_multilang_like);
+    lv_image_set_src(btn_img, &img_multilang_like);
     lv_obj_align(btn_img, LV_ALIGN_LEFT_MID, 30, 0);
 
     lv_obj_t * btn_label = lv_label_create(btn);

demos/music/assets/img_lv_demo_music_btn_corner_large.c

@@ -5,11 +5,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_CORNER
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_CORNER
-    #define LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_CORNER
+    #define LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_CORNER
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_CORNER uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_CORNER uint8_t
 img_lv_demo_music_btn_corner_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Blue: 2 bit, Green: 3 bit, Red: 3 bit, Alpha 8 bit */
@@ -118,7 +118,7 @@ img_lv_demo_music_btn_corner_map[] = {
 #endif
 };
 
-const lv_img_dsc_t img_lv_demo_music_btn_corner = {
+const lv_image_dsc_t img_lv_demo_music_btn_corner = {
     .header.always_zero = 0,
     .header.w = 32,
     .header.h = 32,

demos/music/assets/img_lv_demo_music_btn_list_pause.c

@@ -196,7 +196,7 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_list_pause_map[] = {
 #endif
 };
 
-lv_img_dsc_t img_lv_demo_music_btn_list_pause = {
+lv_image_dsc_t img_lv_demo_music_btn_list_pause = {
     .header.always_zero = 0,
     .header.w = 58,
     .header.h = 60,

demos/music/assets/img_lv_demo_music_btn_list_pause_large.c

@@ -5,11 +5,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE
-    #define LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE
+    #define LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PAUSE uint8_t
 img_lv_demo_music_btn_list_pause_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Blue: 2 bit, Green: 3 bit, Red: 3 bit, Alpha 8 bit */
@@ -337,7 +337,7 @@ img_lv_demo_music_btn_list_pause_map[] = {
 #endif
 };
 
-const lv_img_dsc_t img_lv_demo_music_btn_list_pause = {
+const lv_image_dsc_t img_lv_demo_music_btn_list_pause = {
     .header.always_zero = 0,
     .header.w = 106,
     .header.h = 105,

demos/music/assets/img_lv_demo_music_btn_list_play.c

@@ -196,7 +196,7 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_list_play_map[] = {
 #endif
 };
 
-lv_img_dsc_t img_lv_demo_music_btn_list_play = {
+lv_image_dsc_t img_lv_demo_music_btn_list_play = {
     .header.always_zero = 0,
     .header.w = 58,
     .header.h = 60,

demos/music/assets/img_lv_demo_music_btn_list_play_large.c

@@ -5,11 +5,11 @@
     #define LV_ATTRIBUTE_MEM_ALIGN
 #endif
 
-#ifndef LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY
+#ifndef LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY
-    #define LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY
+    #define LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY
 #endif
 
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY uint8_t
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_LV_DEMO_MUSIC_BTN_LIST_PLAY uint8_t
 img_lv_demo_music_btn_list_play_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
     /*Pixel format: Blue: 2 bit, Green: 3 bit, Red: 3 bit, Alpha 8 bit */
@@ -337,7 +337,7 @@ img_lv_demo_music_btn_list_play_map[] = {
 #endif
 };
 
-const lv_img_dsc_t img_lv_demo_music_btn_list_play = {
+const lv_image_dsc_t img_lv_demo_music_btn_list_play = {
     .header.always_zero = 0,
     .header.w = 106,
     .header.h = 105,

demos/music/assets/img_lv_demo_music_btn_loop.c

@@ -88,7 +88,7 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_loop_map[] = {
 #endif
 };
 
-lv_img_dsc_t img_lv_demo_music_btn_loop = {
+lv_image_dsc_t img_lv_demo_music_btn_loop = {
     .header.always_zero = 0,
     .header.w = 24,
     .header.h = 24,