tweak app list ui

Author: solosky

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

@@ -50,18 +50,9 @@ static void app_list_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
         mini_app_t *app = *ptr_array_get(p_list_view->items, i);
         int16_t icon_x = i * ICON_GROUP_WIDTH - scroll_offset + first_offset;
         if (icon_x + ICON_GROUP_WIDTH > 0 && icon_x < canvas_width) {
-            // 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, 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, app->icon_32x32->data);
-            // mui_canvas_set_draw_color(p_canvas, 1);
-            //}else{
             if (app->icon_32x32) {
                 mui_canvas_draw_xbm(p_canvas, icon_x, ICON_TOP_MARGIN, ICON_WIDTH, ICON_HEIGHT, app->icon_32x32->data);
             }
-            //}
         }
     }
 
@@ -86,19 +77,19 @@ static void app_list_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     // dash line
     mui_canvas_set_draw_color(p_canvas, 1);
-    for (uint8_t i = 0; i < canvas_width; i += 2) {
-        mui_canvas_draw_dot(p_canvas, i, canvas_height - font_height);
+    for (uint8_t i = 0; i < canvas_width; i += 6) {
+        mui_canvas_draw_line(p_canvas, i, canvas_height - font_height, i + 3, canvas_height - font_height);
     }
 
     // app name
     mui_canvas_set_font(p_canvas, u8g2_font_wqy12_t_gb2312a);
     mui_canvas_draw_utf8(p_canvas, (canvas_width - name_width) / 2, canvas_height - 1 + p_list_view->name_anim_value,
                          getLangString(focus_app->name_i18n_key));
 
-    // icon in front of name
+    // left and right icon
     mui_canvas_set_font(p_canvas, u8g2_font_siji_t_6x10);
-    mui_canvas_draw_glyph(p_canvas, (canvas_width - name_width) / 2 - 12,
-                          canvas_height - 1 + p_list_view->name_anim_value, focus_app->icon);
+    mui_canvas_draw_glyph(p_canvas, 0, canvas_height - 2, 0xe10b);
+    mui_canvas_draw_glyph(p_canvas, canvas_width - 12, canvas_height - 2, 0xe10a);
 }
 
 static void app_list_view_on_input(mui_view_t *p_view, mui_input_event_t *event) {
@@ -135,7 +126,7 @@ static void app_list_view_on_input(mui_view_t *p_view, mui_input_event_t *event)
                 int32_t scroll_offset = -1 * size * ICON_GROUP_WIDTH;
                 mui_anim_set_values(&p_app_list_view->icon_anim, scroll_offset, 0);
                 mui_anim_set_time(&p_app_list_view->icon_anim, ICON_ANIM_LONG_TIME);
-                        }
+            }
             if (mui_list_view_anim_enabled()) {
                 mui_anim_set_values(&p_app_list_view->name_anim, FONT_HEIGHT, 0);
                 mui_anim_start(&p_app_list_view->icon_anim);
@@ -164,7 +155,7 @@ static void app_list_view_on_enter(mui_view_t *p_view) {
 }
 
 static void app_list_view_on_exit(mui_view_t *p_view) {
-     app_list_view_t *p_app_list_view = p_view->user_data;
+    app_list_view_t *p_app_list_view = p_view->user_data;
     if (mui_list_view_anim_enabled()) {
         mui_anim_stop(&p_app_list_view->icon_anim);
         mui_anim_stop(&p_app_list_view->name_anim);

fw/application/src/mui/mui_canvas.c

@@ -108,14 +108,14 @@ void mui_canvas_draw_rframe(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_
     u8g2_DrawRFrame(p_canvas->fb, x, y, width, height, radius);
 }
 
-void mui_canvas_draw_xbm(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t *bitmap) {
+void mui_canvas_draw_xbm(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height, const uint8_t *bitmap) {
     x += p_canvas->offset_x;
     y += p_canvas->offset_y;
     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) {
+                            const 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

@@ -23,15 +23,15 @@ void mui_canvas_clear(mui_canvas_t *p_canvas);
 
 uint8_t mui_canvas_get_utf8_bytes(const char *p);
 
-    void mui_canvas_set_font(mui_canvas_t *p_canvas, const uint8_t *font);
+void mui_canvas_set_font(mui_canvas_t *p_canvas, const uint8_t *font);
 uint8_t mui_canvas_draw_utf8(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, const char *str);
 int32_t mui_canvas_draw_utf8_clip(mui_canvas_t *p_canvas, int32_t x, int32_t y, const char *text);
 uint8_t mui_canvas_draw_glyph(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint16_t encoding);
 uint16_t mui_canvas_get_utf8_width(mui_canvas_t *p_canvas, const char *s);
 
 void mui_canvas_set_frame(mui_canvas_t *p_canvas, uint8_t offset_x, uint8_t offset_y, uint8_t width, uint8_t height);
-void mui_canvas_get_clip_window(mui_canvas_t *p_canvas, mui_rect_t* p_rect);
-void mui_canvas_set_clip_window(mui_canvas_t *p_canvas, mui_rect_t* p_rect);
+void mui_canvas_get_clip_window(mui_canvas_t *p_canvas, mui_rect_t *p_rect);
+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);
@@ -41,8 +41,10 @@ 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);
 
-void mui_canvas_draw_xbm(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);
+void mui_canvas_draw_xbm(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height,
+                         const 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,
+                            const uint8_t *bitmap);
 
 uint16_t mui_canvas_string_width(mui_canvas_t *p_canvas, const char *str);