5 files changed, 22 insertions(+), 11 deletions(-)

M module-apps/application-settings-new/ApplicationSettings.cpp
M module-apps/application-settings-new/windows/NetworkWindow.cpp
M module-apps/application-settings-new/windows/NetworkWindow.hpp
M module-apps/windows/OptionWindow.cpp
M module-apps/windows/OptionWindow.hpp

@@ 131,7 131,7 @@ namespace app
             }
             auto currentWindow = getCurrentWindow();
             if (gui::window::name::network == currentWindow->getName()) {
-                currentWindow->rebuild();
+                updateWindow(gui::window::name::network, nullptr);
             }
         }
 

@@ 14,12 14,11 @@ namespace gui
     NetworkWindow::NetworkWindow(app::Application *app,
                                  app::settingsInterface::SimParams *simParams,
                                  app::settingsInterface::OperatorsSettings *operatorsSettings)
-        : OptionWindow(app, gui::window::name::network), simParams(simParams), operatorsSettings(operatorsSettings)
-    {
-        addOptions(netOptList());
-    }
+        : BaseSettingsWindow(app, gui::window::name::network), simParams(simParams),
+          operatorsSettings(operatorsSettings)
+    {}
 
-    auto NetworkWindow::netOptList() -> std::list<gui::Option>
+    auto NetworkWindow::buildOptionsList() -> std::list<gui::Option>
     {
         std::list<gui::Option> optList;
         std::string simStr;


@@ 69,7 68,7 @@ namespace gui
             utils::translate("app_settings_network_operator_auto_select"),
             [=](gui::Item &item) {
                 operatorsSettings->setOperatorsOn(!operatorsOn);
-                refreshOptions(netOptList());
+                refreshOptionsList();
                 return true;
             },
             nullptr,


@@ 113,7 112,7 @@ namespace gui
             utils::translate("app_settings_network_voice_over_lte"),
             [=](gui::Item &item) {
                 operatorsSettings->setVoLTEOn(!voLteOn);
-                refreshOptions(netOptList());
+                refreshOptionsList();
                 return true;
             },
             nullptr,

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "OptionWindow.hpp"
+#include "BaseSettingsWindow.hpp"
 #include "Application.hpp"
 
 namespace app::settingsInterface


@@ 20,10 20,10 @@ namespace gui
         inline constexpr auto network_window = "Network";
     };
 
-    class NetworkWindow : public OptionWindow
+    class NetworkWindow : public BaseSettingsWindow
     {
       private:
-        auto netOptList() -> std::list<gui::Option>;
+        auto buildOptionsList() -> std::list<Option>;
         app::settingsInterface::SimParams *simParams;
         app::settingsInterface::OperatorsSettings *operatorsSettings;
 

@@ 98,6 98,17 @@ namespace gui
         setFocusItem(optionsList);
     }
 
+    top_bar::Configuration OptionWindow::configureTopBar(top_bar::Configuration appConfiguration)
+    {
+        appConfiguration.enable(top_bar::Indicator::NetworkAccessTechnology);
+        appConfiguration.enable(top_bar::Indicator::Time);
+        appConfiguration.enable(top_bar::Indicator::PhoneMode);
+        appConfiguration.enable(top_bar::Indicator::Battery);
+        appConfiguration.enable(top_bar::Indicator::Signal);
+        appConfiguration.enable(top_bar::Indicator::SimCard);
+        return appConfiguration;
+    }
+
     void OptionWindow::onClose()
     {
         optionsList->onClose();

@@ 40,5 40,6 @@ namespace gui
         void onClose() override;
         void rebuild() override;
         void buildInterface() override;
+        top_bar::Configuration configureTopBar(top_bar::Configuration appConfiguration) override;
     };
 }; // namespace gui