From 6f34f435a20c982ceb4fe1e30ebdf500095578da Mon Sep 17 00:00:00 2001
From: Przemyslaw Brudny <przemyslaw.brudny@mudita.com>
Date: Thu, 6 May 2021 15:34:15 +0200
Subject: [PATCH] [EGD-6696] Fixed settings network window rebuilding on sim
 selection

Fixed settings network window rebuilding on sim
selection.
---
 .../ApplicationSettings.cpp                         |  2 +-
 .../windows/NetworkWindow.cpp                       | 13 ++++++-------
 .../windows/NetworkWindow.hpp                       |  6 +++---
 module-apps/windows/OptionWindow.cpp                | 11 +++++++++++
 module-apps/windows/OptionWindow.hpp                |  1 +
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/module-apps/application-settings-new/ApplicationSettings.cpp b/module-apps/application-settings-new/ApplicationSettings.cpp
index 0ebec2cdb79ccc3ea94f6c86584cc9a18b8aa26f..8300e1c0c924c07e8895cd4eec53d690ad94117b 100644
--- a/module-apps/application-settings-new/ApplicationSettings.cpp
+++ b/module-apps/application-settings-new/ApplicationSettings.cpp
@@ -131,7 +131,7 @@ namespace app
             }
             auto currentWindow = getCurrentWindow();
             if (gui::window::name::network == currentWindow->getName()) {
-                currentWindow->rebuild();
+                updateWindow(gui::window::name::network, nullptr);
             }
         }
 
diff --git a/module-apps/application-settings-new/windows/NetworkWindow.cpp b/module-apps/application-settings-new/windows/NetworkWindow.cpp
index 71faf033e7f7bd9f3be3d83f79eb6c02015085ed..8d4b83fee42d01747b2f502cf7e2ab701c6d4e19 100644
--- a/module-apps/application-settings-new/windows/NetworkWindow.cpp
+++ b/module-apps/application-settings-new/windows/NetworkWindow.cpp
@@ -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,
diff --git a/module-apps/application-settings-new/windows/NetworkWindow.hpp b/module-apps/application-settings-new/windows/NetworkWindow.hpp
index 1133cf22d49c576f9188219e16a3703e14bc718a..20a101bf0a4c37d9ad8ab635ae94e680537b3077 100644
--- a/module-apps/application-settings-new/windows/NetworkWindow.hpp
+++ b/module-apps/application-settings-new/windows/NetworkWindow.hpp
@@ -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;
 
diff --git a/module-apps/windows/OptionWindow.cpp b/module-apps/windows/OptionWindow.cpp
index 652e39167c8c26f615545a0b2305665b3081b5ac..7cfb993a2ac3d1f7e4d739b65c2affa686a41f9d 100644
--- a/module-apps/windows/OptionWindow.cpp
+++ b/module-apps/windows/OptionWindow.cpp
@@ -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();
diff --git a/module-apps/windows/OptionWindow.hpp b/module-apps/windows/OptionWindow.hpp
index 98ab542d066e89cf6944aad4e2ee4388578558e1..7277135b492ad367dd9ad6ec97e9130129a35dd3 100644
--- a/module-apps/windows/OptionWindow.hpp
+++ b/module-apps/windows/OptionWindow.hpp
@@ -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