~aleteoryx/muditaos

e37e40e877037d1d6261cfede4af54dc8e2a7a9f — Lefucjusz 1 year, 10 months ago 919288e
[BH-1919] Add 'Menu' label to apps list

* Added 'Menu' top label to the
list of Harmony apps.
* Minor cleanup.
M image/system_a/data/lang/Deutsch.json => image/system_a/data/lang/Deutsch.json +1 -0
@@ 130,6 130,7 @@
    "app_bellmain_relaxation": "Entspannung",
    "app_bellmain_settings": "Einstellungen",
    "app_bellmain_usb_status_connected": "Verbunden",
    "app_bellmain_menu": "Men\u00fc",
    "app_calculator_decimal_separator": ".",
    "app_calculator_equals": "GLEICH",
    "app_calculator_error": "Fehler",

M image/system_a/data/lang/English.json => image/system_a/data/lang/English.json +1 -0
@@ 165,6 165,7 @@
    "app_bellmain_relaxation": "Relaxation",
    "app_bellmain_settings": "Settings",
    "app_bellmain_usb_status_connected": "Connected",
    "app_bellmain_menu": "Menu",
    "app_calculator_decimal_separator": ".",
    "app_calculator_equals": "EQUALS",
    "app_calculator_error": "Error",

M image/system_a/data/lang/Espanol.json => image/system_a/data/lang/Espanol.json +1 -0
@@ 129,6 129,7 @@
    "app_bellmain_relaxation": "Relajaci\u00f3n",
    "app_bellmain_settings": "Ajustes",
    "app_bellmain_usb_status_connected": "Conectado",
    "app_bellmain_menu": "Men\u00fa",
    "app_calculator_decimal_separator": ",",
    "app_calculator_equals": "IGUAL A",
    "app_calculator_error": "Error",

M image/system_a/data/lang/Francais.json => image/system_a/data/lang/Francais.json +1 -0
@@ 133,6 133,7 @@
    "app_bellmain_relaxation": "Bruits de fond",
    "app_bellmain_settings": "Param\u00e8tres",
    "app_bellmain_usb_status_connected": "Connect\u00e9",
    "app_bellmain_menu": "Menu",
    "app_calculator_decimal_separator": ",",
    "app_calculator_equals": "\u00c9QUIVAUT \u00c0",
    "app_calculator_error": "Erreur",

M image/system_a/data/lang/Polski.json => image/system_a/data/lang/Polski.json +1 -0
@@ 131,6 131,7 @@
    "app_bellmain_relaxation": "Relaks",
    "app_bellmain_settings": "Ustawienia",
    "app_bellmain_usb_status_connected": "Po\u0142\u0105czony",
    "app_bellmain_menu": "Menu",
    "app_calculator_decimal_separator": ",",
    "app_calculator_equals": "WYNIK",
    "app_calculator_error": "B\u0142\u0105d",

M products/BellHybrid/BellHybridMain.cpp => products/BellHybrid/BellHybridMain.cpp +1 -1
@@ 110,7 110,7 @@ int main()
                app::CreateLauncher<app::ApplicationBellOnBoarding>(app::applicationBellOnBoardingName));
            applications.push_back(
                app::CreateLauncher<app::ApplicationBellRelaxation>(app::applicationBellRelaxationName));
            applications.push_back(app::CreateLauncher<app::MeditationTimer>(app::MeditationTimer::defaultName));
            applications.push_back(app::CreateLauncher<app::MeditationTimer>(app::applicationMeditationTimerName));
            // start application manager
            return sysmgr->RunSystemService(
                std::make_shared<app::manager::ApplicationManager>(

M products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp => products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp +3 -3
@@ 1,4 1,4 @@
// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include "BellMainMenuWindow.hpp"


@@ 22,6 22,7 @@ namespace gui
        : BellOptionWindow(app, gui::window::name::bell_main_menu)
    {
        addOptions(mainMenuOptionsList());
        setListTitle(utils::translate("app_bellmain_menu"));
    }

    std::list<Option> BellMainMenuWindow::mainMenuOptionsList()


@@ 49,11 50,10 @@ namespace gui
        addAppMenu(utils::translate("app_bellmain_alarm"), app::applicationBellAlarmName);
        addAppMenu(utils::translate("app_bellmain_power_nap"), app::applicationBellPowerNapName);
        addAppMenu(utils::translate("app_bellmain_relaxation"), app::applicationBellRelaxationName);
        addAppMenu(utils::translate("app_bellmain_meditation_timer"), app::MeditationTimer::defaultName);
        addAppMenu(utils::translate("app_bellmain_meditation_timer"), app::applicationMeditationTimerName);
        addAppMenu(utils::translate("app_bellmain_bedtime"), app::applicationBellBedtimeName);
        addAppMenu(utils::translate("app_bellmain_settings"), app::applicationBellSettingsName);

        return menuOptionList;
    }

} // namespace gui

M products/BellHybrid/apps/application-bell-meditation-timer/MeditationTimer.cpp => products/BellHybrid/apps/application-bell-meditation-timer/MeditationTimer.cpp +2 -1
@@ 57,7 57,7 @@ namespace app
            return ret;
        }

        cpuSentinel                  = std::make_shared<sys::CpuSentinel>(defaultName, this);
        cpuSentinel                  = std::make_shared<sys::CpuSentinel>(applicationMeditationTimerName, this);
        auto sentinelRegistrationMsg = std::make_shared<sys::SentinelRegistrationMessage>(cpuSentinel);
        bus.sendUnicast(std::move(sentinelRegistrationMsg), service::name::system_manager);
        cpuSentinel->BlockWfiMode(true);


@@ 146,6 146,7 @@ namespace app

        return handleAsyncResponse(resp);
    }

    MeditationTimer::~MeditationTimer()
    {
        cpuSentinel->BlockWfiMode(false);

M products/BellHybrid/apps/application-bell-meditation-timer/include/application-bell-meditation-timer/MeditationTimer.hpp => products/BellHybrid/apps/application-bell-meditation-timer/include/application-bell-meditation-timer/MeditationTimer.hpp +3 -3
@@ 18,12 18,12 @@ namespace app::meditation::models

namespace app
{
    inline constexpr auto applicationMeditationTimerName = "ApplicationMeditationTimer";

    class MeditationTimer : public Application
    {
      public:
        static constexpr auto defaultName = "ApplicationMeditationTimer";

        explicit MeditationTimer(std::string name                    = defaultName,
        explicit MeditationTimer(std::string name                    = applicationMeditationTimerName,
                                 std::string parent                  = "",
                                 StatusIndicators statusIndicators   = StatusIndicators{},
                                 StartInBackground startInBackground = {false},

M products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp => products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp +1 -0
@@ 18,6 18,7 @@ namespace gui::window::name
    inline constexpr auto relaxationEnded           = "RelaxationEndedWindow";
    inline constexpr auto relaxationLowBattery      = "RelaxationLowBatteryWindow";
} // namespace gui::window::name

namespace app
{
    namespace relaxation