~aleteoryx/muditaos

ab462fcbd10a034351acfe2f72e10143b4310f4c — Przemyslaw Brudny 5 years ago 2626299
[EGD-3620] Phonebook contact details flags sizes fixes.
M module-apps/application-phonebook/widgets/ContactFlagIconWidget.cpp => module-apps/application-phonebook/widgets/ContactFlagIconWidget.cpp +7 -7
@@ 7,7 7,7 @@ namespace gui
{

    ContactFlagIconWidget::ContactFlagIconWidget(const std::string &iconName, const std::string &itemText, Item *parent)
        : Rect(parent, 0, 0, style::widget::ContatFlas::itemWidth, style::widget::ContatFlas::itemHeight),
        : Rect(parent, 0, 0, style::widget::ContactFlag::itemWidth, style::widget::ContactFlag::itemHeight),
          iconName(iconName), itemText(itemText)
    {
        buildItemWithIcon();


@@ 15,7 15,7 @@ namespace gui
    }

    ContactFlagIconWidget::ContactFlagIconWidget(uint8_t iconNumber, const std::string &itemText, Item *parent)
        : Rect(parent, 0, 0, style::widget::ContatFlas::itemWidth, style::widget::ContatFlas::itemHeight),
        : Rect(parent, 0, 0, style::widget::ContactFlag::itemWidth, style::widget::ContactFlag::itemHeight),
          number(iconNumber), itemText(itemText), numericIcon(true)
    {
        buildItemWithText();


@@ 32,15 32,15 @@ namespace gui

    void ContactFlagIconWidget::buildItemWithIcon()
    {
        icon =
            new Image(this, 0, 0, style::widget::ContatFlas::iconsSize, style::widget::ContatFlas::iconsSize, iconName);
        icon = new Image(
            this, 0, 0, style::widget::ContactFlag::iconsSize, style::widget::ContactFlag::iconsSize, iconName);
        icon->setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES);
    }

    void ContactFlagIconWidget::buildItemWithText()
    {
        numericLabel =
            new Label(this, 0, 0, style::widget::ContatFlas::iconsSize, style::widget::ContatFlas::iconsSize);
            new Label(this, 0, 0, style::widget::ContactFlag::iconsSize, style::widget::ContactFlag::iconsSize);
        numericLabel->setFont(style::window::font::bigbold);
        numericLabel->setText(std::to_string(number));
        numericLabel->setAlignment(Alignment(Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));


@@ 51,7 51,7 @@ namespace gui
    {
        setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES);

        label = new Label(this, 0, 0, style::widget::ContatFlas::itemWidth, style::widget::ContatFlas::labelHeight);
        label = new Label(this, 0, 0, style::widget::ContactFlag::itemWidth, style::widget::ContactFlag::labelHeight);
        label->setFilled(false);
        label->setFont(style::window::font::verysmall);
        label->setText(itemText);


@@ 59,7 59,7 @@ namespace gui
        label->setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES);
        label->setAlignment(Alignment(Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));

        mainBox = new VBox(this, 0, 0, style::widget::ContatFlas::itemWidth, style::widget::ContatFlas::itemHeight);
        mainBox = new VBox(this, 0, 0, style::widget::ContactFlag::itemWidth, style::widget::ContactFlag::itemHeight);
        mainBox->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
        mainBox->setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES);
        if (numericIcon) {

M module-apps/application-phonebook/widgets/ContactFlagsStyle.hpp => module-apps/application-phonebook/widgets/ContactFlagsStyle.hpp +4 -4
@@ 6,13 6,13 @@ namespace style
{
    namespace widget
    {
        namespace ContatFlas
        namespace ContactFlag
        {
            const uint32_t iconsSize   = 32;
            const uint32_t iconsSize   = 35;
            const uint32_t height      = 74;
            const uint32_t itemWidth   = 90;
            const uint32_t itemWidth   = 110;
            const uint32_t itemHeight  = 55;
            const uint32_t labelHeight = 20;
        } // namespace ContatFlas
        } // namespace ContactFlag
    }     // namespace widget
} // namespace style

M module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp => module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp +2 -2
@@ 14,7 14,7 @@ namespace gui

    const unsigned char ContactFlagsWidget::iconsCount = 4;
    ContactFlagsWidget::ContactFlagsWidget(Item *parent)
        : Rect(parent, 0, style::header::height, style::window_width, style::widget::ContatFlas::height)
        : Rect(parent, 0, style::header::height, style::window_width, style::widget::ContactFlag::height)
    {
        favourites = speedDial = ice = true;
        blocked                      = false;


@@ 70,7 70,7 @@ namespace gui

    void ContactFlagsWidget::buildWidget()
    {
        mainBox = new HBox(this, 0, 0, style::window_width, style::widget::ContatFlas::itemHeight);
        mainBox = new HBox(this, 0, 0, style::window_width, style::widget::ContactFlag::itemHeight);
        mainBox->setAlignment(Alignment(Alignment::Horizontal::Center));
        mainBox->setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES);
        mainBox->addWidget(favouritesIcon);