diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index 36c958af5..baba82f96 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -16,7 +16,7 @@ void desktop_scene_fault_on_enter(void* context) { popup_set_context(popup, desktop); popup_set_header( popup, - "Flipper crashed\n and was rebooted", + "Slut passed out\n but is now back", 60, 14 + STATUS_BAR_Y_SHIFT, AlignCenter, diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index 2ce574b68..061a23452 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -61,18 +61,17 @@ bool desktop_main_input_callback(InputEvent* event, void* context) { main_view->callback(DesktopMainEventOpenClock, main_view->context); } // Right key is handled by animation manager - } else if(event->type == InputTypeLong) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenFavoriteSecondary, main_view->context); - } else if(event->key == InputKeyDown) { - main_view->callback(DesktopMainEventOpenFavoritePrimary, main_view->context); - } else if(event->key == InputKeyLeft) { - main_view->callback( - DesktopMainEventOpenSubRemote, main_view->context); // OPENS SUBGHZ REMOTE - } + } else if(event->type == InputTypeLong) { + if(event->key == InputKeyOk) { + main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); + } else if(event->key == InputKeyUp) { + main_view->callback(DesktopMainEventOpenFavoritePrimary, main_view->context); + } else if(event->key == InputKeyDown) { + main_view->callback(DesktopMainEventOpenFavoriteSecondary, main_view->context); + } else if(event->key == InputKeyLeft) { + main_view->callback(DesktopMainEventOpenSubRemote, main_view->context); // OPENS SUBGHZ REMOTE } + } if(event->key == InputKeyBack) { if(event->type == InputTypePress) { diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c index cf474c546..8cd3cf79d 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c @@ -69,7 +69,7 @@ void desktop_settings_scene_favorite_on_enter(void* context) { } submenu_set_header( - submenu, primary_favorite ? "Primary favorite app:" : "Secondary favorite app:"); + submenu, primary_favorite ? "Secondary favorite app:" : "Primary favorite app:"); submenu_set_selected_item(submenu, pre_select_item); // If set during loop, visual glitch. view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewMenu);