mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

[FL-3797] Favorite apps navigation fix and text fixes (#3670)

Browse Source 
* fixed navigation in dummy mode, fixed wording for button presses and menus
* suppress PVS warnings

Co-authored-by: doomwastaken <k.volkov@flipperdevices.com>
This commit is contained in:
Konstantin Volkov
2024-05-28 14:57:03 +03:00
committed by GitHub
parent a6139b01ce
commit f309844ee0
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
View File

@@ -80,6 +80,7 @@ void desktop_settings_scene_favorite_on_enter(void* context) {
furi_assert(favorite_id < DummyAppNumber); furi_assert(favorite_id < DummyAppNumber);
curr_favorite_app = &app->settings.dummy_apps[favorite_id]; curr_favorite_app = &app->settings.dummy_apps[favorite_id];
default_passport = true; default_passport = true;
favorite_id |= SCENE_STATE_SET_DUMMY_APP;
} }
// Special case: Application browser // Special case: Application browser
@@ -141,28 +142,24 @@ void desktop_settings_scene_favorite_on_enter(void* context) {
switch(favorite_id) { switch(favorite_id) {
case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppLeftShort: case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppLeftShort:
submenu_set_header(submenu, "Left - Short"); case SCENE_STATE_SET_DUMMY_APP | DummyAppLeft:
submenu_set_header(submenu, "Left - Press");
break; break;
case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppLeftLong: case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppLeftLong:
submenu_set_header(submenu, "Left - Long"); submenu_set_header(submenu, "Left - Hold");
break; break;
case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppRightShort: case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppRightShort:
submenu_set_header(submenu, "Right - Short"); case SCENE_STATE_SET_DUMMY_APP | DummyAppRight:
submenu_set_header(submenu, "Right - Press");
break; break;
case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppRightLong: case SCENE_STATE_SET_FAVORITE_APP | FavoriteAppRightLong:
submenu_set_header(submenu, "Right - Long"); submenu_set_header(submenu, "Right - Hold");
break;
case SCENE_STATE_SET_DUMMY_APP | DummyAppLeft:
submenu_set_header(submenu, "Left");
break;
case SCENE_STATE_SET_DUMMY_APP | DummyAppRight:
submenu_set_header(submenu, "Right");
break; break;
case SCENE_STATE_SET_DUMMY_APP | DummyAppDown: case SCENE_STATE_SET_DUMMY_APP | DummyAppDown:
submenu_set_header(submenu, "Down"); submenu_set_header(submenu, "Down - Press");
break; break;
case SCENE_STATE_SET_DUMMY_APP | DummyAppOk: case SCENE_STATE_SET_DUMMY_APP | DummyAppOk:
submenu_set_header(submenu, "Middle"); submenu_set_header(submenu, "Middle - Press");
break; break;
default: default:
break; break;

12
applications/settings/desktop_settings/scenes/desktop_settings_scene_quick_apps_direction_menu.c
View File

@@ -34,14 +34,14 @@ void desktop_settings_scene_quick_apps_direction_menu_on_enter(void* context) {
if(favorite_id == SCENE_STATE_SET_FAVORITE_APP) { if(favorite_id == SCENE_STATE_SET_FAVORITE_APP) {
submenu_add_item( submenu_add_item(
submenu, submenu,
"Left - Click", "Left - Press",
QuickAppsSubmenuIndexFavoriteLeftClick, QuickAppsSubmenuIndexFavoriteLeftClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);
submenu_add_item( submenu_add_item(
submenu, submenu,
"Right - Click", "Right - Press",
QuickAppsSubmenuIndexFavoriteRightClick, QuickAppsSubmenuIndexFavoriteRightClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);
@@ -64,28 +64,28 @@ void desktop_settings_scene_quick_apps_direction_menu_on_enter(void* context) {
} else { } else {
submenu_add_item( submenu_add_item(
submenu, submenu,
"Left - Click", "Left - Press",
QuickAppsSubmenuIndexDummyLeftClick, QuickAppsSubmenuIndexDummyLeftClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);
submenu_add_item( submenu_add_item(
submenu, submenu,
"Right - Click", "Right - Press",
QuickAppsSubmenuIndexDummyRightClick, QuickAppsSubmenuIndexDummyRightClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);
submenu_add_item( submenu_add_item(
submenu, submenu,
"Down - Click", "Down - Press",
QuickAppsSubmenuIndexDummyDownClick, QuickAppsSubmenuIndexDummyDownClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);
submenu_add_item( submenu_add_item(
submenu, submenu,
"Middle - Click", "Middle - Press",
QuickAppsSubmenuIndexDummyMiddleClick, QuickAppsSubmenuIndexDummyMiddleClick,
desktop_settings_scene_quick_apps_direction_menu_submenu_callback, desktop_settings_scene_quick_apps_direction_menu_submenu_callback,
app); app);