11 files changed, 15 insertions(+), 110 deletions(-)

M harmony_changelog.md
M products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp
M products/BellHybrid/apps/application-bell-onboarding/CMakeLists.txt
M products/BellHybrid/apps/application-bell-onboarding/include/application-bell-onboarding/BellOnBoardingNames.hpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.cpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.hpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.cpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingShortcutsOptionWindow.hpp
D products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp
D products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.hpp

@@ 9,6 9,7 @@
 ### Changed / Improved
 * Optimized power consumption for bedside lamp functionality
 * Changed maximum focus time length from 60 to 120 minutes.
+* Changed power off time on Onboarding On/Off screen from 5 to 15 seconds.
 
 ## [2.9.0 2024-10-21]
 

@@ 10,7 10,6 @@
 #include <windows/OnBoardingFinalizeWindow.hpp>
 #include <windows/OnBoardingOnOffWindow.hpp>
 #include <windows/OnBoardingSettingsWindow.hpp>
-#include <windows/OnBoardingWelcomeWindow.hpp>
 #include <windows/OnBoardingInstructionPromptWindow.hpp>
 #include <windows/OnBoardingShortcutsOptionWindow.hpp>
 


@@ 338,11 337,6 @@ namespace app
             if (getCurrentWindow()->getName() == gui::window::name::informationOnBoardingWindow) {
                 switch (informationState) {
                 case OnBoarding::InformationStates::DeepClickCorrectionInfo:
-                    if (inputEvent.isKeyRelease(gui::KeyCode::KEY_ENTER)) {
-                        switchWindow(*getPreviousWindow());
-                        return true;
-                    }
-                    break;
                 case OnBoarding::InformationStates::LightClickInfo:
                     if (inputEvent.isKeyRelease(gui::KeyCode::KEY_ENTER)) {
                         switchWindow(*getPreviousWindow());

@@ 18,23 18,21 @@ target_sources(application-bell-onboarding
         windows/OnBoardingFinalizeWindow.cpp
         windows/OnBoardingOnOffWindow.cpp
         windows/OnBoardingInstructionPromptWindow.cpp
-        windows/OnBoardingWelcomeWindow.cpp
         windows/OnBoardingShortcutsOptionWindow.cpp
         presenter/OnBoardingLanguageWindowPresenter.cpp
         presenter/OnBoardingFinalizeWindowPresenter.cpp
         presenter/OnBoardingShortcutsWindowPresenter.cpp
         presenter/OnBoardingUpdateInstructionWindowPresenter.cpp
 
-        presenter/OnBoardingLanguageWindowPresenter.hpp
-        presenter/OnBoardingFinalizeWindowPresenter.hpp
-        presenter/OnBoardingShortcutsWindowPresenter.hpp
-        presenter/OnBoardingUpdateInstructionWindowPresenter.hpp
         windows/OnBoardingLanguageWindow.hpp
-        windows/OnBoardingOnOffWindow.hpp
         windows/OnBoardingSettingsWindow.hpp
+        windows/OnBoardingOnOffWindow.hpp
         windows/OnBoardingInstructionPromptWindow.hpp
-        windows/OnBoardingWelcomeWindow.hpp
         windows/OnBoardingShortcutsOptionWindow.hpp
+        presenter/OnBoardingLanguageWindowPresenter.hpp
+        presenter/OnBoardingFinalizeWindowPresenter.hpp
+        presenter/OnBoardingShortcutsWindowPresenter.hpp
+        presenter/OnBoardingUpdateInstructionWindowPresenter.hpp
 
     PUBLIC
         include/application-bell-onboarding/ApplicationBellOnBoarding.hpp

@@ 12,7 12,6 @@ namespace app
 
 namespace gui::window::name
 {
-    inline constexpr auto onBoardingOnOffWindow             = "BellOnBoardingOnOff";
     inline constexpr auto onBoardingLanguageWindow          = "BellOnBoardingLanguage";
     inline constexpr auto onBoardingShortcutsOptionWindow   = "BellOnBoardingShortcutsOption";
     inline constexpr auto onBoardingShortcutsWindow         = gui::window::name::shortcutsWindow;


@@ 20,5 19,4 @@ namespace gui::window::name
     inline constexpr auto onBoardingSettingsWindow          = "BellOnBoardingSettings";
     inline constexpr auto finalizeOnBoardingWindow          = "BellOnBoardingFinalize";
     inline constexpr auto informationOnBoardingWindow       = "BellOnBoardingInformation";
-
 } // namespace gui::window::name

@@ 18,12 18,12 @@ namespace style::onboarding
         constexpr auto marginExternal = 137;
         constexpr auto minimumSizeX   = style::window_width;
         constexpr auto minimumSizeY   = 64;
-    }; // namespace row
+    } // namespace row
 
     namespace arrow
     {
         constexpr auto marginLeft = 24;
-    }; // namespace arrow
+    } // namespace arrow
 
     namespace text
     {


@@ 31,7 31,7 @@ namespace style::onboarding
         constexpr auto minimumSizeX = 81;
         constexpr auto minimumSizeY = 62;
     } // namespace text
-};    // namespace style::onboarding
+} // namespace style::onboarding
 
 namespace gui
 {

@@ 18,7 18,8 @@ namespace gui
                               const std::string &name);
 
       private:
