Skip to content

Commit 0f1e72e

Browse files
committed
- use filename as slot's nickname by default
- shorten nickname to fit ui
1 parent e68a2c2 commit 0f1e72e

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ void chameleon_scene_menu_card_data_file_load_from_file(app_chameleon_t *app, co
5454
return;
5555
}
5656

57+
// set nickname by filename
58+
err = tag_helper_set_nickname(file_name);
59+
if (err != 0) {
60+
mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_SET_NICK_FAILED));
61+
return;
62+
}
63+
5764
NRF_LOG_INFO("load card data:%d", err);
5865
mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_DATA_LOAD_SUCCESS));
5966
mui_scene_dispatcher_back_scene(app->p_scene_dispatcher, 2);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void chameleon_scene_menu_card_data_file_save_on_enter(void *user_data) {
4949
app_chameleon_t *app = user_data;
5050
char file_name[32];
5151

52-
sprintf(file_name, "%02d.bin", tag_emulation_get_slot());
52+
tag_helper_get_nickname(file_name, sizeof(file_name));
5353

5454
mui_text_input_set_header(app->p_text_input, _T(APP_CHAMELEON_CARD_DATA_SAVE_INPUT_FILE_NAME));
5555
mui_text_input_set_input_text(app->p_text_input, file_name);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ static void chameleon_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {
4545

4646
tag_helper_get_nickname(buff, sizeof(buff));
4747

48+
size_t i = sizeof(buff);
49+
while (mui_canvas_get_width(p_canvas) - 14 < mui_canvas_get_utf8_width(p_canvas, buff))
50+
{
51+
buff[--i] = '\0';
52+
}
53+
4854
y = 13 + (mui_canvas_get_height(p_canvas) - 16) / 2;
4955
x = (mui_canvas_get_width(p_canvas) - mui_canvas_get_utf8_width(p_canvas, buff)) / 2;
5056
mui_canvas_draw_utf8(p_canvas, x, y, buff);

0 commit comments

Comments
 (0)