Merge remote-tracking branch 'OFW/dev' into dev

This commit is contained in:
MX
2024-04-18 17:22:36 +03:00
parent b079b46681
commit 4422a03ae9
47 changed files with 1243 additions and 148 deletions

View File

@@ -7,23 +7,33 @@ void ibutton_scene_delete_confirm_on_enter(void* context) {
Widget* widget = ibutton->widget;
FuriString* tmp = furi_string_alloc();
FuriString* uid = furi_string_alloc();
widget_add_button_element(widget, GuiButtonTypeLeft, "Back", ibutton_widget_callback, context);
widget_add_button_element(
widget, GuiButtonTypeRight, "Delete", ibutton_widget_callback, context);
furi_string_printf(tmp, "\e#Delete %s?\e#", ibutton->key_name);
furi_string_printf(tmp, "\e#Delete %s?\e#\n", ibutton->key_name);
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);
widget_add_text_box_element(
widget, 0, 0, 128, 23, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), false);
widget, 0, 0, 128, 64, AlignCenter, AlignTop, furi_string_get_cstr(tmp), false);
furi_string_reset(tmp);
ibutton_protocols_render_brief_data(ibutton->protocols, key, tmp);
widget_add_string_multiline_element(
widget, 128 / 2, 24, AlignCenter, AlignTop, FontSecondary, furi_string_get_cstr(tmp));
furi_string_reset(uid);
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
furi_string_free(tmp);
furi_string_free(uid);
}
bool ibutton_scene_delete_confirm_on_event(void* context, SceneManagerEvent event) {