-        constexpr static auto displayDuration = std::chrono::seconds{5};
+        static constexpr auto displayDuration = std::chrono::seconds{15};
+
         bool onInput(const InputEvent &inputEvent) override;
         void buildInterface() override;
         void buildLayout();


@@ 26,5 27,4 @@ namespace gui
 
         std::unique_ptr<AbstractPowerOffPresenter> presenter;
     };
-
 } // namespace gui

@@ 10,7 10,7 @@ namespace gui
         app::ApplicationCommon *app,
         std::unique_ptr<app::bell_settings::TimeUnitsWindowContract::Presenter> &&windowPresenter,
         std::string name)
-        : BellSettingsTimeUnitsWindow(app, std::move(windowPresenter), name)
+        : BellSettingsTimeUnitsWindow(app, std::move(windowPresenter), std::move(name))
     {
         finishedCallback = [this]() { application->switchWindow(window::name::onBoardingUpdateInstructionWindow); };
         returnCallback   = [this]() { application->switchWindow(window::name::onBoardingShortcutsOptionWindow); };

@@ 15,5 15,4 @@ namespace gui
             std::unique_ptr<app::bell_settings::TimeUnitsWindowContract::Presenter> &&windowPresenter,
             std::string name = gui::window::name::bellSettingsTimeUnits);
     };
-
 } // namespace gui

@@ 8,9 8,9 @@
 
 namespace style::bell_shortcuts_layout
 {
-    constexpr inline auto top_layout_h    = 153U;
-    constexpr inline auto center_layout_h = 180U;
-    constexpr inline auto bottom_layout_h = 51U;
+    inline constexpr auto top_layout_h    = 153U;
+    inline constexpr auto center_layout_h = 180U;
+    inline constexpr auto bottom_layout_h = 51U;
 } // namespace style::bell_shortcuts_layout
 
 namespace gui

@@ 1,58 0,0 @@
-// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/blob/master/LICENSE.md
-
-#include "OnBoardingWelcomeWindow.hpp"
-#include "ApplicationBellOnBoarding.hpp"
-
-#include <InputEvent.hpp>
-#include <Icon.hpp>
-#include <Application.hpp>
-
-namespace gui
-{
-    OnBoardingWelcomeWindow::OnBoardingWelcomeWindow(app::ApplicationCommon *app, const std::string &name)
-        : WindowWithTimer(app, name, displayDuration)
-    {
-        buildInterface();
-    }
-
-    void OnBoardingWelcomeWindow::buildInterface()
-    {
-        AppWindow::buildInterface();
-        buildLayout();
-        registerCallbacks();
-    }
-
-    void OnBoardingWelcomeWindow::buildLayout()
-    {
-        statusBar->setVisible(false);
-        header->setTitleVisibility(false);
-        navBar->setVisible(false);
-        icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {});
-    }
-
-    void OnBoardingWelcomeWindow::registerCallbacks()
-    {
-        timerCallback = [this](Item &, sys::Timer &timer) {
-            application->switchWindow(gui::window::name::onBoardingOnOffWindow);
-            return true;
-        };
-    }
-
-    bool OnBoardingWelcomeWindow::onInput(const InputEvent &inputEvent)
-    {
-        if (inputEvent.isShortRelease(KeyCode::KEY_ENTER)) {
-            application->switchWindow(gui::window::name::onBoardingOnOffWindow);
-            return true;
-        }
-        return false;
-    }
-
-    void OnBoardingWelcomeWindow::onBeforeShow(ShowMode mode, SwitchData *data)
-    {
-        WindowWithTimer::onBeforeShow(mode, data);
-
-        icon->image->set("bell_very_big_logo", ImageTypeSpecifier::W_G);
-        icon->text->setFont(style::window::font::verybiglight);
-    }
-} // namespace gui

@@ 1,27 0,0 @@
-// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/blob/master/LICENSE.md
-
-#pragma once
-
-#include <apps-common/popups/WindowWithTimer.hpp>
-
-namespace gui
-{
-    class Icon;
-
-    class OnBoardingWelcomeWindow : public WindowWithTimer
-    {
-      public:
-        OnBoardingWelcomeWindow(app::ApplicationCommon *app, const std::string &name);
-
-      private:
-        constexpr static auto displayDuration = std::chrono::seconds{5};
-        bool onInput(const InputEvent &inputEvent) override;
-        void buildInterface() override;
-        void onBeforeShow(ShowMode mode, SwitchData *data) override;
-        void buildLayout();
-        void registerCallbacks();
-        Icon *icon{};
-    };
-
-} // namespace gui