From edb144eba11eab907683c773e65f7a09f909b8fb Mon Sep 17 00:00:00 2001
From: Tomek Sobkowiak <soop3k@gmail.com>
Date: Wed, 20 Jan 2021 17:47:36 +0100
Subject: [PATCH] [EGD-5347] Save/load brightness mode

Properly display mode as OnOff switch on screen.
---
 .../application-settings-new/windows/DisplayLightWindow.cpp  | 5 ++---
 .../screen-light-control/ScreenLightControl.hpp              | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module-apps/application-settings-new/windows/DisplayLightWindow.cpp b/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
index 370e8819787b66f060ac3a6d464c47a343ac97a3..9e3ef2f39f167eb0632ffda5fa5cd7aec25adb26 100644
--- a/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
+++ b/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
@@ -13,14 +13,13 @@
 
 namespace gui
 {
-
     DisplayLightWindow::DisplayLightWindow(app::Application *app, app::settingsInterface::ScreenLightSettings *settings)
         : BaseSettingsWindow(app, window::name::display_light), screenLightSettings(settings)
     {
         auto values = screenLightSettings->getCurrentValues();
 
         isDisplayLightSwitchOn = values.lightOn;
-        isAutoLightSwitchOn    = values.mode;
+        isAutoLightSwitchOn    = values.mode == screen_light_control::ScreenLightMode::Automatic;
         brightnessValue        = values.parameters.manualModeBrightness;
 
         setTitle(utils::localize.get("app_settings_display_display_light"));
@@ -85,7 +84,7 @@ namespace gui
         };
 
         auto spinner = std::make_unique<gui::SpinBoxOptionSettings>(
-            utils::translateI18("app_settings_display_light_brightness") + " " + std::to_string(brightnessStep),
+            utils::translateI18("app_settings_display_light_brightness") + " " + utils::to_string(brightnessStep),
             brightnessValue * brightnessStep,
             std::ceil(screen_light_control::Parameters::MAX_BRIGHTNESS / brightnessStep),
             setBrightness,
diff --git a/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp b/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
index 27cb2b4bcd22c9f2ab7959ac2ec2e5cffbd7c7de..7eb2a1263645c0e3ae4da6d1e650fbaf1d96ef13 100644
--- a/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
+++ b/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
@@ -5,8 +5,7 @@
 
 #include <service-db/service-db/Settings.hpp>
 #include "ControlFunctions.hpp"
-
-#include <sstream>
+#include <Utils.hpp>
 
 namespace sys
 {
@@ -85,7 +84,7 @@ namespace screen_light_control
 
         template <class T> void setScreenLightSettings(const std::string &varName, T value)
         {
-            settings->setValue(varName, std::to_string(value));
+            settings->setValue(varName, utils::to_string(value));
         }
         void initFromSettings();