diff --git a/applications/plugins/dice/dice.c b/applications/plugins/dice/dice.c index 84f510fa3..92fd09a38 100644 --- a/applications/plugins/dice/dice.c +++ b/applications/plugins/dice/dice.c @@ -510,7 +510,7 @@ int32_t dice_app(void* p) { } else if(plugin_state->diceSelect == 20) { plugin_state->diceSelect = 100; } else if(plugin_state->diceSelect == 100) { - if(plugin_state->desktop_settings->is_dumbmode) { + if(plugin_state->desktop_settings->is_sfwmode) { plugin_state->diceSelect = 231; } else { plugin_state->diceSelect = 230; @@ -524,7 +524,7 @@ int32_t dice_app(void* p) { } else if(plugin_state->diceSelect == 229) { plugin_state->diceSelect = 228; } else if(plugin_state->diceSelect == 228) { - if(plugin_state->desktop_settings->is_dumbmode) { + if(plugin_state->desktop_settings->is_sfwmode) { plugin_state->diceSelect = 59; } else { plugin_state->diceSelect = 232; @@ -574,4 +574,4 @@ int32_t dice_app(void* p) { free(plugin_state->desktop_settings); free(plugin_state); return 0; -} \ No newline at end of file +} diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index ad4b11c66..41fd0b710 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -52,7 +52,7 @@ struct AnimationManager { FuriString* freezed_animation_name; int32_t freezed_animation_time_left; ViewStack* view_stack; - bool dummy_mode; + bool sfw_mode; }; static StorageAnimation* @@ -94,9 +94,9 @@ void animation_manager_set_interact_callback( animation_manager->interact_callback = callback; } -void animation_manager_set_dummy_mode_state(AnimationManager* animation_manager, bool enabled) { +void animation_manager_set_sfw_mode_state(AnimationManager* animation_manager, bool enabled) { furi_assert(animation_manager); - animation_manager->dummy_mode = enabled; + animation_manager->sfw_mode = enabled; animation_manager_start_new_idle(animation_manager); } @@ -370,7 +370,7 @@ static bool animation_manager_is_valid_idle_animation( static StorageAnimation* animation_manager_select_idle_animation(AnimationManager* animation_manager) { - if(animation_manager->dummy_mode) { + if(animation_manager->sfw_mode) { return animation_storage_find_animation(HARDCODED_ANIMATION_NAME); } StorageAnimationList_t animation_list; diff --git a/applications/services/desktop/animations/animation_manager.h b/applications/services/desktop/animations/animation_manager.h index a3dcc8827..724ed8249 100644 --- a/applications/services/desktop/animations/animation_manager.h +++ b/applications/services/desktop/animations/animation_manager.h @@ -164,4 +164,4 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m * @animation_manager instance * @enabled bool */ -void animation_manager_set_dummy_mode_state(AnimationManager* animation_manager, bool enabled); +void animation_manager_set_sfw_mode_state(AnimationManager* animation_manager, bool enabled); diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c index 632074d1e..7cf4a2948 100644 --- a/applications/services/desktop/desktop.c +++ b/applications/services/desktop/desktop.c @@ -38,7 +38,7 @@ static void desktop_lock_icon_draw_callback(Canvas* canvas, void* context) { canvas_draw_icon(canvas, 0, 0, &I_Lock_8x8); } -static void desktop_dummy_mode_icon_draw_callback(Canvas* canvas, void* context) { +static void desktop_sfw_mode_icon_draw_callback(Canvas* canvas, void* context) { UNUSED(context); furi_assert(canvas); canvas_draw_icon(canvas, 0, 0, &I_GameMode_11x8); @@ -146,11 +146,11 @@ void desktop_unlock(Desktop* desktop) { desktop_auto_lock_arm(desktop); } -void desktop_set_dummy_mode_state(Desktop* desktop, bool enabled) { - view_port_enabled_set(desktop->dummy_mode_icon_viewport, enabled); - desktop_main_set_dummy_mode_state(desktop->main_view, enabled); - animation_manager_set_dummy_mode_state(desktop->animation_manager, enabled); - desktop->settings.dummy_mode = enabled; +void desktop_set_sfw_mode_state(Desktop* desktop, bool enabled) { + view_port_enabled_set(desktop->sfw_mode_icon_viewport, enabled); + desktop_main_set_sfw_mode_state(desktop->main_view, enabled); + animation_manager_set_sfw_mode_state(desktop->animation_manager, enabled); + desktop->settings.sfw_mode = enabled; DESKTOP_SETTINGS_SAVE(&desktop->settings); } @@ -238,12 +238,12 @@ Desktop* desktop_alloc() { gui_add_view_port(desktop->gui, desktop->lock_icon_viewport, GuiLayerStatusBarLeft); // Dummy mode icon - desktop->dummy_mode_icon_viewport = view_port_alloc(); - view_port_set_width(desktop->dummy_mode_icon_viewport, icon_get_width(&I_GameMode_11x8)); + desktop->sfw_mode_icon_viewport = view_port_alloc(); + view_port_set_width(desktop->sfw_mode_icon_viewport, icon_get_width(&I_GameMode_11x8)); view_port_draw_callback_set( - desktop->dummy_mode_icon_viewport, desktop_dummy_mode_icon_draw_callback, desktop); - view_port_enabled_set(desktop->dummy_mode_icon_viewport, false); - gui_add_view_port(desktop->gui, desktop->dummy_mode_icon_viewport, GuiLayerStatusBarLeft); + desktop->sfw_mode_icon_viewport, desktop_sfw_mode_icon_draw_callback, desktop); + view_port_enabled_set(desktop->sfw_mode_icon_viewport, false); + gui_add_view_port(desktop->gui, desktop->sfw_mode_icon_viewport, GuiLayerStatusBarLeft); // Special case: autostart application is already running desktop->loader = furi_record_open(RECORD_LOADER); @@ -334,10 +334,10 @@ int32_t desktop_srv(void* p) { DESKTOP_SETTINGS_SAVE(&desktop->settings); } - view_port_enabled_set(desktop->dummy_mode_icon_viewport, desktop->settings.dummy_mode); - desktop_main_set_dummy_mode_state(desktop->main_view, desktop->settings.dummy_mode); - animation_manager_set_dummy_mode_state( - desktop->animation_manager, desktop->settings.dummy_mode); + view_port_enabled_set(desktop->sfw_mode_icon_viewport, desktop->settings.sfw_mode); + desktop_main_set_sfw_mode_state(desktop->main_view, desktop->settings.sfw_mode); + animation_manager_set_sfw_mode_state( + desktop->animation_manager, desktop->settings.sfw_mode); scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain); diff --git a/applications/services/desktop/desktop_i.h b/applications/services/desktop/desktop_i.h index 8034bbc3a..b6de6bfd5 100644 --- a/applications/services/desktop/desktop_i.h +++ b/applications/services/desktop/desktop_i.h @@ -58,7 +58,7 @@ struct Desktop { DesktopViewPinInput* pin_input_view; ViewPort* lock_icon_viewport; - ViewPort* dummy_mode_icon_viewport; + ViewPort* sfw_mode_icon_viewport; AnimationManager* animation_manager; @@ -76,4 +76,4 @@ Desktop* desktop_alloc(); void desktop_free(Desktop* desktop); void desktop_lock(Desktop* desktop); void desktop_unlock(Desktop* desktop); -void desktop_set_dummy_mode_state(Desktop* desktop, bool enabled); +void desktop_set_sfw_mode_state(Desktop* desktop, bool enabled); diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h index dd5e6d510..4c3144de6 100644 --- a/applications/services/desktop/desktop_settings.h +++ b/applications/services/desktop/desktop_settings.h @@ -55,6 +55,6 @@ typedef struct { uint8_t is_locked; uint32_t auto_lock_delay_ms; uint8_t displayBatteryPercentage; - bool is_dumbmode; - uint8_t dummy_mode; + bool is_sfwmode; + uint8_t sfw_mode; } DesktopSettings; diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c index ccebed955..6f3d14749 100644 --- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c +++ b/applications/services/desktop/scenes/desktop_scene_lock_menu.c @@ -27,7 +27,7 @@ void desktop_scene_lock_menu_on_enter(void* context) { scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0); desktop_lock_menu_set_callback(desktop->lock_menu, desktop_scene_lock_menu_callback, desktop); desktop_lock_menu_set_pin_state(desktop->lock_menu, desktop->settings.pin_code.length > 0); - desktop_lock_menu_set_dummy_mode_state(desktop->lock_menu, desktop->settings.dummy_mode); + desktop_lock_menu_set_sfw_mode_state(desktop->lock_menu, desktop->settings.sfw_mode); desktop_lock_menu_set_idx(desktop->lock_menu, 0); view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewIdLockMenu); @@ -91,12 +91,12 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) { case DesktopLockMenuEventExit: scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0); case DesktopLockMenuEventDummyModeOn: - desktop_set_dummy_mode_state(desktop, true); + desktop_set_sfw_mode_state(desktop, true); scene_manager_search_and_switch_to_previous_scene( desktop->scene_manager, DesktopSceneMain); break; case DesktopLockMenuEventDummyModeOff: - desktop_set_dummy_mode_state(desktop, false); + desktop_set_sfw_mode_state(desktop, false); scene_manager_search_and_switch_to_previous_scene( desktop->scene_manager, DesktopSceneMain); break; diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c index 8b0d5462c..f5155aa9d 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.c +++ b/applications/services/desktop/views/desktop_view_lock_menu.c @@ -9,10 +9,10 @@ #define LOCK_MENU_ITEMS_NB 5 -static void desktop_view_lock_menu_dumbmode_changed(bool isThisGameMode) { +static void desktop_view_lock_menu_sfwmode_changed(bool isThisGameMode) { DesktopSettingsApp* app = malloc(sizeof(DesktopSettingsApp)); DESKTOP_SETTINGS_LOAD(&app->settings); - app->settings.is_dumbmode = isThisGameMode; + app->settings.is_sfwmode = isThisGameMode; DESKTOP_SETTINGS_SAVE(&app->settings); } @@ -44,11 +44,11 @@ void desktop_lock_menu_set_pin_state(DesktopLockMenuView* lock_menu, bool pin_is true); } -void desktop_lock_menu_set_dummy_mode_state(DesktopLockMenuView* lock_menu, bool dummy_mode) { +void desktop_lock_menu_set_sfw_mode_state(DesktopLockMenuView* lock_menu, bool sfw_mode) { with_view_model( lock_menu->view, DesktopLockMenuViewModel * model, - { model->dummy_mode = dummy_mode; }, + { model->sfw_mode = sfw_mode; }, true); } @@ -86,7 +86,7 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) { // } else if(i == DesktopLockMenuIndexGameMode) { // str = "Games Mode"; } else if(i == DesktopLockMenuIndexDummy) { - if(m->dummy_mode) { + if(m->sfw_mode) { str = "NSFW Mode"; } else { str = "SFW Mode"; @@ -113,7 +113,7 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { DesktopLockMenuView* lock_menu = context; uint8_t idx = 0; bool consumed = false; - bool dummy_mode = false; + bool sfw_mode = false; bool update = false; with_view_model( @@ -140,7 +140,7 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { } } idx = model->idx; - dummy_mode = model->dummy_mode; + sfw_mode = model->sfw_mode; }, update); @@ -152,14 +152,14 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { } else if((idx == DesktopLockMenuIndexPinLockShutdown) && (event->type == InputTypeShort)) { lock_menu->callback(DesktopLockMenuEventPinLockShutdown, lock_menu->context); // } else if((idx == DesktopLockMenuIndexGameMode) && (event->type == InputTypeShort)) { - // desktop_view_lock_menu_dumbmode_changed(1); + // desktop_view_lock_menu_sfwmode_changed(1); // DOLPHIN_DEED(getRandomDeed()); // lock_menu->callback(DesktopLockMenuEventExit, lock_menu->context); } else if(idx == DesktopLockMenuIndexDummy) { // DOLPHIN_DEED(getRandomDeed()); - if((dummy_mode == false) && (event->type == InputTypeShort)) { + if((sfw_mode == false) && (event->type == InputTypeShort)) { lock_menu->callback(DesktopLockMenuEventDummyModeOn, lock_menu->context); - } else if((dummy_mode == true) && (event->type == InputTypeShort)) { + } else if((sfw_mode == true) && (event->type == InputTypeShort)) { lock_menu->callback(DesktopLockMenuEventDummyModeOff, lock_menu->context); } } diff --git a/applications/services/desktop/views/desktop_view_lock_menu.h b/applications/services/desktop/views/desktop_view_lock_menu.h index 812aa9f99..b05ef25ae 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.h +++ b/applications/services/desktop/views/desktop_view_lock_menu.h @@ -18,7 +18,7 @@ struct DesktopLockMenuView { typedef struct { uint8_t idx; bool pin_is_set; - bool dummy_mode; + bool sfw_mode; } DesktopLockMenuViewModel; void desktop_lock_menu_set_callback( @@ -28,7 +28,7 @@ void desktop_lock_menu_set_callback( View* desktop_lock_menu_get_view(DesktopLockMenuView* lock_menu); void desktop_lock_menu_set_pin_state(DesktopLockMenuView* lock_menu, bool pin_is_set); -void desktop_lock_menu_set_dummy_mode_state(DesktopLockMenuView* lock_menu, bool dummy_mode); +void desktop_lock_menu_set_sfw_mode_state(DesktopLockMenuView* lock_menu, bool sfw_mode); void desktop_lock_menu_set_idx(DesktopLockMenuView* lock_menu, uint8_t idx); DesktopLockMenuView* desktop_lock_menu_alloc(); void desktop_lock_menu_free(DesktopLockMenuView* lock_menu); diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index 061a23452..10e897bd7 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -14,7 +14,7 @@ struct DesktopMainView { DesktopMainViewCallback callback; void* context; TimerHandle_t poweroff_timer; - bool dummy_mode; + bool sfw_mode; }; #define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 5000 @@ -39,9 +39,9 @@ View* desktop_main_get_view(DesktopMainView* main_view) { return main_view->view; } -void desktop_main_set_dummy_mode_state(DesktopMainView* main_view, bool dummy_mode) { +void desktop_main_set_sfw_mode_state(DesktopMainView* main_view, bool sfw_mode) { furi_assert(main_view); - main_view->dummy_mode = dummy_mode; + main_view->sfw_mode = sfw_mode; } bool desktop_main_input_callback(InputEvent* event, void* context) { diff --git a/applications/services/desktop/views/desktop_view_main.h b/applications/services/desktop/views/desktop_view_main.h index b5492b1be..bf4f918bf 100644 --- a/applications/services/desktop/views/desktop_view_main.h +++ b/applications/services/desktop/views/desktop_view_main.h @@ -13,6 +13,6 @@ void desktop_main_set_callback( void* context); View* desktop_main_get_view(DesktopMainView* main_view); -void desktop_main_set_dummy_mode_state(DesktopMainView* main_view, bool dummy_mode); +void desktop_main_set_sfw_mode_state(DesktopMainView* main_view, bool sfw_mode); DesktopMainView* desktop_main_alloc(); void desktop_main_free(DesktopMainView* main_view); diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c index 6a1f7118c..44ccea2a3 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c @@ -10,7 +10,7 @@ #define SCENE_EVENT_SELECT_PIN_SETUP 2 #define SCENE_EVENT_SELECT_AUTO_LOCK_DELAY 3 #define SCENE_EVENT_SELECT_BATTERY_DISPLAY 4 -#define SCENE_EVENT_SELECT_DUMBMODE 5 +#define SCENE_EVENT_SELECT_SFWMODE 5 #define AUTO_LOCK_DELAY_COUNT 9 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = { @@ -39,13 +39,13 @@ const uint32_t displayBatteryPercentage_value[BATTERY_VIEW_COUNT] = {0, 1, 2, 3, uint8_t origBattDisp_value = 0; -#define DUMBMODE_COUNT 2 -const char* const dumbmode_text[DUMBMODE_COUNT] = { +#define SFWMODE_COUNT 2 +const char* const sfwmode_text[SFWMODE_COUNT] = { "OFF", "ON", }; -const uint32_t dumbmode_value[DUMBMODE_COUNT] = {0, 1}; +const uint32_t sfwmode_value[SFWMODE_COUNT] = {0, 1}; static void desktop_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) { DesktopSettingsApp* app = context; @@ -68,12 +68,12 @@ static void desktop_settings_scene_start_battery_view_changed(VariableItem* item app->settings.displayBatteryPercentage = index; } -static void desktop_settings_scene_start_dumbmode_changed(VariableItem* item) { +static void desktop_settings_scene_start_sfwmode_changed(VariableItem* item) { DesktopSettingsApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); - variable_item_set_current_value_text(item, dumbmode_text[index]); - app->settings.is_dumbmode = dumbmode_value[index]; + variable_item_set_current_value_text(item, sfwmode_text[index]); + app->settings.is_sfwmode = sfwmode_value[index]; } void desktop_settings_scene_start_on_enter(void* context) { @@ -121,13 +121,13 @@ void desktop_settings_scene_start_on_enter(void* context) { item = variable_item_list_add( variable_item_list, "Games Only", - DUMBMODE_COUNT, - desktop_settings_scene_start_dumbmode_changed, + SFWMODE_COUNT, + desktop_settings_scene_start_sfwmode_changed, app); - value_index = value_index_uint32(app->settings.is_dumbmode, dumbmode_value, DUMBMODE_COUNT); + value_index = value_index_uint32(app->settings.is_sfwmode, sfwmode_value, SFWMODE_COUNT); variable_item_set_current_value_index(item, value_index); - variable_item_set_current_value_text(item, dumbmode_text[value_index]); + variable_item_set_current_value_text(item, sfwmode_text[value_index]); variable_item_list_set_enter_callback( variable_item_list, desktop_settings_scene_start_var_list_enter_callback, app); @@ -165,7 +165,7 @@ bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent sme) case SCENE_EVENT_SELECT_BATTERY_DISPLAY: consumed = true; break; - case SCENE_EVENT_SELECT_DUMBMODE: + case SCENE_EVENT_SELECT_SFWMODE: consumed = true; break; }