From a56a52b4bbe9fe9dd5d1a265936c960f973b8dbf Mon Sep 17 00:00:00 2001 From: ushastoe Date: Fri, 10 Nov 2023 21:00:13 +0300 Subject: [PATCH 1/4] Fix naming in iButton --- applications/main/ibutton/scenes/ibutton_scene_emulate.c | 4 ++-- applications/main/ibutton/scenes/ibutton_scene_info.c | 4 ++-- applications/main/ibutton/scenes/ibutton_scene_write.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/main/ibutton/scenes/ibutton_scene_emulate.c b/applications/main/ibutton/scenes/ibutton_scene_emulate.c index 713b8331c..04487f700 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_emulate.c +++ b/applications/main/ibutton/scenes/ibutton_scene_emulate.c @@ -28,10 +28,10 @@ void ibutton_scene_emulate_on_enter(void* context) { ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key))); widget_add_text_box_element( - widget, 52, 38, 75, 26, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); + widget, 52, 30, 75, 40, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); widget_add_string_multiline_element( - widget, 88, 10, AlignCenter, AlignTop, FontPrimary, "iButton\nemulating"); + widget, 88, 5, AlignCenter, AlignTop, FontPrimary, "iButton\nemulating"); ibutton_worker_emulate_set_callback(ibutton->worker, ibutton_scene_emulate_callback, ibutton); ibutton_worker_emulate_start(ibutton->worker, key); diff --git a/applications/main/ibutton/scenes/ibutton_scene_info.c b/applications/main/ibutton/scenes/ibutton_scene_info.c index cf44d6a86..dcdee9557 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_info.c +++ b/applications/main/ibutton/scenes/ibutton_scene_info.c @@ -11,12 +11,12 @@ void ibutton_scene_info_on_enter(void* context) { furi_string_printf( tmp, - "\e#%s [%s]\e#", + "\e#%s\n[%s]\e#", ibutton->key_name, ibutton_protocols_get_name(ibutton->protocols, protocol_id)); widget_add_text_box_element( - widget, 0, 2, 128, 12, AlignLeft, AlignTop, furi_string_get_cstr(tmp), true); + widget, 0, 2, 128, 40, AlignLeft, AlignTop, furi_string_get_cstr(tmp), true); furi_string_reset(tmp); ibutton_protocols_render_brief_data(ibutton->protocols, key, tmp); diff --git a/applications/main/ibutton/scenes/ibutton_scene_write.c b/applications/main/ibutton/scenes/ibutton_scene_write.c index 541aa1c52..f87932ddf 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_write.c +++ b/applications/main/ibutton/scenes/ibutton_scene_write.c @@ -30,7 +30,7 @@ void ibutton_scene_write_on_enter(void* context) { ibutton_protocols_get_name(ibutton->protocols, protocol_id)); widget_add_text_box_element( - widget, 52, 38, 75, 26, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); + widget, 52, 30, 75, 40, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); ibutton_worker_write_set_callback(worker, ibutton_scene_write_callback, ibutton); @@ -46,7 +46,7 @@ void ibutton_scene_write_on_enter(void* context) { } widget_add_string_multiline_element( - widget, 88, 10, AlignCenter, AlignTop, FontPrimary, furi_string_get_cstr(tmp)); + widget, 88, 5, AlignCenter, AlignTop, FontPrimary, furi_string_get_cstr(tmp)); ibutton_notification_message(ibutton, iButtonNotificationMessageEmulateStart); view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget); From 725811d7b37f6480238b2480e1b8a3a2721e2954 Mon Sep 17 00:00:00 2001 From: ushastoe Date: Fri, 10 Nov 2023 23:29:11 +0300 Subject: [PATCH 2/4] fix [] --- applications/main/ibutton/scenes/ibutton_scene_emulate.c | 6 +++--- applications/main/ibutton/scenes/ibutton_scene_write.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/main/ibutton/scenes/ibutton_scene_emulate.c b/applications/main/ibutton/scenes/ibutton_scene_emulate.c index 04487f700..3cfddb8d0 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_emulate.c +++ b/applications/main/ibutton/scenes/ibutton_scene_emulate.c @@ -23,9 +23,9 @@ void ibutton_scene_emulate_on_enter(void* context) { furi_string_printf( tmp, - "%s\n[%s]", - furi_string_empty(ibutton->file_path) ? "Unsaved Key" : ibutton->key_name, - ibutton_protocols_get_name(ibutton->protocols, ibutton_key_get_protocol_id(key))); + "[%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, 30, 75, 40, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); diff --git a/applications/main/ibutton/scenes/ibutton_scene_write.c b/applications/main/ibutton/scenes/ibutton_scene_write.c index f87932ddf..0e489fead 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_write.c +++ b/applications/main/ibutton/scenes/ibutton_scene_write.c @@ -25,9 +25,9 @@ void ibutton_scene_write_on_enter(void* context) { furi_string_printf( tmp, - "%s\n[%s]", - ibutton->key_name, - ibutton_protocols_get_name(ibutton->protocols, protocol_id)); + "[%s]\n%s", + ibutton_protocols_get_name(ibutton->protocols, protocol_id), + ibutton->key_name); widget_add_text_box_element( widget, 52, 30, 75, 40, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true); From 3e9ecd2f4f7cf08fe1a9da2c86f2af27eda31e93 Mon Sep 17 00:00:00 2001 From: ushastoe Date: Mon, 13 Nov 2023 11:26:36 +0300 Subject: [PATCH 3/4] applications_user/Flipper-Zero-Privet-Mir-main/ --- applications_user/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 applications_user/.gitignore diff --git a/applications_user/.gitignore b/applications_user/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/applications_user/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* From 42101c6594ba9446449951643f9c6a2c0e83bf9e Mon Sep 17 00:00:00 2001 From: ushastoe Date: Mon, 13 Nov 2023 11:27:27 +0300 Subject: [PATCH 4/4] Revert " applications_user/Flipper-Zero-Privet-Mir-main/" This reverts commit 3e9ecd2f4f7cf08fe1a9da2c86f2af27eda31e93. --- applications_user/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 applications_user/.gitignore diff --git a/applications_user/.gitignore b/applications_user/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/applications_user/.gitignore @@ -0,0 +1 @@ +*