13 files changed, 251 insertions(+), 9 deletions(-)

M image/assets/lang/English.json
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
M products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
M products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsAlarmSettingsWindow.cpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsAlarmSettingsWindow.hpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.cpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.hpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.cpp
A products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp

@@ 568,6 568,10 @@
   "app_bell_settings_advanced": "Advanced",
   "app_bell_settings_advanced_time_units": "Time & units",
   "app_bell_settings_advanced_temp_scale": "Temperature scale",
+  "app_bell_settings_alarm_settings": "Alarm settings",
+  "app_bell_settings_bedtime_tone": "Bedtime tone",
+  "app_bell_settings_home_view": "Home view",
+  "app_bell_settings_turn_off": "Turn off",
   "app_bellmain_home_screen_bottom_desc": "Next alarm will ring in",
   "app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate",
   "app_bell_alarm_deactivated": "Alarm deactivated",

@@ 9,8 9,12 @@
 #include "windows/BellSettingsAdvancedWindow.hpp"
 #include "windows/BellSettingsFinishedWindow.hpp"
 #include "windows/BellSettingsTimeUnitsWindow.hpp"
-#include "windows/BellSettingsWindow.hpp"
+#include "windows/BellSettingsAlarmSettingsWindow.hpp"
+#include "windows/BellSettingsBedtimeToneWindow.hpp"
 #include "windows/BellSettingsFrontlight.hpp"
+#include "windows/BellSettingsHomeViewWindow.hpp"
+#include "windows/BellSettingsTurnOffWindow.hpp"
+#include "windows/BellSettingsWindow.hpp"
 
 #include <apps-common/windows/Dialog.hpp>
 #include <apps-common/AsyncTask.hpp>


@@ 67,6 71,24 @@ namespace app
         windowsFactory.attach(gui::window::name::bellSettingsFinished, [](Application *app, const std::string &name) {
             return std::make_unique<gui::BellSettingsFinishedWindow>(app);
         });
+
+        windowsFactory.attach(gui::window::name::bellSettingsHomeView, [](Application *app, const std::string &name) {
+            return std::make_unique<gui::BellSettingsHomeViewWindow>(app);
+        });
+
+        windowsFactory.attach(gui::window::name::bellSettingsAlarmSettings,
+                              [](Application *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsAlarmSettingsWindow>(app);
+                              });
+
+        windowsFactory.attach(gui::window::name::bellSettingsBedtimeTone,
+                              [](Application *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsBedtimeToneWindow>(app);
+                              });
+
+        windowsFactory.attach(gui::window::name::bellSettingsTurnOff, [](Application *app, const std::string &name) {
+            return std::make_unique<gui::BellSettingsTurnOffWindow>(app);
+        });
     }
 
     sys::MessagePointer ApplicationBellSettings::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)

@@ 33,7 33,11 @@ target_sources(application-bell-settings
         windows/BellSettingsAdvancedWindow.cpp
         windows/BellSettingsTimeUnitsWindow.cpp
         windows/BellSettingsFinishedWindow.cpp
+        windows/BellSettingsAlarmSettingsWindow.cpp
+        windows/BellSettingsBedtimeToneWindow.cpp
         windows/BellSettingsFrontlight.cpp
+        windows/BellSettingsHomeViewWindow.cpp
+        windows/BellSettingsTurnOffWindow.cpp
 
         models/TimeUnitsModel.hpp
         models/TemperatureUnitModel.hpp


@@ 45,8 49,12 @@ target_sources(application-bell-settings
         widgets/TemperatureUnitListItem.hpp
         windows/BellSettingsWindow.hpp
         windows/BellSettingsAdvancedWindow.hpp
-        windows/BellSettingsTimeUnitsWindow.hpp
+        windows/BellSettingsAlarmSettingsWindow.hpp
+        windows/BellSettingsBedtimeToneWindow.hpp
         windows/BellSettingsFrontlight.hpp
+        windows/BellSettingsHomeViewWindow.hpp
+        windows/BellSettingsTimeUnitsWindow.hpp
+        windows/BellSettingsTurnOffWindow.hpp
 
     PRIVATE
         windows/BellSettingsFinishedWindow.hpp

@@ 8,13 8,16 @@
 
 namespace gui::window::name
 {
-    inline constexpr auto bellSettings           = "BellSettings";
-    inline constexpr auto bellSettingsAdvanced   = "BellSettingsAdvanced";
-    inline constexpr auto bellSettingsTimeUnits  = "BellSettingsTimeUnits";
-    inline constexpr auto bellSettingsDialog     = "BellSettingsDialog";
-    inline constexpr auto bellSettingsFinished   = "BellSettingsFinished";
-    inline constexpr auto bellSettingsFrontlight = "BellSettingsFrontlight";
-
+    inline constexpr auto bellSettings              = "BellSettings";
+    inline constexpr auto bellSettingsAdvanced      = "BellSettingsAdvanced";
+    inline constexpr auto bellSettingsTimeUnits     = "BellSettingsTimeUnits";
+    inline constexpr auto bellSettingsDialog        = "BellSettingsDialog";
+    inline constexpr auto bellSettingsFinished      = "BellSettingsFinished";
+    inline constexpr auto bellSettingsFrontlight    = "BellSettingsFrontlight";
+    inline constexpr auto bellSettingsHomeView      = "BellSettingsHomeView";
+    inline constexpr auto bellSettingsAlarmSettings = "BellSettingsAlarmSettings";
+    inline constexpr auto bellSettingsBedtimeTone   = "BellSettingsBedtimeTone";
+    inline constexpr auto bellSettingsTurnOff       = "BellSettingsTurnOff";
 } // namespace gui::window::name
 
 namespace app

@@ 0,0 1,29 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellSettingsAlarmSettingsWindow.hpp"
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+namespace gui
+{
+    BellSettingsAlarmSettingsWindow::BellSettingsAlarmSettingsWindow(app::Application *app, std::string name)
+        : OptionWindow(app, std::move(name))
+    {
+        buildInterface();
+    }
+
+    void BellSettingsAlarmSettingsWindow::rebuild()
+    {
+        erase();
+        buildInterface();
+    }
+
+    void BellSettingsAlarmSettingsWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+        statusBar->setVisible(false);
+        header->setTitleVisibility(false);
+        bottomBar->setVisible(false);
+    }
+} /* namespace gui */

@@ 0,0 1,21 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+#include <apps-common/windows/OptionWindow.hpp>
+
+namespace gui
+{
+    class BellSettingsAlarmSettingsWindow : public OptionWindow
+    {
+      public:
+        explicit BellSettingsAlarmSettingsWindow(app::Application *app,
+                                                 std::string name = gui::window::name::bellSettingsAlarmSettings);
+
+        void buildInterface() override;
+        void rebuild() override;
+    };
+} /* namespace gui */

@@ 0,0 1,29 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellSettingsBedtimeToneWindow.hpp"
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+namespace gui
+{
+    BellSettingsBedtimeToneWindow::BellSettingsBedtimeToneWindow(app::Application *app, std::string name)
+        : AppWindow(app, std::move(name))
+    {
+        buildInterface();
+    }
+
+    void BellSettingsBedtimeToneWindow::rebuild()
+    {
+        erase();
+        buildInterface();
+    }
+
+    void BellSettingsBedtimeToneWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+        statusBar->setVisible(false);
+        header->setTitleVisibility(false);
+        bottomBar->setVisible(false);
+    }
+} /* namespace gui */

