From 65579d429a4ac50a28a2bab3b033bd6394b65d79 Mon Sep 17 00:00:00 2001 From: Maciej Janicki Date: Fri, 19 Nov 2021 17:03:28 +0100 Subject: [PATCH] [BH-1221] Update UI elements Update Bell UI elements --- art/bell/bell_off_bottom.png | Bin 0 -> 2337 bytes art/bell/bell_very_big_mudita_logo.png | Bin 0 -> 1802 bytes .../assets/images/bell/bell_off_bottom_W_G.vpi | Bin 0 -> 5981 bytes .../images/bell/bell_very_big_logo_W_G.vpi | Bin 0 -> 7825 bytes .../windows/OnBoardingFinalizeWindow.cpp | 2 +- .../windows/OnBoardingWelcomeWindow.cpp | 2 +- .../common/windows/BellWelcomeWindow.hpp | 8 +++----- .../common/src/popups/BellRebootWindow.cpp | 2 +- .../common/src/windows/BellTurnOffWindow.cpp | 11 ++++++++--- .../common/src/windows/BellWelcomeWindow.cpp | 17 ++++------------- 10 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 art/bell/bell_off_bottom.png create mode 100644 art/bell/bell_very_big_mudita_logo.png create mode 100644 image/assets/images/bell/bell_off_bottom_W_G.vpi create mode 100644 image/assets/images/bell/bell_very_big_logo_W_G.vpi diff --git a/art/bell/bell_off_bottom.png b/art/bell/bell_off_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..293eb39009cc499781f8302c0ac09fe6f7e5fe9d GIT binary patch literal 2337 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 literal 0 HcmV?d00001 diff --git a/image/assets/images/bell/bell_off_bottom_W_G.vpi b/image/assets/images/bell/bell_off_bottom_W_G.vpi new file mode 100644 index 0000000000000000000000000000000000000000..bf2f030213b4a8f0b190487d0d4198956da5af80 GIT binary patch literal 5981 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 F{{rkimage->set("bell_big_logo", ImageTypeSpecifier::W_G); + icon->image->set("bell_very_big_logo", ImageTypeSpecifier::W_G); icon->text->setFont(style::window::font::verybiglight); icon->text->setText(utils::translate("app_bell_onboarding_finalize")); } diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp index 1fc685c31557db99f4cfbd4997c8732589ffe8c4..a46edf334698f198f2987e6c2005a18515d6c855 100644 --- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp +++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp @@ -52,7 +52,7 @@ namespace gui { WindowWithTimer::onBeforeShow(mode, data); - icon->image->set("bell_big_logo", ImageTypeSpecifier::W_G); + icon->image->set("bell_very_big_logo", ImageTypeSpecifier::W_G); icon->text->setFont(style::window::font::verybiglight); icon->text->setText(utils::translate("app_bell_onboarding_welcome")); } diff --git a/products/BellHybrid/apps/common/include/common/windows/BellWelcomeWindow.hpp b/products/BellHybrid/apps/common/include/common/windows/BellWelcomeWindow.hpp index 8ee332682c940b1428b567acc3f0d91520bfc738..b9c22b91499a4c27aecf46f21b6072234c35a6f4 100644 --- a/products/BellHybrid/apps/common/include/common/windows/BellWelcomeWindow.hpp +++ b/products/BellHybrid/apps/common/include/common/windows/BellWelcomeWindow.hpp @@ -13,11 +13,9 @@ namespace gui class BellWelcomeWindow : public AppWindow { - static constexpr auto midline_correction = 40U; - static constexpr auto midline_w = 480U; - static constexpr auto midline_h = 1U; - static constexpr auto sun_logo_margin_top = 10U; - static constexpr auto sun_logo_margin_right = 25U; + static constexpr auto midline_correction = 40U; + static constexpr auto midline_w = 480U; + static constexpr auto midline_h = 1U; public: using Callback = std::function; diff --git a/products/BellHybrid/apps/common/src/popups/BellRebootWindow.cpp b/products/BellHybrid/apps/common/src/popups/BellRebootWindow.cpp index de53cd2ac4556975e2d198a708828adf7743e4ba..1eff65ca00c79dd1ed2dded1b1f3f67f3c8d0499 100644 --- a/products/BellHybrid/apps/common/src/popups/BellRebootWindow.cpp +++ b/products/BellHybrid/apps/common/src/popups/BellRebootWindow.cpp @@ -35,7 +35,7 @@ namespace gui 0, style::window_width, style::window_height, - "bell_mudita_logo_W_G", + "bell_very_big_logo_W_G", utils::translate("app_bell_reset_message")); icon->text->setFont(style::window::font::verybiglight); } diff --git a/products/BellHybrid/apps/common/src/windows/BellTurnOffWindow.cpp b/products/BellHybrid/apps/common/src/windows/BellTurnOffWindow.cpp index e4498191201cc3e4bf9ce6d598b4afc4d54319b1..b233f73253a5fd0e560a0769bae868d6f6626a94 100644 --- a/products/BellHybrid/apps/common/src/windows/BellTurnOffWindow.cpp +++ b/products/BellHybrid/apps/common/src/windows/BellTurnOffWindow.cpp @@ -31,9 +31,14 @@ namespace gui header->setTitleVisibility(false); navBar->setVisible(false); - icon = - new Icon(this, 0, 0, style::window_width, style::window_height, {}, utils::translate("app_bell_goodbye")); - icon->image->setVisible(false); + icon = new Icon(this, + 0, + 0, + style::window_width, + style::window_height, + "bell_very_big_logo_W_G", + utils::translate("app_bell_goodbye")); + icon->image->setVisible(true); icon->text->setFont(style::window::font::verybiglight); } bool BellTurnOffWindow::onInput(const InputEvent &) diff --git a/products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp b/products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp index cd9634ccdfe293275993c32e645c51964d558991..e7b404840ac51d8a79c9964353129386aa8369f7 100644 --- a/products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp +++ b/products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp @@ -47,19 +47,10 @@ namespace gui informationBody->setEdges(RectangleEdge::None); informationBody->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top)); - auto sunLogo = new ImageBox(informationBody, new Image("button_icon_sun", ImageTypeSpecifier::W_G)); - sunLogo->setMinimumSizeToFitImage(); - sunLogo->setMargins(Margins(0, sun_logo_margin_top, sun_logo_margin_right, 0)); - - auto instructionText = new TextFixedSize(informationBody); - instructionText->setMargins(Margins(0, sun_logo_margin_top, 0, 0)); - instructionText->setAlignment(Alignment(Alignment::Horizontal::Left, Alignment::Vertical::Center)); - instructionText->drawUnderline(false); - instructionText->setFont(style::window::font::verybiglight); - // non localized string by purpose - instructionText->setText(": ON"); - instructionText->setMinimumWidthToFitText(instructionText->getText()); - instructionText->setMinimumHeight(sunLogo->widgetMinimumArea.h); + auto bottomLogo = new ImageBox(informationBody, new Image("bell_off_bottom", ImageTypeSpecifier::W_G)); + bottomLogo->setMinimumSizeToFitImage(); + bottomLogo->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); + bottomLogo->setMargins(Margins(0, 0, 0, 0)); body->resize(); }