From 1ef497df6ddbaa2ec4f7a87f4f3f604745518709 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 19 Feb 2023 23:25:22 +0000 Subject: [PATCH] Remove old namechanger app --- .../plugins/namechanger/application.fam | 13 -- .../namechanger/icons/DolphinNice_96x59.png | Bin 2459 -> 0 bytes .../plugins/namechanger/icons/MarioBlock.png | Bin 4616 -> 0 bytes .../namechanger/icons/namechanger_10px.png | Bin 1611 -> 0 bytes .../plugins/namechanger/namechanger.c | 162 ------------------ .../plugins/namechanger/namechanger.h | 49 ------ .../plugins/namechanger/namechanger_10px.png | Bin 1611 -> 0 bytes .../namechanger/namechanger_custom_event.h | 6 - .../namechanger/scenes/namechanger_scene.c | 30 ---- .../namechanger/scenes/namechanger_scene.h | 29 ---- .../scenes/namechanger_scene_change.c | 56 ------ .../scenes/namechanger_scene_change_success.c | 50 ------ .../scenes/namechanger_scene_config.h | 5 - .../scenes/namechanger_scene_revert.c | 53 ------ .../scenes/namechanger_scene_revert_success.c | 54 ------ .../scenes/namechanger_scene_start.c | 58 ------- 16 files changed, 565 deletions(-) delete mode 100644 applications/plugins/namechanger/application.fam delete mode 100644 applications/plugins/namechanger/icons/DolphinNice_96x59.png delete mode 100644 applications/plugins/namechanger/icons/MarioBlock.png delete mode 100644 applications/plugins/namechanger/icons/namechanger_10px.png delete mode 100644 applications/plugins/namechanger/namechanger.c delete mode 100644 applications/plugins/namechanger/namechanger.h delete mode 100644 applications/plugins/namechanger/namechanger_10px.png delete mode 100644 applications/plugins/namechanger/namechanger_custom_event.h delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene.c delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene.h delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_change.c delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_change_success.c delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_config.h delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_revert.c delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_revert_success.c delete mode 100644 applications/plugins/namechanger/scenes/namechanger_scene_start.c diff --git a/applications/plugins/namechanger/application.fam b/applications/plugins/namechanger/application.fam deleted file mode 100644 index 704b643c5..000000000 --- a/applications/plugins/namechanger/application.fam +++ /dev/null @@ -1,13 +0,0 @@ -App( - appid="NameChanger", - name="Name Changer", - apptype=FlipperAppType.EXTERNAL, - entry_point="namechanger_app", - cdefines=["APP_NAMECHANGER"], - requires=["gui", "storage"], - stack_size=2 * 1024, - order=90, - fap_icon="namechanger_10px.png", - fap_category="Tools", - fap_icon_assets="icons", -) diff --git a/applications/plugins/namechanger/icons/DolphinNice_96x59.png b/applications/plugins/namechanger/icons/DolphinNice_96x59.png deleted file mode 100644 index a299d3630239b4486e249cc501872bed5996df3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2459 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 I=KY7S0iJXAHUIzs diff --git a/applications/plugins/namechanger/namechanger.c b/applications/plugins/namechanger/namechanger.c deleted file mode 100644 index 17abcea72..000000000 --- a/applications/plugins/namechanger/namechanger.c +++ /dev/null @@ -1,162 +0,0 @@ -#include "namechanger.h" -#include "scenes/namechanger_scene.h" - -#include -#include - -bool namechanger_custom_event_callback(void* context, uint32_t event) { - furi_assert(context); - NameChanger* namechanger = context; - return scene_manager_handle_custom_event(namechanger->scene_manager, event); -} - -bool namechanger_back_event_callback(void* context) { - furi_assert(context); - NameChanger* namechanger = context; - return scene_manager_handle_back_event(namechanger->scene_manager); -} - -NameChanger* namechanger_alloc() { - NameChanger* namechanger = malloc(sizeof(NameChanger)); - - namechanger->scene_manager = scene_manager_alloc(&namechanger_scene_handlers, namechanger); - - namechanger->view_dispatcher = view_dispatcher_alloc(); - view_dispatcher_enable_queue(namechanger->view_dispatcher); - view_dispatcher_set_event_callback_context(namechanger->view_dispatcher, namechanger); - view_dispatcher_set_custom_event_callback( - namechanger->view_dispatcher, namechanger_custom_event_callback); - view_dispatcher_set_navigation_event_callback( - namechanger->view_dispatcher, namechanger_back_event_callback); - - namechanger->gui = furi_record_open(RECORD_GUI); - namechanger->storage = furi_record_open(RECORD_STORAGE); - - namechanger->submenu = submenu_alloc(); - view_dispatcher_add_view( - namechanger->view_dispatcher, - NameChangerViewSubmenu, - submenu_get_view(namechanger->submenu)); - - namechanger->text_input = text_input_alloc(); - view_dispatcher_add_view( - namechanger->view_dispatcher, - NameChangerViewTextInput, - text_input_get_view(namechanger->text_input)); - - namechanger->popup = popup_alloc(); - view_dispatcher_add_view( - namechanger->view_dispatcher, NameChangerViewPopup, popup_get_view(namechanger->popup)); - - namechanger->widget = widget_alloc(); - view_dispatcher_add_view( - namechanger->view_dispatcher, NameChangerViewWidget, widget_get_view(namechanger->widget)); - - return namechanger; -} - -void namechanger_free(NameChanger* namechanger) { - furi_assert(namechanger); - - view_dispatcher_remove_view(namechanger->view_dispatcher, NameChangerViewWidget); - widget_free(namechanger->widget); - view_dispatcher_remove_view(namechanger->view_dispatcher, NameChangerViewPopup); - popup_free(namechanger->popup); - - view_dispatcher_remove_view(namechanger->view_dispatcher, NameChangerViewTextInput); - text_input_free(namechanger->text_input); - - view_dispatcher_remove_view(namechanger->view_dispatcher, NameChangerViewSubmenu); - submenu_free(namechanger->submenu); - - view_dispatcher_free(namechanger->view_dispatcher); - scene_manager_free(namechanger->scene_manager); - - furi_record_close(RECORD_STORAGE); - - furi_record_close(RECORD_GUI); - - free(namechanger); -} - -void namechanger_text_store_set(NameChanger* namechanger, const char* text, ...) { - va_list args; - va_start(args, text); - - vsnprintf(namechanger->text_store, NAMECHANGER_TEXT_STORE_SIZE, text, args); - - va_end(args); -} - -int32_t namechanger_app() { - NameChanger* namechanger = namechanger_alloc(); - - view_dispatcher_attach_to_gui( - namechanger->view_dispatcher, namechanger->gui, ViewDispatcherTypeFullscreen); - scene_manager_next_scene(namechanger->scene_manager, NameChangerSceneStart); - - view_dispatcher_run(namechanger->view_dispatcher); - - namechanger_free(namechanger); - return 0; -} - -bool namechanger_name_write(NameChanger* namechanger, char* name) { - FuriString* file_path = furi_string_alloc(); - furi_string_set(file_path, "/ext/dolphin/name.txt"); - - bool result = false; - - //If name is not "eraseerase" (set by Revert) then write name to file - //otherwise, remove name.txt - - if(strcmp(name, "eraseerase") != 0) { - //save - FlipperFormat* file = flipper_format_file_alloc(namechanger->storage); - - do { - // Open file for write - if(!flipper_format_file_open_always(file, furi_string_get_cstr(file_path))) { - break; - } - - // Write header - if(!flipper_format_write_header_cstr(file, NAMECHANGER_HEADER, 1)) { - break; - } - - // Write comments - if(!flipper_format_write_comment_cstr( - file, "Changing the value below will change your FlipperZero device name.")) { - break; - } - - if(!flipper_format_write_comment_cstr( - file, - "Note: This is limited to 8 characters using the following: a-z, A-Z, 0-9, and _")) { - break; - } - - if(!flipper_format_write_comment_cstr( - file, "It cannot contain any other characters.")) { - break; - } - - if(!flipper_format_write_string_cstr(file, "Name", name)) { - break; - } - - result = true; - } while(false); - - flipper_format_free(file); - - if(!result) { - FURI_LOG_E(TAG, "Cannot save name file."); - } - } else { - result = storage_simply_remove(namechanger->storage, furi_string_get_cstr(file_path)); - } - - return result; -} \ No newline at end of file diff --git a/applications/plugins/namechanger/namechanger.h b/applications/plugins/namechanger/namechanger.h deleted file mode 100644 index e3355db1d..000000000 --- a/applications/plugins/namechanger/namechanger.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "namechanger_custom_event.h" -#include "scenes/namechanger_scene.h" - -#define NAMECHANGER_TEXT_STORE_SIZE 9 -#define NAMECHANGER_HEADER "Flipper Name File" - -#define TAG "NameChanger" - -typedef struct { - SceneManager* scene_manager; - ViewDispatcher* view_dispatcher; - - Gui* gui; - Storage* storage; - - char text_store[NAMECHANGER_TEXT_STORE_SIZE + 1]; - - Submenu* submenu; - TextInput* text_input; - Popup* popup; - Widget* widget; -} NameChanger; - -typedef enum { - NameChangerViewSubmenu, - NameChangerViewTextInput, - NameChangerViewPopup, - NameChangerViewWidget, -} NameChangerView; - -bool namechanger_make_app_folder(NameChanger* namechanger); -bool namechanger_name_write(NameChanger* namechanger, char* name); -void namechanger_text_store_set(NameChanger* namechanger, const char* text, ...); diff --git a/applications/plugins/namechanger/namechanger_10px.png b/applications/plugins/namechanger/namechanger_10px.png deleted file mode 100644 index 60facf25e0e1615f2c3606324af8d7aa29d04a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1611 zcmcIkzi-<{6s7|dNZn*fQNZX#T$TjL@wY0G2%9>VV=E|K!%-S_%kl0g5f*t2dA1~v z*#ZPG0whaOphLF|ow{Z4lBHYw2XyMzrCZuD?<9&1ip22}g1kHOzWd(ye(*io-PyXh z`uVD+X%~Cj-94DqdiDG{7|-nv{(|Y_V*9&F(?0oBJuBMxKdfomN57{1fgD6%2UKJR zVItt+WJSdWAEnzzCBJjD)2B!K)Mx0% zm-_W-00bGAM4x8kyb7ivn)3#*R-a9z&mnR@MC;0+K8SYp4N-EvZP=JvmZi6SgEQj9 zZgNd`EXOu&xIJt;folbxqt_P#b0tfHz3#2r7`%mOBxMnp=43K4CaxjMp=tZRZ(5G& zI2aJPn&pyAab8_sGIV)G%e0WG$aTd?VsRit1X341WJN=pS9P2qV&;?-rfpctrzJ3o zPKRb$gRbP}Ay}#PzLmJ@&kAnt@k$(&ly4sLTwY!pW3)M29F*g^r;M6>%rk&hAk1z| z6(b=U2nlxShE!INufYK!s18U(_uV6gZj)1syM8mhCd!PF#Y0Hm4*p z=CSL09wCgk+Do=?$`pPbGJca)sbawBQrd|V*1^oS+nBYy1e4gaG2xEww_9!EC7_DY zAQ5Fopia_^47pk4L!|$wW0HoGMjS{_N&W&>i9}9F$=8Pv>Gu|w`7ZGlIXqqZ*%JQ&rPpDl zBa#m}bWRf~XH3;%7D+MxpRf7e8|`QbhaRVvO?QQtra$u>s7vU+uU=hx37z{&ue;t~ zdq)2~US0c5TS?hxqvyZh{c3F>e|j>wu=VZjU;cPHyKv%Z=%3>U#^WFVRPDaExzqjm I=KY7S0iJXAHUIzs diff --git a/applications/plugins/namechanger/namechanger_custom_event.h b/applications/plugins/namechanger/namechanger_custom_event.h deleted file mode 100644 index 3485c870b..000000000 --- a/applications/plugins/namechanger/namechanger_custom_event.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -enum NameChangerCustomEvent { - NameChangerCustomEventBack, - NameChangerCustomEventTextEditResult, -}; diff --git a/applications/plugins/namechanger/scenes/namechanger_scene.c b/applications/plugins/namechanger/scenes/namechanger_scene.c deleted file mode 100644 index 82f96e466..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "namechanger_scene.h" - -// Generate scene on_enter handlers array -#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter, -void (*const namechanger_on_enter_handlers[])(void*) = { -#include "namechanger_scene_config.h" -}; -#undef ADD_SCENE - -// Generate scene on_event handlers array -#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event, -bool (*const namechanger_on_event_handlers[])(void* context, SceneManagerEvent event) = { -#include "namechanger_scene_config.h" -}; -#undef ADD_SCENE - -// Generate scene on_exit handlers array -#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit, -void (*const namechanger_on_exit_handlers[])(void* context) = { -#include "namechanger_scene_config.h" -}; -#undef ADD_SCENE - -// Initialize scene handlers configuration structure -const SceneManagerHandlers namechanger_scene_handlers = { - .on_enter_handlers = namechanger_on_enter_handlers, - .on_event_handlers = namechanger_on_event_handlers, - .on_exit_handlers = namechanger_on_exit_handlers, - .scene_num = NameChangerSceneNum, -}; diff --git a/applications/plugins/namechanger/scenes/namechanger_scene.h b/applications/plugins/namechanger/scenes/namechanger_scene.h deleted file mode 100644 index 42071ab98..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include - -// Generate scene id and total number -#define ADD_SCENE(prefix, name, id) NameChangerScene##id, -typedef enum { -#include "namechanger_scene_config.h" - NameChangerSceneNum, -} NameChangerScene; -#undef ADD_SCENE - -extern const SceneManagerHandlers namechanger_scene_handlers; - -// Generate scene on_enter handlers declaration -#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*); -#include "namechanger_scene_config.h" -#undef ADD_SCENE - -// Generate scene on_event handlers declaration -#define ADD_SCENE(prefix, name, id) \ - bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event); -#include "namechanger_scene_config.h" -#undef ADD_SCENE - -// Generate scene on_exit handlers declaration -#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context); -#include "namechanger_scene_config.h" -#undef ADD_SCENE diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_change.c b/applications/plugins/namechanger/scenes/namechanger_scene_change.c deleted file mode 100644 index 32977d51a..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_change.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "../namechanger.h" - -static void namechanger_scene_change_text_input_callback(void* context) { - NameChanger* namechanger = context; - - view_dispatcher_send_custom_event( - namechanger->view_dispatcher, NameChangerCustomEventTextEditResult); -} - -void namechanger_scene_change_on_enter(void* context) { - NameChanger* namechanger = context; - TextInput* text_input = namechanger->text_input; - - namechanger_text_store_set(namechanger, "%s", furi_hal_version_get_name_ptr()); - - text_input_set_header_text(text_input, "Set Flipper Name"); - - text_input_set_result_callback( - text_input, - namechanger_scene_change_text_input_callback, - namechanger, - namechanger->text_store, - NAMECHANGER_TEXT_STORE_SIZE, - true); - - view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewTextInput); -} - -bool namechanger_scene_change_on_event(void* context, SceneManagerEvent event) { - NameChanger* namechanger = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - consumed = true; - if(event.event == NameChangerCustomEventTextEditResult) { - if(namechanger_name_write(namechanger, namechanger->text_store)) { - scene_manager_next_scene( - namechanger->scene_manager, NameChangerSceneChangeSuccess); - } else { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } - } else { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } - } - return consumed; -} - -void namechanger_scene_change_on_exit(void* context) { - NameChanger* namechanger = context; - TextInput* text_input = namechanger->text_input; - - text_input_reset(text_input); -} diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_change_success.c b/applications/plugins/namechanger/scenes/namechanger_scene_change_success.c deleted file mode 100644 index 7574c3a0e..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_change_success.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "../namechanger.h" - -static void namechanger_scene_change_success_popup_callback(void* context) { - NameChanger* namechanger = context; - view_dispatcher_send_custom_event(namechanger->view_dispatcher, NameChangerCustomEventBack); -} - -void namechanger_scene_change_success_on_enter(void* context) { - NameChanger* namechanger = context; - Popup* popup = namechanger->popup; - - popup_set_header(popup, "Saved!", 5, 5, AlignLeft, AlignTop); - popup_set_text(popup, "Rebooting...", 5, 17, AlignLeft, AlignTop); - - popup_set_callback(popup, namechanger_scene_change_success_popup_callback); - popup_set_context(popup, namechanger); - popup_set_timeout(popup, 5000); - popup_enable_timeout(popup); - - view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewPopup); -} - -bool namechanger_scene_change_success_on_event(void* context, SceneManagerEvent event) { - NameChanger* namechanger = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - consumed = true; - if(event.event == NameChangerCustomEventBack) { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneChange); - } - } - - return consumed; -} - -void namechanger_scene_change_success_on_exit(void* context) { - NameChanger* namechanger = context; - Popup* popup = namechanger->popup; - - popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 0, NULL); - - popup_disable_timeout(popup); - popup_set_context(popup, NULL); - popup_set_callback(popup, NULL); - - furi_hal_power_reset(); -} diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_config.h b/applications/plugins/namechanger/scenes/namechanger_scene_config.h deleted file mode 100644 index 41bbaef6b..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_config.h +++ /dev/null @@ -1,5 +0,0 @@ -ADD_SCENE(namechanger, start, Start) -ADD_SCENE(namechanger, change, Change) -ADD_SCENE(namechanger, change_success, ChangeSuccess) -ADD_SCENE(namechanger, revert, Revert) -ADD_SCENE(namechanger, revert_success, RevertSuccess) \ No newline at end of file diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_revert.c b/applications/plugins/namechanger/scenes/namechanger_scene_revert.c deleted file mode 100644 index 156817651..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_revert.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "../namechanger.h" - -static void - namechanger_scene_revert_widget_callback(GuiButtonType result, InputType type, void* context) { - NameChanger* namechanger = context; - if(type == InputTypeShort) { - view_dispatcher_send_custom_event(namechanger->view_dispatcher, result); - } -} - -void namechanger_scene_revert_on_enter(void* context) { - NameChanger* namechanger = context; - Widget* widget = namechanger->widget; - widget_add_text_box_element( - widget, 0, 0, 128, 25, AlignCenter, AlignCenter, "\e#Revert Name?\e#", false); - widget_add_button_element( - widget, GuiButtonTypeLeft, "Cancel", namechanger_scene_revert_widget_callback, namechanger); - widget_add_button_element( - widget, - GuiButtonTypeRight, - "Revert", - namechanger_scene_revert_widget_callback, - namechanger); - view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewWidget); -} - -bool namechanger_scene_revert_on_event(void* context, SceneManagerEvent event) { - NameChanger* namechanger = context; - bool consumed = false; - if(event.type == SceneManagerEventTypeBack) { - consumed = true; - } else if(event.type == SceneManagerEventTypeCustom) { - consumed = true; - if(event.event == GuiButtonTypeRight) { - if(namechanger_name_write(namechanger, "eraseerase")) { - scene_manager_next_scene( - namechanger->scene_manager, NameChangerSceneRevertSuccess); - } else { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } - } else if(event.event == GuiButtonTypeLeft) { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } - } - return consumed; -} - -void namechanger_scene_revert_on_exit(void* context) { - NameChanger* namechanger = context; - widget_reset(namechanger->widget); -} diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_revert_success.c b/applications/plugins/namechanger/scenes/namechanger_scene_revert_success.c deleted file mode 100644 index 354a6eadf..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_revert_success.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "../namechanger.h" - -static void namechanger_scene_revert_success_popup_callback(void* context) { - NameChanger* namechanger = context; - view_dispatcher_send_custom_event(namechanger->view_dispatcher, NameChangerCustomEventBack); -} - -void namechanger_scene_revert_success_on_enter(void* context) { - NameChanger* namechanger = context; - Popup* popup = namechanger->popup; - - popup_set_header(popup, "Reverted!", 70, 5, AlignLeft, AlignTop); - popup_set_text(popup, "Rebooting...", 70, 16, AlignLeft, AlignTop); - - popup_set_callback(popup, namechanger_scene_revert_success_popup_callback); - popup_set_context(popup, namechanger); - popup_set_timeout(popup, 5000); - popup_enable_timeout(popup); - - view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewPopup); -} - -bool namechanger_scene_revert_success_on_event(void* context, SceneManagerEvent event) { - NameChanger* namechanger = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeBack) { - consumed = true; - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } else if(event.type == SceneManagerEventTypeCustom) { - consumed = true; - if(event.event == NameChangerCustomEventBack) { - scene_manager_search_and_switch_to_previous_scene( - namechanger->scene_manager, NameChangerSceneStart); - } - } - - return consumed; -} - -void namechanger_scene_revert_success_on_exit(void* context) { - NameChanger* namechanger = context; - Popup* popup = namechanger->popup; - - popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 0, NULL); - - popup_disable_timeout(popup); - popup_set_context(popup, NULL); - popup_set_callback(popup, NULL); - - furi_hal_power_reset(); -} \ No newline at end of file diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_start.c b/applications/plugins/namechanger/scenes/namechanger_scene_start.c deleted file mode 100644 index 3fe93f5a2..000000000 --- a/applications/plugins/namechanger/scenes/namechanger_scene_start.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "../namechanger.h" - -enum SubmenuIndex { - SubmenuIndexChange, - SubmenuIndexRevert, -}; - -void namechanger_scene_start_submenu_callback(void* context, uint32_t index) { - NameChanger* namechanger = context; - view_dispatcher_send_custom_event(namechanger->view_dispatcher, index); -} - -void namechanger_scene_start_on_enter(void* context) { - NameChanger* namechanger = context; - Submenu* submenu = namechanger->submenu; - - submenu_add_item( - submenu, - "Change", - SubmenuIndexChange, - namechanger_scene_start_submenu_callback, - namechanger); - - submenu_add_item( - submenu, - "Revert", - SubmenuIndexRevert, - namechanger_scene_start_submenu_callback, - namechanger); - - submenu_set_selected_item( - submenu, scene_manager_get_scene_state(namechanger->scene_manager, NameChangerSceneStart)); - - view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewSubmenu); -} - -bool namechanger_scene_start_on_event(void* context, SceneManagerEvent event) { - NameChanger* namechanger = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - scene_manager_set_scene_state( - namechanger->scene_manager, NameChangerSceneStart, event.event); - consumed = true; - if(event.event == SubmenuIndexChange) { - scene_manager_next_scene(namechanger->scene_manager, NameChangerSceneChange); - } - if(event.event == SubmenuIndexRevert) { - scene_manager_next_scene(namechanger->scene_manager, NameChangerSceneRevert); - } - } - return consumed; -} - -void namechanger_scene_start_on_exit(void* context) { - NameChanger* namechanger = context; - submenu_reset(namechanger->submenu); -}