@@ 0,0 1,21 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+#include <apps-common/windows/AppWindow.hpp>
+
+namespace gui
+{
+    class BellSettingsBedtimeToneWindow : public AppWindow
+    {
+      public:
+        explicit BellSettingsBedtimeToneWindow(app::Application *app,
+                                               std::string name = gui::window::name::bellSettingsBedtimeTone);
+
+        void buildInterface() override;
+        void rebuild() override;
+    };
+} /* namespace gui */

@@ 0,0 1,29 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellSettingsHomeViewWindow.hpp"
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+namespace gui
+{
+    BellSettingsHomeViewWindow::BellSettingsHomeViewWindow(app::Application *app, std::string name)
+        : AppWindow(app, std::move(name))
+    {
+        buildInterface();
+    }
+
+    void BellSettingsHomeViewWindow::rebuild()
+    {
+        erase();
+        buildInterface();
+    }
+
+    void BellSettingsHomeViewWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+        statusBar->setVisible(false);
+        header->setTitleVisibility(false);
+        bottomBar->setVisible(false);
+    }
+} /* namespace gui */

@@ 0,0 1,21 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+#include <apps-common/windows/AppWindow.hpp>
+
+namespace gui
+{
+    class BellSettingsHomeViewWindow : public AppWindow
+    {
+      public:
+        explicit BellSettingsHomeViewWindow(app::Application *app,
+                                            std::string name = gui::window::name::bellSettingsHomeView);
+
+        void buildInterface() override;
+        void rebuild() override;
+    };
+} /* namespace gui */

@@ 0,0 1,29 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellSettingsTurnOffWindow.hpp"
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+namespace gui
+{
+    BellSettingsTurnOffWindow::BellSettingsTurnOffWindow(app::Application *app, std::string name)
+        : AppWindow(app, std::move(name))
+    {
+        buildInterface();
+    }
+
+    void BellSettingsTurnOffWindow::rebuild()
+    {
+        erase();
+        buildInterface();
+    }
+
+    void BellSettingsTurnOffWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+        statusBar->setVisible(false);
+        header->setTitleVisibility(false);
+        bottomBar->setVisible(false);
+    }
+} /* namespace gui */

@@ 0,0 1,21 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <application-bell-settings/ApplicationBellSettings.hpp>
+
+#include <apps-common/windows/AppWindow.hpp>
+
+namespace gui
+{
+    class BellSettingsTurnOffWindow : public AppWindow
+    {
+      public:
+        explicit BellSettingsTurnOffWindow(app::Application *app,
+                                           std::string name = gui::window::name::bellSettingsTurnOff);
+
+        void buildInterface() override;
+        void rebuild() override;
+    };
+} /* namespace gui */

@@ 52,7 52,12 @@ namespace gui
                 this));
         };
 
+        addWinSettings(utils::translate("app_bell_settings_home_view"), gui::window::name::bellSettingsHomeView);
+        addWinSettings(utils::translate("app_bell_settings_alarm_settings"),
+                       gui::window::name::bellSettingsAlarmSettings);
+        addWinSettings(utils::translate("app_bell_settings_bedtime_tone"), gui::window::name::bellSettingsBedtimeTone);
         addWinSettings(utils::translate("app_bell_settings_advanced"), gui::window::name::bellSettingsAdvanced);
+        addWinSettings(utils::translate("app_bell_settings_turn_off"), gui::window::name::bellSettingsTurnOff);
 
         return settingsOptionList;
     }