~aleteoryx/muditaos

729f89f94cdcd94a8b43480760485ed70a4ccb5c — Paweł Joński 4 years ago bd79db0
[BH-1089] Fix onbarding info screens text

Info screens texts are visible now on onboarding idle
M products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp => products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp +1 -1
@@ 135,7 135,7 @@ namespace app
    {
        auto [icon, text] = getDisplayDataFromState();
        switchWindow(gui::window::name::informationOnBoardingWindow,
                     gui::BellFinishedWindowData::Factory::create(icon, windowToReturn));
                     gui::BellFinishedWindowData::Factory::create(icon, windowToReturn, utils::translate(text)));
    }

    OnBoarding::InformationDisplay ApplicationBellOnBoarding::getDisplayDataFromState()

M products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp => products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp +6 -4
@@ 14,20 14,22 @@ namespace gui
        struct Factory
        {
            static std::unique_ptr<BellFinishedWindowData> create(const UTF8 &icon,
                                                                  const std::string &windowToReturn)
                                                                  const std::string &windowToReturn,
                                                                  const UTF8 &text = "")
            {
                return std::unique_ptr<BellFinishedWindowData>(new BellFinishedWindowData(icon, windowToReturn));
                return std::unique_ptr<BellFinishedWindowData>(new BellFinishedWindowData(icon, windowToReturn, text));
            }
        };

        UTF8 icon{};
        std::string windowToReturn;
        UTF8 text{};

      private:
        BellFinishedWindowData() = default;

        BellFinishedWindowData(const UTF8 &icon, const std::string &windowToReturn)
            : icon{icon}, windowToReturn{windowToReturn}
        BellFinishedWindowData(const UTF8 &icon, const std::string &windowToReturn, const UTF8 &text = "")
            : icon{icon}, windowToReturn{windowToReturn}, text{text}
        {}
    };
} // namespace gui

M products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp => products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp +2 -0
@@ 30,6 30,7 @@ namespace gui
        if (icon == nullptr) {
            icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {});
            icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
            icon->text->setFont(style::window::font::verybiglight);
        }
    }



@@ 48,6 49,7 @@ namespace gui

        if (auto metadata = dynamic_cast<BellFinishedWindowData *>(data)) {
            icon->image->set(metadata->icon);
            icon->text->setRichText(metadata->text);
            icon->resizeItems();
            windowToReturn = metadata->windowToReturn;
        }