Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 13:38:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

ibutton and lfrfid small ui improvements

Browse Source
This commit is contained in:
MX
2024-05-03 20:59:28 +03:00
parent c9d23a9d1d
commit 374e96bb7d
7 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/main/ibutton/scenes/ibutton_scene_delete_confirm.c
View File

@@ -17,14 +17,21 @@ void ibutton_scene_delete_confirm_on_enter(void* context) {
ibutton_protocols_render_uid(ibutton->protocols, key, uid);
furi_string_cat_printf(
uid,
"\n%s %s",
ibutton_protocols_get_manufacturer(ibutton->protocols, ibutton_key_get_protocol_id(key)),
ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key)));
furi_string_cat(tmp, uid);
furi_string_push_back(tmp, '\n');
const char* protocol =
ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key));
const char* manufacturer =
ibutton_protocols_get_manufacturer(ibutton->protocols, ibutton_key_get_protocol_id(key));
if(strcasecmp(protocol, manufacturer) != 0 && strcasecmp(manufacturer, "N/A") != 0) {
furi_string_cat_printf(tmp, "%s ", manufacturer);
}
furi_string_cat(tmp, protocol);
widget_add_text_box_element(
widget, 0, 0, 128, 64, AlignCenter, AlignTop, furi_string_get_cstr(tmp), false);

15
applications/main/ibutton/scenes/ibutton_scene_emulate.c
View File

@@ -21,17 +21,14 @@ void ibutton_scene_emulate_on_enter(void* context) {
widget_add_icon_element(widget, 3, 10, &I_iButtonKey_49x44);
if(furi_string_empty(ibutton->file_path)) {
furi_string_printf(
tmp,
"Unsaved\n%s",
ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key)));
} else {
furi_string_printf(tmp, "%s", ibutton->key_name);
}
furi_string_printf(
tmp,
"[%s]\n%s",
ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key)),
furi_string_empty(ibutton->file_path) ? "Unsaved Key" : ibutton->key_name);
widget_add_text_box_element(
widget, 52, 23, 75, 26, AlignCenter, AlignTop, furi_string_get_cstr(tmp), false);
widget, 52, 24, 75, 40, AlignCenter, AlignTop, furi_string_get_cstr(tmp), true);
widget_add_string_multiline_element(
widget, 88, 10, AlignCenter, AlignTop, FontPrimary, "Emulating");

23
applications/main/ibutton/scenes/ibutton_scene_info.c
View File

@@ -10,12 +10,23 @@ void ibutton_scene_info_on_enter(void* context) {
FuriString* tmp = furi_string_alloc();
FuriString* brief_data = furi_string_alloc();
furi_string_printf(
tmp,
"Name:%s\n\e#%s %s\e#\n",
ibutton->key_name,
ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
ibutton_protocols_get_name(ibutton->protocols, protocol_id));
if((strcmp(
ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
ibutton_protocols_get_name(ibutton->protocols, protocol_id)) != 0) &&
(strcmp(ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id), "N/A") != 0)) {
furi_string_printf(
tmp,
"Name:%s\n\e#%s %s\e#\n",
ibutton->key_name,
ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
ibutton_protocols_get_name(ibutton->protocols, protocol_id));
} else {
furi_string_printf(
tmp,
"Name:%s\n\e#%s\e#\n",
ibutton->key_name,
ibutton_protocols_get_name(ibutton->protocols, protocol_id));
}
ibutton_protocols_render_brief_data(ibutton->protocols, key, brief_data);

13
applications/main/ibutton/scenes/ibutton_scene_write.c
View File

@@ -40,15 +40,14 @@ void ibutton_scene_write_on_enter(void* context) {
widget_add_icon_element(widget, 3, 10, &I_iButtonKey_49x44);
if(furi_string_empty(ibutton->file_path)) {
furi_string_printf(
tmp, "Unsaved\n%s", ibutton_protocols_get_name(ibutton->protocols, protocol_id));
} else {
furi_string_printf(tmp, "%s", ibutton->key_name);
}
furi_string_printf(
tmp,
"[%s]\n%s",
ibutton_protocols_get_name(ibutton->protocols, protocol_id),
furi_string_empty(ibutton->file_path) ? "Unsaved Key" : ibutton->key_name);
widget_add_text_box_element(
widget, 52, 23, 75, 26, AlignCenter, AlignTop, furi_string_get_cstr(tmp), false);
widget, 52, 24, 75, 40, AlignCenter, AlignTop, furi_string_get_cstr(tmp), true);
ibutton_worker_write_set_callback(worker, ibutton_scene_write_callback, ibutton);