Rearrange menu (#246)

* rearrange menu
2020-11-18 12:39:10 +03:00
parent 6d7ecf9a44
commit f0bda07742
3 changed files with 198 additions and 103 deletions
--- a/applications/applications.h
+++ b/applications/applications.h
@@ -42,98 +42,146 @@ void floopper_bloopper(void* p);

 const FlipperStartupApp FLIPPER_STARTUP[] = {
 #ifdef APP_DISPLAY
-    {.app = display_u8g2, .name = "display_u8g2", .libs = {0}},
+    {.app = display_u8g2, .name = "display_u8g2", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_CLI
-    {.app = cli_task, .name = "cli_task", .libs = {0}},
+    {.app = cli_task, .name = "cli_task", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_BLINK
-    {.app = application_blink, .name = "blink", .libs = {1, FURI_LIB{"input_task"}}},
+    {.app = application_blink,
+     .name = "blink",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_INPUT
-    {.app = input_task, .name = "input_task", .libs = {0}},
+    {.app = input_task, .name = "input_task", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_INPUT_DUMP
-    {.app = application_input_dump, .name = "input dump", .libs = {1, FURI_LIB{"input_task"}}},
+    {.app = application_input_dump,
+     .name = "input dump",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_GUI
-    {.app = backlight_control, .name = "backlight_control", .libs = {1, FURI_LIB{"input_task"}}},
-    {.app = gui_task, .name = "gui_task", .libs = {0}},
+    {.app = backlight_control,
+     .name = "backlight_control",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
+    {.app = gui_task, .name = "gui_task", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_MENU
-    {.app = menu_task, .name = "menu_task", .libs = {1, FURI_LIB{"gui_task"}}},
-    {.app = app_loader, .name = "app_loader", .libs = {2, FURI_LIB{"menu_task", "cli_task"}}},
+    {.app = menu_task,
+     .name = "menu_task",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
+    {.app = app_loader,
+     .name = "app_loader",
+     .libs = {2, FURI_LIB{"menu_task", "cli_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_IRUKAGOTCHI
-    {.app = irukagotchi_task, .name = "irukagotchi_task", .libs = {1, FURI_LIB{"menu_task"}}},
+    {.app = irukagotchi_task,
+     .name = "irukagotchi_task",
+     .libs = {1, FURI_LIB{"menu_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_POWER
-    {.app = power_task, .name = "power_task", .libs = {2, FURI_LIB{"cli_task", "gui_task"}}},
+    {.app = power_task,
+     .name = "power_task",
+     .libs = {2, FURI_LIB{"cli_task", "gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_CC1101
-    {.app = cc1101_workaround, .name = "cc1101 workaround", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = cc1101_workaround,
+     .name = "cc1101 workaround",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_LF_RFID
-    {.app = lf_rfid_workaround, .name = "lf rfid workaround", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = lf_rfid_workaround,
+     .name = "lf rfid workaround",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_IRDA
-    {.app = irda, .name = "irda", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = irda, .name = "irda", .libs = {1, FURI_LIB{"gui_task"}}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_NFC
-    {.app = nfc_task, .name = "nfc_task", .libs = {1, FURI_LIB{"menu_task"}}},
+    {.app = nfc_task, .name = "nfc_task", .libs = {1, FURI_LIB{"menu_task"}}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_TEST
-    {.app = flipper_test_app, .name = "test app", .libs = {0}},
+    {.app = flipper_test_app, .name = "test app", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_IPC
-    {.app = application_ipc_display, .name = "ipc display", .libs = {0}},
-    {.app = application_ipc_widget, .name = "ipc widget", .libs = {0}},
+    {.app = application_ipc_display, .name = "ipc display", .libs = {0}, .icon = A_Plugins_14},
+    {.app = application_ipc_widget, .name = "ipc widget", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_QRCODE
-    {.app = u8g2_qrcode, .name = "u8g2_qrcode", .libs = {1, FURI_LIB{"display_u8g2"}}},
+    {.app = u8g2_qrcode,
+     .name = "u8g2_qrcode",
+     .libs = {1, FURI_LIB{"display_u8g2"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_FATFS
-    {.app = fatfs_list, .name = "fatfs_list", .libs = {2, FURI_LIB{"display_u8g2", "input_task"}}},
+    {.app = fatfs_list,
+     .name = "fatfs_list",
+     .libs = {2, FURI_LIB{"display_u8g2", "input_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_EXAMPLE_DISPLAY
-    {.app = u8g2_example, .name = "u8g2_example", .libs = {1, FURI_LIB{"display_u8g2"}}},
+    {.app = u8g2_example,
+     .name = "u8g2_example",
+     .libs = {1, FURI_LIB{"display_u8g2"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_SPEAKER_DEMO
-    {.app = coreglitch_demo_0, .name = "coreglitch_demo_0", .libs = {0}},
+    {.app = coreglitch_demo_0, .name = "coreglitch_demo_0", .libs = {0}, .icon = A_Plugins_14},
 #endif

 #ifdef APP_SD_TEST
-    {.app = sd_card_test, .name = "sd_card_test", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = sd_card_test,
+     .name = "sd_card_test",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_MUSIC_PLAYER
-    {.app = music_player, .name = "music player", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = music_player,
+     .name = "music player",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_IBUTTON
-    {.app = app_ibutton, .name = "ibutton", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = app_ibutton,
+     .name = "ibutton",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_GPIO_DEMO
-    {.app = app_gpio_test, .name = "gpio test", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = app_gpio_test,
+     .name = "gpio test",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef APP_FLOOPPER_BLOOPPER
@@ -141,53 +189,79 @@ const FlipperStartupApp FLIPPER_STARTUP[] = {
 #endif
 };

+// Main menu APP
 const FlipperStartupApp FLIPPER_APPS[] = {
-#ifdef BUILD_EXAMPLE_BLINK
-    {.app = application_blink, .name = "blink", .libs = {1, FURI_LIB{"input_task"}}},
-#endif
-
-#ifdef BUILD_EXAMPLE_UART_WRITE
-    {.app = application_uart_write, .name = "uart write", .libs = {0}},
-#endif
-
-#ifdef BUILD_EXAMPLE_INPUT_DUMP
-    {.app = application_input_dump, .name = "input dump", .libs = {1, FURI_LIB{"input_task"}}},
-#endif
-
 #ifdef BUILD_CC1101
-    {.app = cc1101_workaround, .name = "cc1101 workaround", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = cc1101_workaround,
+     .name = "Sub-1 GHz",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Sub1ghz_14},
 #endif

 #ifdef BUILD_LF_RFID
-    {.app = lf_rfid_workaround, .name = "lf rfid workaround", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = lf_rfid_workaround,
+     .name = "125 kHz RFID",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_125khz_14},
 #endif

 #ifdef BUILD_IRDA
-    {.app = irda, .name = "irda", .libs = {1, FURI_LIB{"gui_task"}}},
-#endif
-
-#ifdef BUILD_SPEAKER_DEMO
-    {.app = coreglitch_demo_0, .name = "coreglitch_demo_0", .libs = {0}},
-#endif
-
-#ifdef BUILD_SD_TEST
-    {.app = sd_card_test, .name = "sd_card_test", .libs = {1, FURI_LIB{"gui_task"}}},
-#endif
-
-#ifdef BUILD_VIBRO_DEMO
-    {.app = application_vibro, .name = "application_vibro", .libs = {1, FURI_LIB{"input_task"}}},
-#endif
-
-#ifdef BUILD_GPIO_DEMO
-    {.app = app_gpio_test, .name = "gpio test", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = irda, .name = "Infrared", .libs = {1, FURI_LIB{"gui_task"}}, .icon = A_Infrared_14},
 #endif

 #ifdef BUILD_IBUTTON
-    {.app = app_ibutton, .name = "ibutton", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = app_ibutton,
+     .name = "iButton",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_iButton_14},
+#endif
+
+    {.app = NULL, .name = "Bluetooth", .libs = {0}, .icon = A_Bluetooth_14},
+
+#ifdef BUILD_GPIO_DEMO
+    {.app = app_gpio_test, .name = "GPIO", .libs = {1, FURI_LIB{"gui_task"}}, .icon = A_GPIO_14},
+#endif
+};
+
+// Plugin menu
+const FlipperStartupApp FLIPPER_PLUGINS[] = {
+#ifdef BUILD_EXAMPLE_BLINK
+    {.app = application_blink,
+     .name = "blink",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
+#endif
+
+#ifdef BUILD_EXAMPLE_INPUT_DUMP
+    {.app = application_input_dump,
+     .name = "input dump",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
+#endif
+
+#ifdef BUILD_SPEAKER_DEMO
+    {.app = coreglitch_demo_0, .name = "coreglitch_demo_0", .libs = {0}, .icon = A_Plugins_14},
+#endif
+
+#ifdef BUILD_SD_TEST
+    {.app = sd_card_test,
+     .name = "sd_card_test",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
+#endif
+
+#ifdef BUILD_VIBRO_DEMO
+    {.app = application_vibro,
+     .name = "application_vibro",
+     .libs = {1, FURI_LIB{"input_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef BUILD_MUSIC_PLAYER
-    {.app = music_player, .name = "music player", .libs = {1, FURI_LIB{"gui_task"}}},
+    {.app = music_player,
+     .name = "music player",
+     .libs = {1, FURI_LIB{"gui_task"}},
+     .icon = A_Plugins_14},
 #endif

 #ifdef BUILD_FLOOPPER_BLOOPPER