30 files changed, 111 insertions(+), 104 deletions(-)

M products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
M products/BellHybrid/apps/application-bell-main/CMakeLists.txt
M products/BellHybrid/apps/application-bell-main/include/application-bell-main/presenters/HomeScreenPresenter.hpp
M products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
M products/BellHybrid/apps/application-bell-main/windows/BellBatteryStatusWindow.cpp
M products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
M products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.hpp
M products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp
M products/BellHybrid/apps/common/CMakeLists.txt
R products/BellHybrid/apps/{application-bell-main => common/include/common}/data/BatteryUtils.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/data/BellMainStyle.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/layouts/BaseHomeScreenLayoutProvider.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/layouts/HomeScreenLayoutClassic.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/layouts/HomeScreenLayoutClassicWithAmPm.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/layouts/HomeScreenLayoutClassicWithBattery.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/layouts/HomeScreenLayoutClassicWithTemp.hpp
M products/BellHybrid/apps/common/include/common/layouts/HomeScreenLayouts.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/widgets/BellBattery.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/widgets/DuoHBox.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/widgets/ProgressTimerWithSnoozeTimer.hpp
R products/BellHybrid/apps/{application-bell-main => common/include/common}/widgets/SnoozeTimer.hpp
R products/BellHybrid/apps/{application-bell-main => common/src}/layouts/HomeScreenLayoutClassic.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/layouts/HomeScreenLayoutClassicWithAmPm.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/layouts/HomeScreenLayoutClassicWithBattery.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/layouts/HomeScreenLayoutClassicWithTemp.cpp
A products/BellHybrid/apps/common/src/layouts/HomeScreenLayouts.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/widgets/BellBattery.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/widgets/DuoHBox.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/widgets/ProgressTimerWithSnoozeTimer.cpp
R products/BellHybrid/apps/{application-bell-main => common/src}/widgets/SnoozeTimer.cpp

@@ 2,11 2,6 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "include/application-bell-main/ApplicationBellMain.hpp"
-#include "layouts/BaseHomeScreenLayoutProvider.hpp"
-#include "layouts/HomeScreenLayoutClassic.hpp"
-#include "layouts/HomeScreenLayoutClassicWithAmPm.hpp"
-#include "layouts/HomeScreenLayoutClassicWithBattery.hpp"
-#include "layouts/HomeScreenLayoutClassicWithTemp.hpp"
 #include "models/BatteryModel.hpp"
 #include "models/TemperatureModel.hpp"
 


@@ 188,10 183,11 @@ namespace app
 
     void ApplicationBellMain::setHomeScreenLayout(std::string layoutName)
     {
-        if (gui::homeScreenLayouts.find(layoutName) == gui::homeScreenLayouts.end()) {
+        auto homeScreenLayoutsList = gui::homeScreenLayouts();
+        if (homeScreenLayoutsList.find(layoutName) == homeScreenLayoutsList.end()) {
             return;
         }
-        auto layoutGenerator = gui::homeScreenLayouts.at(layoutName);
-        homeScreenPresenter->setLayout(layoutGenerator());
+        auto layoutGenerator = homeScreenLayoutsList.at(layoutName);
+        homeScreenPresenter->setLayout(layoutGenerator);
     }
 } // namespace app

