From 9541d8082ff01d9b0740c72674b2eb52b2e3a6c5 Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Fri, 15 Nov 2024 11:09:07 +0100 Subject: [PATCH] [BH-2092] Change onboarding auto power off time * Changed automatic power off time for initial on/off onboarding screen. * Removed unused onboarding welcome window. * Minor cleanups. --- harmony_changelog.md | 1 + .../ApplicationBellOnBoarding.cpp | 6 -- .../CMakeLists.txt | 12 ++-- .../BellOnBoardingNames.hpp | 2 - .../windows/OnBoardingOnOffWindow.cpp | 6 +- .../windows/OnBoardingOnOffWindow.hpp | 4 +- .../windows/OnBoardingSettingsWindow.cpp | 2 +- .../windows/OnBoardingSettingsWindow.hpp | 1 - .../OnBoardingShortcutsOptionWindow.hpp | 6 +- .../windows/OnBoardingWelcomeWindow.cpp | 58 ------------------- .../windows/OnBoardingWelcomeWindow.hpp | 27 --------- 11 files changed, 15 insertions(+), 110 deletions(-) delete mode 100644 products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp delete mode 100644 products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.hpp diff --git a/harmony_changelog.md b/harmony_changelog.md index 45bf3c2adf5a9876c6e64f1ac05c2d10752272aa..df9d2a7d7e29bafefe2cee8df1a6149067e4e6aa 100644 --- a/harmony_changelog.md +++ b/harmony_changelog.md @@ -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] diff --git a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp index 3566eb673d2b2db8956dc6bfa6802030e548db28..e301fbaca863df21a3f2919334ceb439adba3699 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp +++ b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -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()); diff --git a/products/BellHybrid/apps/application-bell-onboarding/CMakeLists.txt b/products/BellHybrid/apps/application-bell-onboarding/CMakeLists.txt index a888cda8109e29c639b8dfc536075bd5d8c7035e..fb02e56c7201f007e758f464308ae19f6a888841 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/CMakeLists.txt +++ b/products/BellHybrid/apps/application-bell-onboarding/CMakeLists.txt @@ -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 diff --git a/products/BellHybrid/apps/application-bell-onboarding/include/application-bell-onboarding/BellOnBoardingNames.hpp b/products/BellHybrid/apps/application-bell-onboarding/include/application-bell-onboarding/BellOnBoardingNames.hpp index 83fd12e0e42ba3196616b0d2eb82256f2ab77304..33f9d9416513ddeaab99b89da9050e619d69ed5c 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/include/application-bell-onboarding/BellOnBoardingNames.hpp +++ b/products/BellHybrid/apps/application-bell-onboarding/include/application-bell-onboarding/BellOnBoardingNames.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 diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.cpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.cpp index dcb92e713e5a390b1ddd2489f748bb1d6f1ffae1..9f3dc7f2e3d8e4e58bb9163b0bad5abfd8ee9576 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.cpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.cpp @@ -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 { diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.hpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.hpp index 2ae3327d1edc2c57bfb69fda7892591d26f33c0e..b6ad70c2b148a489679196d935c11dce0fc454a1 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.hpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingOnOffWindow.hpp @@ -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 presenter; }; - } // namespace gui diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.cpp index afa48a06e28a0cfae798f4efc6d402525572e9ef..aafadc6141803fc9dac512289e30df1aeb6bc33d 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.cpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.cpp @@ -10,7 +10,7 @@ namespace gui app::ApplicationCommon *app, std::unique_ptr &&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); }; diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp index 319e5dc2d67fd0a689926481b4d13b357c627fc5..3fea1f26b2ed473ce04e928dda92a92458fdaf06 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp @@ -15,5 +15,4 @@ namespace gui std::unique_ptr &&windowPresenter, std::string name = gui::window::name::bellSettingsTimeUnits); }; - } // namespace gui diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingShortcutsOptionWindow.hpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingShortcutsOptionWindow.hpp index d22847c542cb7ad862623da8b85af26125b94388..41be8ffdf91307b5a700787667640e24f804e1f0 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingShortcutsOptionWindow.hpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingShortcutsOptionWindow.hpp @@ -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 diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp deleted file mode 100644 index de551583a16aa1a8b36ca1ed5d16b97a5468b134..0000000000000000000000000000000000000000 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp +++ /dev/null @@ -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 -#include -#include - -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 diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.hpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.hpp deleted file mode 100644 index a98c3ca5e740ff214b0d8fc1246bc2fc766a7e04..0000000000000000000000000000000000000000 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.hpp +++ /dev/null @@ -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 - -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