M module-apps/application-phonebook/data/PhonebookStyle.hpp => module-apps/application-phonebook/data/PhonebookStyle.hpp +18 -0
@@ 96,6 96,14 @@ namespace phonebookStyle
const UTF8 favourites_string = "Favourites";
} // namespace contactItem
+ namespace informationWidget
+ {
+ constexpr uint32_t w = style::window::default_body_width;
+ constexpr uint32_t h = 75;
+ constexpr uint32_t title_label_h = 30;
+ constexpr uint32_t email_text_h = 35;
+ } // namespace informationWidget
+
namespace inputBoxWithLabelAndIconItem
{
constexpr uint32_t w = style::window::default_body_width;
@@ 136,4 144,14 @@ namespace phonebookStyle
constexpr uint32_t span_size = 100;
} // namespace multiLineTextWithLabelItem
+ namespace numbersWithIconsWidget
+ {
+ constexpr uint32_t sms_image_w = 55;
+ constexpr uint32_t sms_image_h = 55;
+ constexpr uint32_t phone_image_w = 55;
+ constexpr uint32_t phone_image_h = 55;
+ constexpr uint32_t phone_image_margin_left = 30;
+ constexpr uint32_t number_text_h = 55;
+ } // namespace numbersWithIconsWidget
+
} // namespace phonebookStyle
M module-apps/application-phonebook/widgets/InformationWidget.cpp => module-apps/application-phonebook/widgets/InformationWidget.cpp +13 -13
@@ 12,8 12,8 @@ namespace gui
{
setMargins(gui::Margins(0, style::margins::very_big, 0, 0));
- setMinimumSize(phonebookStyle::multiLineTextWithLabelItem::w, phonebookStyle::multiLineTextWithLabelItem::h);
- setMaximumSize(phonebookStyle::multiLineTextWithLabelItem::w, phonebookStyle::multiLineTextWithLabelItem::h);
+ setMinimumSize(phonebookStyle::informationWidget::w, phonebookStyle::informationWidget::h);
+ setMaximumSize(phonebookStyle::informationWidget::w, phonebookStyle::informationWidget::h);
vBox = new VBox(this, 0, 0, 0, 0);
vBox->setEdges(RectangleEdgeFlags::GUI_RECT_ALL_EDGES);
@@ 21,8 21,8 @@ namespace gui
titleLabel = new Label(vBox,
0,
0,
- phonebookStyle::multiLineTextWithLabelItem::w,
- 30,
+ phonebookStyle::informationWidget::w,
+ phonebookStyle::informationWidget::title_label_h,
utils::localize.get("app_phonebook_contact_information"));
titleLabel->setEdges(RectangleEdgeFlags::GUI_RECT_ALL_EDGES);
titleLabel->setAlignment(Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top));
@@ 33,35 33,35 @@ namespace gui
onLoadCallback = [&](std::shared_ptr<ContactRecord> contact) {
if (contact->numbers.size() > 0) {
- setMinimumHeight(widgetMinimumArea.h + 30);
+ setMinimumHeight(widgetMinimumArea.h + phonebookStyle::informationWidget::title_label_h);
primaryNumberHBox = new NumberWithIconsWidget(app,
contact->numbers[0].number,
nullptr,
0,
0,
- phonebookStyle::multiLineTextWithLabelItem::w,
- phonebookStyle::multiLineTextWithLabelItem::h);
+ phonebookStyle::informationWidget::w,
+ phonebookStyle::informationWidget::h);
vBox->addWidget(primaryNumberHBox);
}
if (contact->numbers.size() > 0) {
- setMinimumHeight(widgetMinimumArea.h + phonebookStyle::multiLineTextWithLabelItem::h);
+ setMinimumHeight(widgetMinimumArea.h + phonebookStyle::informationWidget::h);
alternativeNumberHBox = new NumberWithIconsWidget(app,
contact->numbers[0].number,
nullptr,
0,
0,
- phonebookStyle::multiLineTextWithLabelItem::w,
- phonebookStyle::multiLineTextWithLabelItem::h);
+ phonebookStyle::informationWidget::w,
+ phonebookStyle::informationWidget::h);
vBox->addWidget(alternativeNumberHBox);
}
if (contact->mail.length() > 0) {
- setMinimumHeight(widgetMinimumArea.h + phonebookStyle::multiLineTextWithLabelItem::h);
+ setMinimumHeight(widgetMinimumArea.h + phonebookStyle::informationWidget::h);
emailText = new Text(nullptr, 0, 0, 0, 0);
- emailText->setMaximumSize(phonebookStyle::multiLineTextWithLabelItem::w,
- 35);
+ emailText->setMaximumSize(phonebookStyle::informationWidget::w,
+ phonebookStyle::informationWidget::email_text_h);
emailText->setFont(style::window::font::medium);
emailText->setPenFocusWidth(style::window::default_border_focus_w);
emailText->setPenWidth(style::window::default_border_no_focus_w);
M module-apps/application-phonebook/widgets/NumberWithIconsWidget.cpp => module-apps/application-phonebook/widgets/NumberWithIconsWidget.cpp +22 -14
@@ 20,31 20,39 @@ namespace gui
setEdges(gui::RectangleEdgeFlags::GUI_RECT_ALL_EDGES);
setAlignment(Alignment(gui::Alignment::Horizontal::Right, gui::Alignment::Vertical::Center));
setPenFocusWidth(style::window::default_border_focus_w);
- setPenWidth(style::window::messages::sms_border_no_focus);
+ setPenWidth(style::window::default_border_no_focus_w);
- phoneImage = new ImageBox(this, 0, 0, 55, 55, new Image("phonebook_phone_ringing"));
- phoneImage->setMargins(Margins(30, 0, 0, 0));
- phoneImage->inputCallback = [&](Item &item, const InputEvent &input) {
+ smsImage = new ImageBox(this,
+ 0,
+ 0,
+ phonebookStyle::numbersWithIconsWidget::sms_image_w,
+ phonebookStyle::numbersWithIconsWidget::sms_image_h,
+ new Image("mail"));
+ smsImage->inputCallback = [&](Item &item, const InputEvent &input) {
if (input.keyCode == KeyCode::KEY_ENTER && input.state == InputEvent::State::keyReleasedShort) {
- // return app::call(app, number);
- LOG_INFO("Call operation started");
- return true;
+ return app::sms(app, app::SmsOperation::New, number);
+ LOG_INFO("SMS operation started");
}
return false;
};
- smsImage = new ImageBox(this, 0, 0, 55, 55, new Image("mail"));
- smsImage->inputCallback = [&](Item &item, const InputEvent &input) {
+ phoneImage = new ImageBox(this,
+ 0,
+ 0,
+ phonebookStyle::numbersWithIconsWidget::phone_image_w,
+ phonebookStyle::numbersWithIconsWidget::phone_image_h,
+ new Image("phonebook_phone_ringing"));
+ phoneImage->setMargins(Margins(phonebookStyle::numbersWithIconsWidget::phone_image_margin_left, 0, 0, 0));
+ phoneImage->inputCallback = [&](Item &item, const InputEvent &input) {
if (input.keyCode == KeyCode::KEY_ENTER && input.state == InputEvent::State::keyReleasedShort) {
- // return app::sms(app, app::SmsOperation::New, number);
- LOG_INFO("SMS operation started");
- return true;
+ return app::call(app, number);
+ LOG_INFO("Call operation started");
}
return false;
};
numberText = new Text(this, 0, 0, 0, 0);
- numberText->setMaximumSize(w, 55);
+ numberText->setMaximumSize(w, phonebookStyle::numbersWithIconsWidget::number_text_h);
numberText->setFont(style::window::font::medium);
numberText->setPenFocusWidth(style::window::default_border_focus_w);
numberText->setPenWidth(style::window::default_border_no_focus_w);
@@ 63,7 71,7 @@ namespace gui
};
}
- bool NumberWithIconsWidget::onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim)
+ auto NumberWithIconsWidget::onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) -> bool
{
resizeItems();
return true;
M module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp => module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp +2 -2
@@ 21,11 21,11 @@ namespace gui
const uint32_t &h);
~NumberWithIconsWidget() override = default;
- Text *numberText = nullptr;
+ Text *numberText = nullptr;
ImageBox *phoneImage = nullptr;
ImageBox *smsImage = nullptr;
- bool onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) override;
+ auto onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) -> bool override;
};
} /* namespace gui */