@@ 5,16 5,6 @@ target_sources(application-bell-main
     PRIVATE
         ApplicationBellMain.cpp
 
-        layouts/HomeScreenLayoutClassic.cpp
-        layouts/HomeScreenLayoutClassicWithAmPm.cpp
-        layouts/HomeScreenLayoutClassicWithBattery.cpp
-        layouts/HomeScreenLayoutClassicWithTemp.cpp
-
-        widgets/BellBattery.cpp
-        widgets/DuoHBox.cpp
-        widgets/ProgressTimerWithSnoozeTimer.cpp
-        widgets/SnoozeTimer.cpp
-
         windows/BellBatteryShutdownWindow.cpp
         windows/BellHomeScreenWindow.cpp
         windows/BellMainMenuWindow.cpp


@@ 26,22 16,10 @@ target_sources(application-bell-main
         presenters/HomeScreenPresenter.cpp
         presenters/StateController.cpp
 
-        layouts/BaseHomeScreenLayoutProvider.hpp
-        layouts/HomeScreenLayoutClassic.hpp
-        layouts/HomeScreenLayoutClassicWithAmPm.hpp
-        layouts/HomeScreenLayoutClassicWithBattery.hpp
-        layouts/HomeScreenLayoutClassicWithTemp.hpp
-
-        widgets/BellBattery.hpp
-        widgets/DuoHBox.hpp
-        widgets/ProgressTimerWithSnoozeTimer.hpp
-        widgets/SnoozeTimer.hpp
-
         windows/BellBatteryShutdownWindow.hpp
         windows/BellHomeScreenWindow.hpp
         windows/BellMainMenuWindow.hpp
         windows/BellBatteryStatusWindow.hpp
-        data/BatteryUtils.hpp
 
         models/BatteryModel.cpp
         models/TemperatureModel.hpp

@@ 5,6 5,8 @@
 
 #include <apps-common/BasePresenter.hpp>
 #include <common/models/AbstractAlarmModel.hpp>
+#include <common/layouts/BaseHomeScreenLayoutProvider.hpp>
+#include <common/layouts/HomeScreenLayouts.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <module-utils/EventStore/EventStore.hpp>
 #include <Timers/TimerHandle.hpp>


@@ 40,20 42,6 @@ namespace app::home_screen
     class AbstractBatteryModel;
     class AbstractTemperatureModel;
 
-    enum class ViewState
-    {
-        Deactivated,
-        DeactivatedWait,
-        WaitForConfirmation,
-        AlarmEdit,
-        ActivatedWait,
-        Activated,
-        AlarmRinging,
-        AlarmRingingDeactivatedWait,
-        AlarmSnoozedWait,
-        AlarmSnoozed
-    };
-
     class AbstractView
     {
       public:


@@ 82,10 70,10 @@ namespace app::home_screen
         virtual void setBatteryLevelState(const Store::Battery &batteryContext) = 0;
 
         /// Various
-        virtual void setLayout(std::unique_ptr<gui::BaseHomeScreenLayoutProvider> layout) = 0;
-        virtual void switchToMenu()                                                       = 0;
-        virtual void switchToBatteryStatus()                                              = 0;
-        virtual void setSnoozeTime(std::time_t time)                                      = 0;
+        virtual void setLayout(gui::LayoutGenerator layoutGenerator) = 0;
+        virtual void switchToMenu()                                  = 0;
+        virtual void switchToBatteryStatus()                         = 0;
+        virtual void setSnoozeTime(std::time_t time)                 = 0;
     };
 
     class AbstractPresenter : public BasePresenter<AbstractView>


@@ 110,7 98,7 @@ namespace app::home_screen
         virtual std::uint32_t getBatteryLvl() const                                              = 0;
         virtual bool isBatteryCharging() const                                                   = 0;
         virtual bool isAlarmActivatedByLatch() const                                             = 0;
-        virtual void setLayout(std::unique_ptr<gui::BaseHomeScreenLayoutProvider> layout)        = 0;
+        virtual void setLayout(gui::LayoutGenerator layoutGenerator)                             = 0;
 
         static constexpr auto defaultTimeout = std::chrono::milliseconds{5000};
     };


@@ 151,7 139,7 @@ namespace app::home_screen
         bool isBatteryCharging() const override;
         bool isAlarmActivatedByLatch() const override;
 
-        void setLayout(std::unique_ptr<gui::BaseHomeScreenLayoutProvider> layout) override;
+        void setLayout(gui::LayoutGenerator layoutGenerator) override;
 
       private:
         ApplicationCommon *app;

@@ 3,13 3,13 @@
 
 #include "application-bell-main/presenters/HomeScreenPresenter.hpp"
 #include "StateController.hpp"
-#include "layouts/BaseHomeScreenLayoutProvider.hpp"
 #include "models/BatteryModel.hpp"
 #include "models/TemperatureModel.hpp"
-#include "widgets/ProgressTimerWithSnoozeTimer.hpp"
 
 #include <apps-common/ApplicationCommon.hpp>
+#include <common/layouts/BaseHomeScreenLayoutProvider.hpp>
 #include <common/models/TimeModel.hpp>
+#include <common/widgets/ProgressTimerWithSnoozeTimer.hpp>
 #include <Timers/SystemTimer.hpp>
 #include <Timers/TimerFactory.hpp>
 #include <time/time_constants.hpp>


@@ 164,8 164,8 @@ namespace app::home_screen
         stateController->handleBatteryStatus();
     }
 
