update icon

Author: solosky

fw/application/src/app/desktop/view/app_list_view.c

@@ -50,9 +50,9 @@ static void app_list_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
             // icon_x = LV_MAX(icon_x, 0);
             // if( i == focus){
             // uint8_t icon_w = LV_MIN(ICON_WIDTH, canvas_width - icon_x);
-            // mui_canvas_draw_box(p_canvas, icon_x, ICON_TOP_MARGIN, 32, 32);
+            // mui_canvas_draw_box(p_canvas, icon_x, ICON_TOP_MARGIN, ICON_WIDTH, ICON_WIDTH);
             // mui_canvas_set_draw_color(p_canvas, 0);
-            // mui_canvas_draw_xbm(p_canvas, icon_x, ICON_TOP_MARGIN, ICON_WIDTH, ICON_HEIGHT, img);
+            // mui_canvas_draw_xbm(p_canvas, icon_x, ICON_TOP_MARGIN, ICON_WIDTH, ICON_HEIGHT, app->icon_32x32->data);
             // mui_canvas_set_draw_color(p_canvas, 1);
             //}else{
                 if(app->icon_32x32){
@@ -64,7 +64,7 @@ static void app_list_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     // focus
     mui_canvas_set_draw_color(p_canvas, 2);
-    mui_canvas_draw_box(p_canvas, first_offset, ICON_TOP_MARGIN, 32, 32);
+    mui_canvas_draw_rbox(p_canvas, first_offset, ICON_TOP_MARGIN, 32, 32, 1);
     mui_canvas_set_draw_color(p_canvas, 1);
 
     // left selection

fw/application/src/mui/mui_canvas.c

@@ -44,7 +44,7 @@ int32_t mui_canvas_draw_utf8_clip(mui_canvas_t *p_canvas, int32_t x, int32_t y,
             w += utf8_w;
         } else {
             uint8_t utf8_x = mui_canvas_get_utf8_width(p_canvas, utf8);
-            xi += utf8_x + 1; //1 pix for margin
+            xi += utf8_x + 1; // 1 pix for margin
             w += utf8_x + 1;
         }
         p += utf8_size;
@@ -89,6 +89,12 @@ void mui_canvas_draw_box(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t w
     u8g2_DrawBox(p_canvas->fb, x, y, w, h);
 }
 
+void mui_canvas_draw_rbox(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t radius) {
+    x += p_canvas->offset_x;
+    y += p_canvas->offset_y;
+    u8g2_DrawRBox(p_canvas->fb, x, y, w, h, radius);
+}
+
 void mui_canvas_draw_dot(mui_canvas_t *p_canvas, uint8_t x, uint8_t y) {
     x += p_canvas->offset_x;
     y += p_canvas->offset_y;
@@ -108,7 +114,8 @@ void mui_canvas_draw_xbm(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t w
     u8g2_DrawXBM(p_canvas->fb, x, y, width, height, bitmap);
 }
 
-void mui_canvas_draw_bitmap(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t *bitmap){
+void mui_canvas_draw_bitmap(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height,
+                            uint8_t *bitmap) {
     x += p_canvas->offset_x;
     y += p_canvas->offset_y;
     u8g2_DrawBitmap(p_canvas->fb, x, y, width, height, bitmap);

fw/application/src/mui/mui_canvas.h

@@ -36,6 +36,7 @@ void mui_canvas_set_clip_window(mui_canvas_t *p_canvas, mui_rect_t* p_rect);
 uint8_t mui_canvas_get_draw_color(mui_canvas_t *p_canvas);
 void mui_canvas_set_draw_color(mui_canvas_t *p_canvas, uint8_t color);
 void mui_canvas_draw_box(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t w, uint8_t h);
+void mui_canvas_draw_rbox(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t radius);
 void mui_canvas_draw_dot(mui_canvas_t *p_canvas, uint8_t x, uint8_t y);
 void mui_canvas_draw_rframe(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height,
                             uint8_t radius);

fw/application/src/mui/mui_resource.c

@@ -4,15 +4,15 @@
 //** /resources/bmp/app_amiibo_database_32x32.bmp
 //************************************************************************
 const uint8_t app_amiibo_database_32x32_data[] = {
-0x00,0x00,0x00,0x00,0x00,0xf0,0x0f,0x00,0x00,0xff,0xff,0x00,0xc0,0x03,0xe0,
-0x03,0x70,0x00,0x00,0x07,0x30,0x00,0x00,0x0e,0x18,0x00,0x00,0x0c,0x18,0x00,
-0x00,0x0c,0x38,0x00,0x00,0x0c,0x78,0x00,0x00,0x0f,0xf8,0x07,0xf0,0x0f,0x18,
-0x1e,0x3e,0x0c,0x18,0xf0,0x01,0x0c,0x18,0x00,0x80,0x0d,0x18,0x00,0x80,0x0d,
-0x78,0x00,0x00,0x0e,0xd8,0x01,0xe0,0x0d,0x18,0x7f,0x38,0x0c,0x18,0xc0,0x8f,
-0x0d,0x18,0x00,0x80,0x0d,0x38,0x00,0x00,0x0c,0x78,0x00,0x00,0x0f,0xd8,0x03,
-0xe0,0x0d,0x18,0x3f,0x3e,0x0c,0x18,0xe0,0x83,0x0d,0x18,0x00,0x80,0x0d,0x30,
-0x00,0x00,0x06,0xe0,0x00,0x80,0x03,0x80,0x07,0xf8,0x01,0x00,0x3c,0x3f,0x00,
-0x00,0xf0,0x03,0x00,0x00,0x00,0x00,0x00
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0x00,0x80,0xff,0xff,
+0x01,0xc0,0x0f,0xf0,0x03,0xf0,0x00,0x00,0x0f,0x78,0x00,0x00,0x1e,0x18,0x00,
+0x38,0x18,0x18,0x00,0x38,0x18,0x18,0x00,0x38,0x18,0x78,0x00,0x00,0x1e,0xf8,
+0x00,0x00,0x1f,0xd8,0x0f,0xf0,0x1b,0x98,0xff,0xff,0x19,0x18,0xf8,0x1f,0x18,
+0x18,0x00,0x00,0x18,0x18,0x00,0x00,0x18,0x78,0x00,0x00,0x1e,0xf8,0x00,0x00,
+0x1f,0xd8,0x0f,0xf0,0x1b,0x98,0xff,0xff,0x19,0x18,0xf8,0x1f,0x18,0x18,0x00,
+0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00,0x00,0x18,0x78,0x00,0x00,0x1e,0xf0,
+0x00,0x00,0x0f,0xc0,0x0f,0xf0,0x03,0x80,0xff,0xff,0x01,0x00,0xf8,0x1f,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };
 const xbm_t app_amiibo_database_32x32 = {.width = 32, .height = 32, .data = app_amiibo_database_32x32_data};
 
@@ -38,14 +38,14 @@ const xbm_t app_amiibo_emulator_32x32 = {.width = 32, .height = 32, .data = app_
 //** /resources/bmp/app_amiibo_link_32x32.bmp
 //************************************************************************
 const uint8_t app_amiibo_link_32x32_data[] = {
-0x00,0x00,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x0f,
-0x00,0x00,0x38,0x1e,0x00,0x00,0x1c,0x38,0x00,0x00,0x0e,0x70,0x00,0x00,0x86,
-0x61,0x00,0x00,0x43,0xc2,0x00,0x00,0x23,0xc4,0x00,0x00,0x23,0xc4,0x00,0x00,
-0x46,0x62,0x00,0x00,0x86,0x61,0x00,0x00,0x06,0x70,0x00,0x00,0x0e,0x38,0x00,
-0x00,0x3c,0x3e,0x00,0x00,0xfc,0x1f,0x00,0x00,0xcc,0x19,0x00,0x00,0x08,0x08,
-0x00,0x00,0x18,0x0c,0x00,0x00,0x10,0x04,0x00,0x00,0x30,0x06,0x00,0x00,0xf0,
-0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0x70,0x07,0x00,0x00,0x30,0x06,0x00,0x00,
-0x70,0x07,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf8,0x3f,
+0x00,0x00,0x3c,0x78,0x00,0x00,0x0e,0xe0,0x00,0x00,0x07,0xc0,0x01,0x80,0x03,
+0x80,0x03,0x80,0xc1,0x07,0x03,0xc0,0xe1,0x0f,0x07,0xc0,0x70,0x1c,0x06,0xc0,
+0x30,0x18,0x06,0xc0,0x30,0x18,0x06,0xc0,0x70,0x1c,0x06,0xc0,0xe1,0x0f,0x07,
+0x80,0xc1,0x07,0x03,0x80,0x03,0x80,0x03,0x00,0x07,0xc0,0x01,0x00,0x0e,0xe0,
+0x00,0x00,0x3c,0xf8,0x00,0x00,0xfc,0xff,0x00,0x00,0xfc,0x7f,0x00,0x00,0xd8,
+0x77,0x00,0x00,0xf8,0x3f,0x00,0x00,0x70,0x3c,0x00,0x00,0x30,0x18,0x00,0x00,
+0x30,0x18,0x00,0x00,0x70,0x1c,0x00,0x00,0xe0,0x0f,0x00,0x00,0xc0,0x07,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };
 const xbm_t app_amiibo_link_32x32 = {.width = 32, .height = 32, .data = app_amiibo_link_32x32_data};
@@ -57,11 +57,11 @@ const xbm_t app_amiibo_link_32x32 = {.width = 32, .height = 32, .data = app_amii
 const uint8_t app_ble_transfer_32x32_data[] = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x03,
 0x00,0x00,0x80,0x07,0x00,0x00,0x80,0x0f,0x00,0x00,0x80,0x1d,0x00,0x00,0x80,
-0x39,0x00,0x00,0x83,0x71,0x00,0x00,0x87,0xe1,0x00,0x00,0x8e,0xe1,0x00,0x00,
-0x9c,0x71,0x00,0x00,0xb8,0x39,0x00,0x00,0xf0,0x1d,0x00,0x00,0xe0,0x0f,0x00,
-0x00,0xc0,0x07,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x1d,
-0x00,0x00,0xb8,0x39,0x00,0x00,0x9c,0x71,0x00,0x00,0x8e,0xe1,0x00,0x00,0x87,
-0xe1,0x00,0x00,0x83,0x71,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1d,0x00,0x00,
+0x39,0x00,0x80,0x81,0x71,0x00,0x80,0x83,0xe1,0x00,0x00,0x87,0xe1,0x00,0x00,
+0x8e,0x71,0x00,0x00,0x9c,0x39,0x00,0x00,0xb8,0x1d,0x00,0x00,0xf0,0x0f,0x00,
+0x00,0xe0,0x07,0x00,0x00,0xe0,0x07,0x00,0x00,0xf0,0x0f,0x00,0x00,0xb8,0x1d,
+0x00,0x00,0x9c,0x39,0x00,0x00,0x8e,0x71,0x00,0x00,0x87,0xe1,0x00,0x80,0x83,
+0xe1,0x00,0x80,0x81,0x71,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1d,0x00,0x00,
 0x80,0x0f,0x00,0x00,0x80,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x01,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };
@@ -72,14 +72,14 @@ const xbm_t app_ble_transfer_32x32 = {.width = 32, .height = 32, .data = app_ble
 //** /resources/bmp/app_card_emulator_32x32.bmp
 //************************************************************************
 const uint8_t app_card_emulator_32x32_data[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
-0x07,0x06,0x00,0x00,0x0c,0x06,0x00,0x00,0x18,0x06,0x00,0x00,0x18,0x06,0x00,
-0x00,0x18,0xfe,0xff,0xff,0x1f,0xfe,0xff,0xff,0x1f,0xfe,0xff,0xff,0x1f,0x06,
-0x00,0x00,0x18,0x06,0x00,0x00,0x18,0xc6,0xff,0x00,0x18,0x06,0x00,0x00,0x18,
-0x06,0x00,0x00,0x18,0x06,0x00,0x00,0x18,0x06,0x00,0x00,0x38,0x06,0x00,0x00,
-0x38,0x06,0x00,0x00,0x38,0x0e,0x00,0x00,0x6c,0xfc,0xff,0xff,0x67,0x18,0x00,
-0x00,0x60,0x18,0x00,0x00,0x60,0x10,0x00,0x00,0x3e,0x10,0x00,0xf0,0x07,0x10,
-0x00,0x3f,0x00,0x30,0xf8,0x03,0x00,0x60,0x1f,0x00,0x00,0xc0,0x01,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0x0f,0xe0,0xff,0xff,0x1f,0x70,0x00,
+0x00,0x38,0x30,0x00,0x00,0x30,0xf0,0xff,0xff,0x30,0xf8,0xff,0xff,0x31,0x1c,
+0x00,0x80,0x33,0x0c,0x00,0x00,0x33,0x0c,0x00,0x00,0x33,0xec,0xff,0x7f,0x33,
+0xec,0xff,0x7f,0x33,0x0c,0x00,0x00,0x33,0x0c,0x00,0x00,0x33,0xcc,0xff,0x00,
+0x33,0x0c,0x00,0x3c,0x33,0x0c,0x00,0x7e,0x33,0x0c,0x00,0x7e,0x33,0x0c,0x00,
+0x3c,0x3b,0x0c,0x00,0x00,0x1f,0x1c,0x00,0x80,0x0f,0xf8,0xff,0xff,0x01,0xf0,
+0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };
 const xbm_t app_card_emulator_32x32 = {.width = 32, .height = 32, .data = app_card_emulator_32x32_data};
@@ -90,12 +90,12 @@ const xbm_t app_card_emulator_32x32 = {.width = 32, .height = 32, .data = app_ca
 //************************************************************************
 const uint8_t app_settings_32x32_data[] = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0xc0,0x03,0x00,0x00,0xe0,0x07,0x00,0x00,0xe0,0x07,0x00,0x00,0xe0,
-0x07,0x00,0x80,0xf3,0xcf,0x01,0xc0,0xff,0xff,0x03,0xe0,0xff,0xff,0x07,0xe0,
-0xff,0xff,0x07,0xe0,0xff,0xff,0x07,0xe0,0x3f,0xfc,0x07,0xc0,0x1f,0xf8,0x03,
-0x80,0x1f,0xf8,0x01,0x80,0x1f,0xf8,0x01,0xc0,0x1f,0xf8,0x03,0xe0,0x3f,0xfc,
-0x07,0xe0,0xff,0xff,0x07,0xe0,0xff,0xff,0x07,0xe0,0xff,0xff,0x07,0xc0,0xff,
-0xff,0x03,0x80,0xf1,0xcf,0x01,0x00,0xe0,0x07,0x00,0x00,0xe0,0x07,0x00,0x00,
+0x00,0x00,0xc0,0x03,0x00,0x00,0xe0,0x07,0x00,0x00,0xf0,0x0f,0x00,0x80,0xf3,
+0xcf,0x01,0xc0,0xf7,0xef,0x03,0xe0,0xff,0xff,0x07,0xf0,0xff,0xff,0x0f,0xf0,
+0xff,0xff,0x0f,0xf0,0x3f,0xfc,0x0f,0xe0,0x1f,0xf8,0x07,0xc0,0x0f,0xf8,0x03,
+0x00,0x0f,0xf0,0x00,0x80,0x0f,0xf0,0x01,0xc0,0x1f,0xf8,0x03,0xe0,0x1f,0xf8,
+0x07,0xf0,0x7f,0xfc,0x0f,0xf0,0xff,0xff,0x0f,0xe0,0xff,0xff,0x0f,0xc0,0xff,
+0xff,0x07,0xc0,0xf7,0xcf,0x03,0x80,0xf1,0x8f,0x01,0x00,0xf0,0x0f,0x00,0x00,
 0xe0,0x07,0x00,0x00,0xc0,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };