From d9f8c4cbc46362dd8c46a7b363eb7e700d733116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= Date: Wed, 20 Oct 2021 15:38:14 +0200 Subject: [PATCH] [BH-1058] New summary screens New summary screens --- .../ApplicationBellOnBoarding.cpp | 2 +- .../application-bell-settings/ApplicationBellSettings.cpp | 6 ++---- .../windows/BellSettingsBedtimeToneWindow.cpp | 4 +--- .../windows/advanced/BellSettingsFrontlightWindow.cpp | 4 +--- .../windows/advanced/BellSettingsTimeUnitsWindow.cpp | 8 +++----- .../BellSettingsAlarmSettingsSnoozeWindow.cpp | 8 +++----- .../alarm_settings/BellSettingsAlarmSettingsWindow.cpp | 5 +---- .../alarm_settings/BellSettingsPrewakeUpWindow.cpp | 8 +++----- .../BellSettingsBedtimeToneSettingsWindow.cpp | 5 +---- .../include/common/data/BellFinishedWindowSwitchData.hpp | 8 +++----- .../common/include/common/windows/BellFinishedWindow.hpp | 2 -- .../common/src/windows/BellFinishedCallbackWindow.cpp | 3 +-- .../apps/common/src/windows/BellFinishedWindow.cpp | 8 ++------ 13 files changed, 22 insertions(+), 49 deletions(-) diff --git a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp index e2e2a9563ec6c8446434a9f22956138211b035c5..52055fa6e9cbc88d201621119cd926ff6b6926c7 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp +++ b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp @@ -135,7 +135,7 @@ namespace app { auto [icon, text] = getDisplayDataFromState(); switchWindow(gui::window::name::informationOnBoardingWindow, - gui::BellFinishedWindowData::Factory::create(icon, utils::translate(text), windowToReturn)); + gui::BellFinishedWindowData::Factory::create(icon, windowToReturn)); } OnBoarding::InformationDisplay ApplicationBellOnBoarding::getDisplayDataFromState() diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp index 64441830095b415df7a39f3c28b4809044c0daeb..a6bfd3b00fb55ae92c85556f6335d13d4c00f979 100644 --- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp @@ -63,10 +63,8 @@ namespace app if (gui::window::name::bellSettingsLanguage == getCurrentWindow()->getName()) { switchWindow(gui::window::bell_finished::defaultName, - gui::BellFinishedWindowData::Factory::create( - "big_check_W_G", - utils::translate("app_bell_settings_advanced_language_set"), - gui::window::name::bellSettingsAdvanced)); + gui::BellFinishedWindowData::Factory::create("circle_success_big", + gui::window::name::bellSettingsAdvanced)); return sys::msgHandled(); } diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp index bc660b5a4d3380cae21c86c5d0ebab76c6739e22..001a52e5b58931ffc980e31bec2c22d54b2d276e 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp @@ -60,9 +60,7 @@ namespace gui presenter->saveData(); application->switchWindow( window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create("circle_success", - utils::translate("app_bell_settings_bedtime_tone_finished"), - gui::name::window::main_window)); + BellFinishedWindowData::Factory::create("circle_success_big", gui::name::window::main_window)); } void BellSettingsBedtimeToneWindow::onClose(CloseReason reason) diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp index 4b2e5dab570996ffb851dcff09e6322b509f05e6..61755507ba4dfa894559792dc9200073ba8c7409 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp @@ -62,9 +62,7 @@ namespace gui { application->switchWindow( window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create("big_check_W_G", - utils::translate("app_bell_settings_frontlight_finished_message"), - window::name::bellSettingsAdvanced)); + BellFinishedWindowData::Factory::create("circle_success_big", window::name::bellSettingsAdvanced)); } void BellSettingsFrontlightWindow::onClose(Window::CloseReason) { diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp index 48b47bfbd98bf56ca19d9f7862e48f95f37c2e37..8207c74b3e0e34c4f653ea906ddbfc53519d32cd 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp @@ -22,11 +22,9 @@ namespace gui buildInterface(); finishedCallback = [this]() { - application->switchWindow(window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create( - "big_check_W_G", - utils::translate("app_bell_settings_time_units_finished_message"), - gui::window::name::bellSettingsAdvanced)); + application->switchWindow( + window::bell_finished::defaultName, + BellFinishedWindowData::Factory::create("circle_success_big", gui::window::name::bellSettingsAdvanced)); }; } diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp index d8429529e94962f2d0591eda61273d88a957f3ec..cd9b1dda709e1460045ec237ba820f30c0c4f2a4 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp @@ -62,11 +62,9 @@ namespace gui void BellSettingsAlarmSettingsSnoozeWindow::exit() { presenter->saveData(); - application->switchWindow(window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create( - "big_check_W_G", - utils::translate("app_bell_settings_alarm_settings_snooze_finished"), - BellSettingsAlarmSettingsMenuWindow::name)); + application->switchWindow( + window::bell_finished::defaultName, + BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name)); } void BellSettingsAlarmSettingsSnoozeWindow::onClose(Window::CloseReason) { diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp index 3d7c6beb6b0f9cb674f4e0ce4841e32e011c1b39..c4908f9ea8cd505c50cad67393e491c0bceb7b5d 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp @@ -64,10 +64,7 @@ namespace gui presenter->saveData(); application->switchWindow( window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create( - "circle_success", - utils::translate("app_bell_settings_alarm_settings_alarm_tone_and_light_finished"), - BellSettingsAlarmSettingsMenuWindow::name)); + BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name)); } void BellSettingsAlarmSettingsWindow::onClose(CloseReason reason) diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp index 79b94242f487fa18ce43ba1176793c62002ef265..a73e5e46dafcb737748d77def8d6ed6dbe20ed46 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp @@ -61,11 +61,9 @@ namespace gui void BellSettingsPrewakeUpWindow::exit() { presenter->saveData(); - application->switchWindow(window::bell_finished::defaultName, - BellFinishedWindowData::Factory::create( - "big_check_W_G", - utils::translate("app_bell_settings_alarm_settings_prewake_up_finished"), - BellSettingsAlarmSettingsMenuWindow::name)); + application->switchWindow( + window::bell_finished::defaultName, + BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name)); } void BellSettingsPrewakeUpWindow::onClose(CloseReason reason) diff --git a/products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp index a5f9d6d2ee8a172bb0d9dd51580627595ab82d01..efded01b343ea59c47fb0d2f52bfadec8434ac83 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp @@ -63,10 +63,7 @@ namespace gui presenter->saveData(); application->switchWindow( BellFinishedWindow::defaultName, - BellFinishedWindowData::Factory::create( - "circle_success", - utils::translate("app_bell_settings_alarm_settings_alarm_tone_and_light_finished"), - app::applicationBellSettingsName)); + BellFinishedWindowData::Factory::create("circle_success_big", app::applicationBellSettingsName)); } void BellSettingsBedtimeToneSettingsWindow::onClose(CloseReason reason) diff --git a/products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp b/products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp index 11c956c4c92c0ae95ddbb9e3a4ddcb8a51a521aa..6596be8f86ad1e33d90e6679c49861d50bcec30d 100644 --- a/products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp +++ b/products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp @@ -14,22 +14,20 @@ namespace gui struct Factory { static std::unique_ptr create(const UTF8 &icon, - const UTF8 &text, const std::string &windowToReturn) { - return std::unique_ptr(new BellFinishedWindowData(icon, text, windowToReturn)); + return std::unique_ptr(new BellFinishedWindowData(icon, windowToReturn)); } }; UTF8 icon{}; - UTF8 text{}; std::string windowToReturn; private: BellFinishedWindowData() = default; - BellFinishedWindowData(const UTF8 &icon, const UTF8 &text, const std::string &windowToReturn) - : icon{icon}, text{text}, windowToReturn{windowToReturn} + BellFinishedWindowData(const UTF8 &icon, const std::string &windowToReturn) + : icon{icon}, windowToReturn{windowToReturn} {} }; } // namespace gui diff --git a/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp b/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp index e6f209993d8f48d6d6a15ced3f962acafe94aba2..c81b379ac1f0ec5c3959d877e6f9a752f6799c03 100644 --- a/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp +++ b/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp @@ -12,8 +12,6 @@ namespace gui namespace window::bell_finished { constexpr inline auto defaultName = "BellFinishedWindow"; - constexpr inline auto image_top_margin = 112U; - constexpr inline auto image_bottom_margin = 30U; } // namespace window::bell_finished class Icon; diff --git a/products/BellHybrid/apps/common/src/windows/BellFinishedCallbackWindow.cpp b/products/BellHybrid/apps/common/src/windows/BellFinishedCallbackWindow.cpp index dfe8e39f85323edfa3749cf57debbeaa2d941145..993747acca540e01bbf72805a45e91c2e892414f 100644 --- a/products/BellHybrid/apps/common/src/windows/BellFinishedCallbackWindow.cpp +++ b/products/BellHybrid/apps/common/src/windows/BellFinishedCallbackWindow.cpp @@ -32,7 +32,7 @@ namespace gui bottomBar->setVisible(false); icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {}); - icon->text->setFont(style::window::font::verybiglight); + icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); } bool BellFinishedCallbackWindow::onInput(const InputEvent &inputEvent) @@ -52,7 +52,6 @@ namespace gui if (auto metadata = dynamic_cast(data)) { icon->image->set(metadata->icon); - icon->text->setRichText(metadata->text); finishCallback = metadata->finishCallback; } } diff --git a/products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp b/products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp index f9cc8581d25f62f728029c4fc4542ad411334095..3aef1779c70806465922015f54c4d2bea223bbb6 100644 --- a/products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp +++ b/products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp @@ -27,13 +27,9 @@ namespace gui statusBar->setVisible(false); header->setTitleVisibility(false); bottomBar->setVisible(false); - if (icon == nullptr) { icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {}); - icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top)); - icon->image->setMargins( - {0, window::bell_finished::image_top_margin, 0, window::bell_finished::image_bottom_margin}); - icon->text->setFont(style::window::font::verybiglight); + icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); } } @@ -52,7 +48,7 @@ namespace gui if (auto metadata = dynamic_cast(data)) { icon->image->set(metadata->icon); - icon->text->setRichText(metadata->text); + icon->resizeItems(); windowToReturn = metadata->windowToReturn; } }