-    void HomeScreenPresenter::setLayout(std::unique_ptr<gui::BaseHomeScreenLayoutProvider> layout)
+    void HomeScreenPresenter::setLayout(gui::LayoutGenerator layoutGenerator)
     {
-        getView()->setLayout(std::move(layout));
+        getView()->setLayout(layoutGenerator);
     }
 } // namespace app::home_screen

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BellBatteryStatusWindow.hpp"
-#include "data/BatteryUtils.hpp"
 
+#include <common/data/BatteryUtils.hpp>
 #include <gui/widgets/text/TextFixedSize.hpp>
 #include <gui/widgets/ImageBox.hpp>
 #include <gui/input/InputEvent.hpp>

@@ 2,15 2,15 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BellHomeScreenWindow.hpp"
-#include "data/BellMainStyle.hpp"
-#include "widgets/SnoozeTimer.hpp"
-#include "widgets/ProgressTimerWithSnoozeTimer.hpp"
 #include "BellBatteryStatusWindow.hpp"
 #include "ProductConfig.hpp"
 
 #include <application-bell-main/ApplicationBellMain.hpp>
 #include <apps-common/actions/AlarmRingingData.hpp>
 #include <apps-common/widgets/BellBaseLayout.hpp>
+#include <common/layouts/HomeScreenLayouts.hpp>
+#include <common/widgets/SnoozeTimer.hpp>
+#include <common/widgets/ProgressTimerWithSnoozeTimer.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <gui/widgets/text/TextFixedSize.hpp>
 #include <gui/widgets/Style.hpp>


@@ 83,16 83,8 @@ namespace gui
         this->presenter->createData();
     }
 
-    BellHomeScreenWindow::~BellHomeScreenWindow()
-    {
-        if (currentLayout) {
-            removeWidget(currentLayout->getLayout());
-        }
-    }
-
     void BellHomeScreenWindow::buildInterface()
     {
-        using namespace bellMainStyle;
         AppWindow::buildInterface();
 
         statusBar->setVisible(false);


@@ 100,12 92,12 @@ namespace gui
         navBar->setVisible(false);
     }
 
