From 6ec08d9f4af589131d44494a6d9791118e098e87 Mon Sep 17 00:00:00 2001 From: Maciej Gibowicz Date: Thu, 11 Jul 2024 15:33:30 +0200 Subject: [PATCH] [BH-2036] Fix missing label in the countdown to the start of meditation The meditation start countdown screen will be consistent with the meditation screen. --- .../data/MeditationStyle.hpp | 10 ++++++- .../windows/MeditationCountdownWindow.cpp | 30 +++++++++++++------ .../windows/MeditationCountdownWindow.hpp | 9 +++--- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp index b541a41f44e2a2bed1c65740034611b9aaa67523..d37b69aad463228c08af30528fb32baff27af5cd 100644 --- a/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp +++ b/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp @@ -58,7 +58,7 @@ namespace app::meditationStyle namespace timer { - inline constexpr auto marginTop = 24U; + inline constexpr auto marginTop = 4U; inline constexpr auto maxSizeX = runningStyle::timer::maxSizeX; inline constexpr auto maxSizeY = runningStyle::timer::maxSizeY; } // namespace timer @@ -70,6 +70,14 @@ namespace app::meditationStyle inline constexpr auto maxSizeX = 380U; inline constexpr auto maxSizeY = 102U; } // namespace description + + namespace bottomDescription + { + inline constexpr auto marginTop = runningStyle::bottomDescription::marginTop; + inline constexpr auto maxSizeX = runningStyle::bottomDescription::maxSizeX; + inline constexpr auto maxSizeY = runningStyle::bottomDescription::maxSizeY; + inline constexpr auto font = runningStyle::bottomDescription::font; + } // namespace bottomDescription } // namespace countdownStyle namespace timerStyle diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp index b08953775b01be9c9156c5d26e5a4eae09c79e91..a4031d4ce34463df45ebd04758ca48d9d72d26b0 100644 --- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp +++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp @@ -67,18 +67,30 @@ namespace gui description->setMaximumSize(countdownStyle::description::maxSizeX, countdownStyle::description::maxSizeY); description->setFont(countdownStyle::description::font); description->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); - description->setMargins(gui::Margins(0, countdownStyle::description::marginTop, 0, 0)); - - timer = new gui::TimeMinuteSecondWidget(mainVBox, - 0, - 0, - countdownStyle::timer::maxSizeX, - countdownStyle::timer::maxSizeY, - gui::TimeMinuteSecondWidget::DisplayType::OnlySeconds); + description->setMargins(Margins(0, countdownStyle::description::marginTop, 0, 0)); + + timer = new TimeMinuteSecondWidget(mainVBox, + 0, + 0, + countdownStyle::timer::maxSizeX, + countdownStyle::timer::maxSizeY, + TimeMinuteSecondWidget::DisplayType::OnlySeconds); timer->setMinimumSize(countdownStyle::timer::maxSizeX, countdownStyle::timer::maxSizeY); - timer->setMargins(gui::Margins(0, countdownStyle::timer::marginTop, 0, 0)); + timer->setMargins(Margins(0, countdownStyle::timer::marginTop, 0, 0)); timer->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); + bottomDescription = new TextFixedSize( + mainVBox, 0, 0, countdownStyle::bottomDescription::maxSizeX, countdownStyle::bottomDescription::maxSizeY); + bottomDescription->setMaximumSize(countdownStyle::bottomDescription::maxSizeX, + countdownStyle::bottomDescription::maxSizeY); + bottomDescription->setFont(countdownStyle::bottomDescription::font); + bottomDescription->setMargins(Margins(0, 0, 0, 0)); + bottomDescription->activeItem = false; + bottomDescription->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top)); + bottomDescription->setRichText(utils::translate("app_bellmain_meditation_timer")); + bottomDescription->drawUnderline(false); + bottomDescription->setVisible(true); + mainVBox->resizeItems(); } diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp index bf8ac35126781934b65ab3b2a91ff22c2fb9083a..96b95ce815583b52e86c6fd16db31769b63b1f89 100644 --- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp +++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp @@ -29,10 +29,11 @@ namespace gui private: std::unique_ptr presenter; - VBox *mainVBox = nullptr; - Arc *progress = nullptr; - TimeMinuteSecondWidget *timer = nullptr; - Text *description = nullptr; + VBox *mainVBox{nullptr}; + Arc *progress{nullptr}; + TimeMinuteSecondWidget *timer{nullptr}; + Text *description{nullptr}; + TextFixedSize *bottomDescription{nullptr}; void buildLayout(); void configureTimer();