Merge pull request solosky#208 from MirakelDev/feature/filename_to_slots_nickname

[Card emulator] feature: filename to slots nickname

Author: solosky

fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_load.c

@@ -54,6 +54,13 @@ void chameleon_scene_menu_card_data_file_load_from_file(app_chameleon_t *app, co
         return;
     }
 
+    // set nickname by filename
+    err = tag_helper_set_nickname(file_name);
+    if (err != 0) {
+        mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_SET_NICK_FAILED));
+        return;
+    }
+
     NRF_LOG_INFO("load card data:%d", err);
     mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_DATA_LOAD_SUCCESS));
     mui_scene_dispatcher_back_scene(app->p_scene_dispatcher, 2);

fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_save.c

@@ -49,7 +49,7 @@ void chameleon_scene_menu_card_data_file_save_on_enter(void *user_data) {
     app_chameleon_t *app = user_data;
     char file_name[32];
 
-    sprintf(file_name, "%02d.bin", tag_emulation_get_slot());
+    tag_helper_get_nickname(file_name, sizeof(file_name));
 
     mui_text_input_set_header(app->p_text_input, _T(APP_CHAMELEON_CARD_DATA_SAVE_INPUT_FILE_NAME));
     mui_text_input_set_input_text(app->p_text_input, file_name);

fw/application/src/app/chameleon/view/chameleon_view.c

@@ -17,7 +17,7 @@ static void chameleon_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     mui_canvas_set_font(p_canvas, MUI_FONT_NORMAL);
 
-    uint8_t x = 0, y = 0;
+    uint8_t x = 0, y = 0, w = 0;
     mui_canvas_draw_box(p_canvas, 0, y, mui_canvas_get_width(p_canvas), 12);
     mui_canvas_set_draw_color(p_canvas, 0);
 
@@ -43,13 +43,19 @@ static void chameleon_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
 
     mui_canvas_set_draw_color(p_canvas, 1);
 
+    x = 8;
+    y = 13 + (mui_canvas_get_height(p_canvas) - 16) / 2;
+    w = mui_canvas_get_width(p_canvas) - x * 2;
+
     tag_helper_get_nickname(buff, sizeof(buff));
 
-    y = 13 + (mui_canvas_get_height(p_canvas) - 16) / 2;
-    x = (mui_canvas_get_width(p_canvas) - mui_canvas_get_utf8_width(p_canvas, buff)) / 2;
-    mui_canvas_draw_utf8(p_canvas, x, y, buff);
+    if (w > mui_canvas_get_utf8_width(p_canvas, buff)) {
+        x += (w - mui_canvas_get_utf8_width(p_canvas, buff)) / 2;
+    }
+
+    mui_canvas_draw_utf8_truncate(p_canvas, x, y, w, buff);
     mui_canvas_draw_utf8(p_canvas, 0, y, "<");
-    mui_canvas_draw_utf8(p_canvas, mui_canvas_get_width(p_canvas) - 8, y, ">");
+    mui_canvas_draw_utf8(p_canvas, mui_canvas_get_width(p_canvas) - 5, y, ">");
 
     mui_canvas_set_font(p_canvas, MUI_FONT_SMALL);
     sprintf(buff, "%s <%02x/%02x %02x>", tag_name->short_name, coll_res->sak[0], coll_res->atqa[0], coll_res->atqa[1]);

fw/application/src/mui/mui_canvas.c

@@ -59,6 +59,36 @@ uint8_t mui_canvas_draw_glyph(mui_canvas_t *p_canvas, uint8_t x, uint8_t y, uint
     u8g2_DrawGlyph(p_canvas->fb, x, y, encoding);
 }
 
+uint16_t mui_canvas_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_t y, uint8_t max_width, const char *str) {
+    char *p = str;
+    char utf8[5];
+
+    if (max_width < mui_canvas_get_utf8_width(p_canvas, str)) {
+        while (*p != 0) {
+            uint8_t utf8_size = mui_canvas_get_utf8_bytes(p);
+            memcpy(utf8, p, utf8_size);
+            utf8[utf8_size] = '\0';
+            if (x >= 0 && x <= max_width - 8) {
+                uint8_t utf8_w = mui_canvas_draw_utf8(p_canvas, x, y, utf8);
+                x += utf8_w;
+            } else {
+                uint8_t *font = u8g2_GetFont(p_canvas->fb);
+                u8g2_SetFont(p_canvas->fb, u8g2_font_siji_t_6x10);
+                uint8_t utf8_w = mui_canvas_draw_glyph(p_canvas, x, y - 1, 0xe21f);
+                u8g2_SetFont(p_canvas->fb, font);
+                x += utf8_w + 1;
+
+                break;
+            }
+            p += utf8_size;
+        }
+    } else {
+        x = mui_canvas_draw_utf8(p_canvas, x, y, str) + 1;
+    }
+
+    return x;
+}
+
 uint16_t mui_canvas_get_utf8_width(mui_canvas_t *p_canvas, const char *s) { return u8g2_GetUTF8Width(p_canvas->fb, 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) {

fw/application/src/mui/mui_canvas.h

@@ -27,6 +27,7 @@ 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_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_t y, uint8_t max_width, const char *str);
 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);

fw/components/u8g2/csrc/u8g2.h

@@ -1670,6 +1670,7 @@ u8g2_uint_t u8g2_DrawExtUTF8(u8g2_t *u8g2, u8g2_uint_t x, u8g2_uint_t y, uint8_t
 #define u8g2_GetDescent(u8g2) ((u8g2)->font_ref_descent)
 #define u8g2_GetFontAscent(u8g2) ((u8g2)->font_ref_ascent)
 #define u8g2_GetFontDescent(u8g2) ((u8g2)->font_ref_descent)
+#define u8g2_GetFont(u8g2) ((u8g2)->font)
 
 uint8_t u8g2_IsAllValidUTF8(u8g2_t *u8g2, const char *str);	// checks whether all codes are valid