app manager (#2442)

* fix unset autostart
* clean up - add comments to prevent misleading
* move the app to external and with necessary changes
* replace autostart app

firmware/application/apps/ui_external_module_view.cpp

@@ -92,6 +92,9 @@ void ExternalModuleView::on_tick_second() {
             case app_location_t::TX:
                 btnText += " (TX)";
                 break;
+            case app_location_t::SETTINGS:
+                btnText += " (Settings)";
+                break;
             case app_location_t::DEBUG:
                 btnText += " (Debug)";
                 break;

firmware/application/apps/ui_settings.cpp

@@ -53,6 +53,8 @@ namespace fs = std::filesystem;
 #include "i2cdevmanager.hpp"
 #include "i2cdev_max17055.hpp"
 
+#include "file_reader.hpp"
+
 extern ui::SystemView* system_view_ptr;
 
 namespace pmem = portapack::persistent_memory;
@@ -975,67 +977,6 @@ void SetMenuColorView::focus() {
     button_save.focus();
 }
 
-/* SetAutoStartView ************************************/
-
-SetAutostartView::SetAutostartView(NavigationView& nav) {
-    add_children({&labels,
-                  &button_save,
-                  &button_cancel,
-                  &button_reset,
-                  &options});
-
-    button_save.on_select = [&nav, this](Button&) {
-        autostart_app = "";
-        if (selected != 0) {
-            auto it = full_app_list.find(selected);
-            if (it != full_app_list.end())
-                autostart_app = it->second;
-        }
-        nav.pop();
-    };
-
-    button_cancel.on_select = [&nav, this](Button&) {
-        nav.pop();
-    };
-
-    button_reset.on_select = [this](Button&) {
-        selected = 0;
-        options.set_selected_index(0);
-        autostart_app = "";
-    };
-
-    // options
-    i = 0;
-    OptionsField::option_t o{"-none-", i};
-    opts.emplace_back(o);
-    for (auto& app : NavigationView::appList) {
-        if (app.id == nullptr) continue;
-        i++;
-        o = {app.displayName, i};
-        opts.emplace_back(o);
-        full_app_list.emplace(i, app.id);
-        if (autostart_app == app.id) selected = i;
-    }
-    ExternalItemsMenuLoader::load_all_external_items_callback([this](ui::AppInfoConsole& app) {
-        if (app.appCallName == nullptr) return;
-        i++;
-        OptionsField::option_t o = {app.appFriendlyName, i};
-        opts.emplace_back(o);
-        full_app_list.emplace(i, app.appCallName);
-        if (autostart_app == app.appCallName) selected = i;
-    });
-
-    options.set_options(opts);
-    options.on_change = [this](size_t, OptionsField::value_t v) {
-        selected = v;
-    };
-    options.set_selected_index(selected);
-}
-
-void SetAutostartView::focus() {
-    options.focus();
-}
-
 /* SetThemeView ************************************/
 
 SetThemeView::SetThemeView(NavigationView& nav) {
@@ -1117,9 +1058,12 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav)
 }
 
 void SettingsMenuView::on_populate() {
-    if (pmem::show_gui_return_icon()) {
+    const bool return_icon = pmem::show_gui_return_icon();
+
+    if (return_icon) {
         add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
     }
+
     add_items({
         {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<AppSettingsView>(); }},
         {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [this]() { nav_.push<SetAudioView>(); }},
@@ -1138,9 +1082,11 @@ void SettingsMenuView::on_populate() {
         {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetDisplayView>(); }},
         {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
         {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetThemeView>(); }},
-        {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},
     });
+
     if (battery::BatteryManagement::isDetected()) add_item({"Battery", ui::Color::dark_cyan(), &bitmap_icon_batt_icon, [this]() { nav_.push<SetBatteryView>(); }});
+
+    add_external_items(nav_, app_location_t::SETTINGS, *this, return_icon ? 1 : 0);
 }
 
 } /* namespace ui */

firmware/application/apps/ui_settings.hpp

@@ -888,47 +888,6 @@ class SetMenuColorView : public View {
     };
 };
 
-class SetAutostartView : public View {
-   public:
-    SetAutostartView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "Autostart"; };
-
-   private:
-    int32_t i = 0;
-    std::string autostart_app{""};
-    OptionsField::options_t opts{};
-    std::map<int32_t, std::string> full_app_list{};  // looking table
-    int32_t selected = 0;
-    SettingsStore nav_setting{
-        "nav"sv,
-        {{"autostart_app"sv, &autostart_app}}};
-    Labels labels{
-        {{1 * 8, 1 * 16}, "Select app to start on boot", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 2 * 16}, "(an SD Card is required)", Theme::getInstance()->fg_light->foreground}};
-
-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
-    OptionsField options{
-        {0 * 8, 4 * 16},
-        screen_width / 8,
-        {},
-        true};
-
-    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
-        "Cancel",
-    };
-
-    Button button_reset{
-        {2 * 8, 6 * 16, screen_width - 4 * 8, 32},
-        "Reset"};
-};
-
 class SetThemeView : public View {
    public:
     SetThemeView(NavigationView& nav);
@@ -1012,6 +971,7 @@ class SettingsMenuView : public BtnGridView {
 
    private:
     NavigationView& nav_;
+
     void on_populate() override;
 };