feat: move file manager to apps

ElectronicCats · Oct 4, 2024 · fdded88 · fdded88
1 parent 04d2901
commit fdded88
Showing 1 changed file with 36 additions and 34 deletions.
diff --git a/firmware/main/modules/menus_module/menus_include/menus.h b/firmware/main/modules/menus_module/menus_include/menus.h
@@ -415,13 +415,33 @@ menu_t menus[] = {  //////////////////////////////////
      .on_enter_cb = gps_screens_show_help,
      .on_exit_cb = NULL,
      .is_visible = true},
-    {.display_name = "Time zone",
-     .menu_idx = MENU_SETTINGS_TIME_ZONE,
-     .parent_idx = MENU_SETTINGS_SYSTEM,
+#endif
+#ifdef CONFIG_FILE_MANAGER_ENABLE
+    {.display_name = "File Manager",
+     .menu_idx = MENU_FILE_MANAGER,
+     .parent_idx = MENU_APPLICATIONS,
      .last_selected_submenu = 0,
-     .on_enter_cb = settings_module_time_zone,
+     .on_enter_cb = NULL,
+     .on_exit_cb = NULL,
+     .is_visible = true},
+  #ifdef CONFIG_FILE_MANAGER_LOCAL
+    {.display_name = "Local",
+     .menu_idx = MENU_FILE_MANAGER_LOCAL,
+     .parent_idx = MENU_FILE_MANAGER,
+     .last_selected_submenu = 0,
+     .on_enter_cb = file_manager_module_init,
      .on_exit_cb = NULL,
      .is_visible = true},
+  #endif
+  #ifdef CONFIG_FILE_MANAGER_WEB
+    {.display_name = "Web",
+     .menu_idx = MENU_FILE_MANAGER_WEB,
+     .parent_idx = MENU_FILE_MANAGER,
+     .last_selected_submenu = 0,
+     .on_enter_cb = web_file_browser_module_begin,
+     .on_exit_cb = NULL,
+     .is_visible = true},
+  #endif
 #endif
 #ifdef CONFIG_OTA_ENABLE
     {.display_name = "Update",
@@ -446,20 +466,29 @@ menu_t menus[] = {  //////////////////////////////////
      .on_enter_cb = NULL,
      .on_exit_cb = NULL,
      .is_visible = true},
-    {.display_name = "WiFi",
-     .menu_idx = MENU_SETTINGS_WIFI,
+#ifdef CONFIG_GPS_APPS_ENABLE
+    {.display_name = "Time zone",
+     .menu_idx = MENU_SETTINGS_TIME_ZONE,
      .parent_idx = MENU_SETTINGS_SYSTEM,
      .last_selected_submenu = 0,
-     .on_enter_cb = wifi_settings_begin,
+     .on_enter_cb = settings_module_time_zone,
      .on_exit_cb = NULL,
      .is_visible = true},
+#endif
     {.display_name = "SD card",
      .menu_idx = MENU_SETTINGS_SD_CARD,
      .parent_idx = MENU_SETTINGS_SYSTEM,
      .last_selected_submenu = 0,
      .on_enter_cb = NULL,
      .on_exit_cb = NULL,
      .is_visible = true},
+    {.display_name = "WiFi",
+     .menu_idx = MENU_SETTINGS_WIFI,
+     .parent_idx = MENU_SETTINGS_SYSTEM,
+     .last_selected_submenu = 0,
+     .on_enter_cb = wifi_settings_begin,
+     .on_exit_cb = NULL,
+     .is_visible = true},
     {.display_name = "Info",
      .menu_idx = MENU_SETTINGS_SD_CARD_INFO,
      .parent_idx = MENU_SETTINGS_SD_CARD,
@@ -481,33 +510,6 @@ menu_t menus[] = {  //////////////////////////////////
      .on_enter_cb = sd_card_settings_verify_sd_card,
      .on_exit_cb = NULL,
      .is_visible = true},
-#ifdef CONFIG_FILE_MANAGER_ENABLE
-    {.display_name = "File Manager",
-     .menu_idx = MENU_FILE_MANAGER,
-     .parent_idx = MENU_SETTINGS,
-     .last_selected_submenu = 0,
-     .on_enter_cb = NULL,
-     .on_exit_cb = NULL,
-     .is_visible = true},
-  #ifdef CONFIG_FILE_MANAGER_LOCAL
-    {.display_name = "Local",
-     .menu_idx = MENU_FILE_MANAGER_LOCAL,
-     .parent_idx = MENU_FILE_MANAGER,
-     .last_selected_submenu = 0,
-     .on_enter_cb = file_manager_module_init,
-     .on_exit_cb = NULL,
-     .is_visible = true},
-  #endif
-  #ifdef CONFIG_FILE_MANAGER_WEB
-    {.display_name = "Web",
-     .menu_idx = MENU_FILE_MANAGER_WEB,
-     .parent_idx = MENU_FILE_MANAGER,
-     .last_selected_submenu = 0,
-     .on_enter_cb = web_file_browser_module_begin,
-     .on_exit_cb = NULL,
-     .is_visible = true},
-  #endif
-#endif
     {.display_name = "Stealth Mode",
      .menu_idx = MENU_STEALTH_MODE,
      .parent_idx = MENU_SETTINGS,