10 files changed, 18 insertions(+), 24 deletions(-)

A art/bell/bell_off_bottom.png
A art/bell/bell_very_big_mudita_logo.png
A image/assets/images/bell/bell_off_bottom_W_G.vpi
A image/assets/images/bell/bell_very_big_logo_W_G.vpi
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.cpp
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingWelcomeWindow.cpp
M products/BellHybrid/apps/common/include/common/windows/BellWelcomeWindow.hpp
M products/BellHybrid/apps/common/src/popups/BellRebootWindow.cpp
M products/BellHybrid/apps/common/src/windows/BellTurnOffWindow.cpp
M products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp

@@ 38,7 38,7 @@ namespace gui
     {
         BellFinishedWindow::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_finalize"));
     }

@@ 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"));
     }

@@ 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<void()>;

@@ 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);
     }

@@ 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 &)

@@ 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();
     }