-    void BellHomeScreenWindow::setLayout(std::unique_ptr<BaseHomeScreenLayoutProvider> layout)
+    void BellHomeScreenWindow::setLayout(LayoutGenerator layoutGenerator)
     {
         if (currentLayout) {
             removeWidget(currentLayout->getLayout());
         }
-        currentLayout = std::move(layout);
+        currentLayout = layoutGenerator();
         addWidget(static_cast<BellBaseLayout *>(currentLayout->getLayout()));
         presenter->onBeforeShow();
 

@@ 4,12 4,12 @@
 #pragma once
 
 #include "application-bell-main/presenters/HomeScreenPresenter.hpp"
-#include "layouts/BaseHomeScreenLayoutProvider.hpp"
 #include "models/TemperatureModel.hpp"
-#include "widgets/BellBattery.hpp"
 
 #include <apps-common/GuiTimer.hpp>
 #include <apps-common/windows/AppWindow.hpp>
+#include <common/layouts/BaseHomeScreenLayoutProvider.hpp>
+#include <common/widgets/BellBattery.hpp>
 
 namespace gui
 {


@@ 19,11 19,9 @@ namespace gui
         BellHomeScreenWindow(app::ApplicationCommon *app,
                              std::shared_ptr<app::home_screen::AbstractPresenter> presenter);
 
-        ~BellHomeScreenWindow();
-
       private:
         void buildInterface() override;
-        void setLayout(std::unique_ptr<BaseHomeScreenLayoutProvider> layout) override;
+        void setLayout(LayoutGenerator layoutGenerator) override;
         bool updateTime() override;
         bool onInput(const InputEvent &inputEvent) override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;


@@ 54,7 52,7 @@ namespace gui
 
         std::shared_ptr<app::home_screen::AbstractPresenter> presenter;
 
-        std::unique_ptr<BaseHomeScreenLayoutProvider> currentLayout;
+        BaseHomeScreenLayoutProvider *currentLayout{};
 
         static constexpr auto timerName = "HS_timer";
     };

@@ 10,7 10,6 @@
 #include <application-bell-meditation-timer/ApplicationBellMeditationTimer.hpp>
 #include <application-bell-settings/ApplicationBellSettings.hpp>
 #include <application-bell-powernap/ApplicationBellPowerNap.hpp>
-#include <data/BellMainStyle.hpp>
 
 #include <Dialog.hpp>
 #include <DialogMetadataMessage.hpp>

@@ 35,12 35,23 @@ target_sources(application-bell-common
         src/popups/BellRebootWindow.cpp
         src/popups/presenter/AlarmActivatedPresenter.cpp
         src/widgets/ListItems.cpp
+        src/widgets/BellBattery.cpp
         src/widgets/BellStatusClock.cpp
+        src/widgets/DuoHBox.cpp
+        src/widgets/ProgressTimerWithSnoozeTimer.cpp
+        src/widgets/SnoozeTimer.cpp
 
         src/options/BellOptionWindow.cpp
         src/options/BellShortOptionWindow.cpp
         src/options/OptionBellMenu.cpp
         src/options/BellOptionsNavigation.cpp
+
+        src/layouts/HomeScreenLayouts.cpp
+        src/layouts/HomeScreenLayoutClassic.cpp
+        src/layouts/HomeScreenLayoutClassicWithAmPm.cpp
+        src/layouts/HomeScreenLayoutClassicWithBattery.cpp
+        src/layouts/HomeScreenLayoutClassicWithTemp.cpp
+
     PUBLIC
         include/common/BellListItemProvider.hpp
         include/common/LanguageUtils.hpp


@@ 52,6 63,7 @@ target_sources(application-bell-common
         include/common/windows/BellWelcomeWindow.hpp
         include/common/windows/SessionPausedWindow.hpp
         include/common/TimeUtils.hpp
+        include/common/data/BatteryUtils.hpp
         include/common/models/AbstractAlarmModel.hpp
         include/common/models/AbstractBedtimeModel.hpp
         include/common/models/AbstractSettingsModel.hpp


@@ 70,12 82,22 @@ target_sources(application-bell-common
         include/common/popups/BedtimeNotificationWindow.hpp
         include/common/popups/BellTurnOffOptionWindow.hpp
         include/common/popups/BellRebootWindow.hpp
+        include/common/widgets/BellBattery.hpp
         include/common/widgets/BellSideListItemWithCallbacks.hpp
         include/common/widgets/BellStatusClock.hpp
+        include/common/widgets/DuoHBox.hpp
+        include/common/widgets/ProgressTimerWithSnoozeTimer.hpp
+        include/common/widgets/SnoozeTimer.hpp
         include/common/widgets/ListItems.hpp
         include/common/options/BellOptionWindow.hpp
         include/common/options/BellShortOptionWindow.hpp
         include/common/options/OptionBellMenu.hpp
+        include/common/layouts/HomeScreenLayouts.hpp
+        include/common/layouts/BaseHomeScreenLayoutProvider.hpp
+        include/common/layouts/HomeScreenLayoutClassic.hpp
+        include/common/layouts/HomeScreenLayoutClassicWithAmPm.hpp
+        include/common/layouts/HomeScreenLayoutClassicWithBattery.hpp
+        include/common/layouts/HomeScreenLayoutClassicWithTemp.hpp
 )
 
 target_link_libraries(application-bell-common

@@ 6,6 6,7 @@
 #include <cstdint>
 #include <algorithm>
 #include <optional>
+#include <string>
 
 #include <Units.hpp>
 

@@ 3,13 3,33 @@
 
 #pragma once
 
-#include "application-bell-main/presenters/HomeScreenPresenter.hpp"
+#include <module-utils/EventStore/EventStore.hpp>
+#include <utf8/UTF8.hpp>
+#include <Temperature.hpp>
+#include <time/dateCommon.hpp>
 
-#include <apps-common/widgets/BellBaseLayout.hpp>
-#include <Rect.hpp>
+#include <chrono>
+
+namespace app::home_screen
+{
+    enum class ViewState
+    {
+        Deactivated,
+        DeactivatedWait,
+        WaitForConfirmation,
+        AlarmEdit,
+        ActivatedWait,
+        Activated,
+        AlarmRinging,
+        AlarmRingingDeactivatedWait,
+        AlarmSnoozedWait,
+        AlarmSnoozed
+    };
+};
 
 namespace gui
 {
+    class Item;
     class SnoozeTimer;
 
     class BaseHomeScreenLayoutProvider

@@ 3,7 3,9 @@
 
 #pragma once
 
-#include "layouts/BaseHomeScreenLayoutProvider.hpp"
+#include "BaseHomeScreenLayoutProvider.hpp"
+
+#include <apps-common/widgets/BellBaseLayout.hpp>
 
 namespace style::homescreen_classic
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "layouts/HomeScreenLayoutClassic.hpp"
+#include "HomeScreenLayoutClassic.hpp"
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "layouts/HomeScreenLayoutClassic.hpp"
+#include "HomeScreenLayoutClassic.hpp"
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "layouts/HomeScreenLayoutClassic.hpp"
+#include "HomeScreenLayoutClassic.hpp"
 
 namespace style::homescreen_classic
 {

@@ 3,22 3,15 @@
 
 #pragma once
 
-#include "layouts/HomeScreenLayoutClassicWithAmPm.hpp"
-#include "layouts/HomeScreenLayoutClassicWithBattery.hpp"
-#include "layouts/HomeScreenLayoutClassicWithTemp.hpp"
-
+#include <functional>
 #include <map>
 #include <string>
-#include <typeindex>
 
 namespace gui
 {
-    using LayoutGenerator = std::function<std::unique_ptr<gui::BaseHomeScreenLayoutProvider>()>;
+    class BaseHomeScreenLayoutProvider;
+
+    using LayoutGenerator = std::function<BaseHomeScreenLayoutProvider *()>;
 
-    std::map<std::string, LayoutGenerator> homeScreenLayouts = {
-        {"ClassicWithTemp", []() { return std::make_unique<gui::HomeScreenLayoutClassicWithTemp>("ClassicWithTemp"); }},
-        {"ClassicWithAmPm", []() { return std::make_unique<gui::HomeScreenLayoutClassicWithAmPm>("ClassicWithAmPm"); }},
-        {"ClassicWithBattery",
-         []() { return std::make_unique<gui::HomeScreenLayoutClassicWithBattery>("ClassicWithBattery"); }},
-    };
+    std::map<std::string, LayoutGenerator> homeScreenLayouts();
 }; // namespace gui

@@ 3,8 3,8 @@
 
 #pragma once
 
-#include "BoxLayout.hpp"
 #include <EventStore.hpp>
+#include <gui/widgets/BoxLayout.hpp>
 #include <gui/widgets/Image.hpp>
 #include <gui/widgets/text/TextFixedSize.hpp>
 

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "layouts/HomeScreenLayoutClassicWithBattery.hpp"
-#include "widgets/BellBattery.hpp"
+#include <common/layouts/HomeScreenLayoutClassicWithBattery.hpp>
+#include <common/widgets/BellBattery.hpp>
 
 namespace gui
 {

@@ 0,0 1,19 @@
+
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include <common/layouts/HomeScreenLayouts.hpp>
+#include <common/layouts/HomeScreenLayoutClassicWithAmPm.hpp>
+#include <common/layouts/HomeScreenLayoutClassicWithBattery.hpp>
+#include <common/layouts/HomeScreenLayoutClassicWithTemp.hpp>
+
+namespace gui
+{
+    std::map<std::string, LayoutGenerator> homeScreenLayouts()
+    {
+        return {{"ClassicWithTemp", []() { return new HomeScreenLayoutClassicWithTemp("ClassicWithTemp"); }},
+                {"ClassicWithAmPm", []() { return new HomeScreenLayoutClassicWithAmPm("ClassicWithAmPm"); }},
+                {"ClassicWithBattery", []() { return new HomeScreenLayoutClassicWithBattery("ClassicWithBattery"); }}};
+    };
+
+} // namespace gui

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "BellBattery.hpp"
-#include "data/BatteryUtils.hpp"
+#include <common/data/BatteryUtils.hpp>
+#include <common/widgets/BellBattery.hpp>
 #include <Image.hpp>
 
 namespace

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "DuoHBox.hpp"
+#include <common/widgets/DuoHBox.hpp>
 
 namespace gui
 {

@@ 1,9 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ProgressTimerWithSnoozeTimer.hpp"
-#include "widgets/SnoozeTimer.hpp"
-
+#include <common/widgets/ProgressTimerWithSnoozeTimer.hpp>
+#include <common/widgets/SnoozeTimer.hpp>
 #include <Text.hpp>
 #include <ProgressBar.hpp>
 #include <ApplicationCommon.hpp>

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SnoozeTimer.hpp"
+#include <common/widgets/SnoozeTimer.hpp>
 #include <FontManager.hpp>
 #include <RawFont.hpp>
 #include <gui/widgets/Label.hpp>