From 7933bd0fef39007dcd22f90cfa8656db56912a54 Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Mon, 2 Aug 2021 11:02:34 +0200 Subject: [PATCH] [EGD-7065] Phonebook Edit Contact small style update Phonebook Edit Contact small style update. --- image/assets/lang/Deutsch.json | 2 +- image/assets/lang/English.json | 2 +- image/assets/lang/Espanol.json | 2 +- image/assets/lang/Francais.json | 2 +- image/assets/lang/Polski.json | 2 +- image/assets/lang/Svenska.json | 2 +- module-apps/application-phonebook/data/PhonebookStyle.hpp | 8 ++++---- .../application-phonebook/models/NewContactModel.cpp | 4 ++-- .../widgets/InputLinesWithLabelIWidget.cpp | 4 ++-- module-gui/gui/widgets/Style.hpp | 1 + 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index 431a1f012ab0999a5a9d2a4084ad7272273d8a75..25065d561990563b15e9787f2d5a25f1ce824597 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -510,7 +510,7 @@ "app_phonebook_options_forward_namecard": "Visitenkarte weiterleiten", "app_phonebook_options_send_sms": "Als SMS senden", "app_phonebook_new_contact_first_name": "Vorname", - "app_phonebook_new_contact_second_name": "Nachname", + "app_phonebook_new_contact_last_name": "Nachname", "app_phonebook_new_contact_number": "Nummer", "app_phonebook_new_contact_second_number": "Zweite Nummer", "app_phonebook_new_contact_email": "E-Mail", diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index f46d0b0cf2b10bd8f776fe0f22c7b3b19f71d6e7..bb7d533daebddf119f9792407124849ace302fa0 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -489,7 +489,7 @@ "app_phonebook_options_forward_namecard": "Forward namecard", "app_phonebook_options_send_sms": "Send via SMS", "app_phonebook_new_contact_first_name": "First name", - "app_phonebook_new_contact_second_name": "Second name", + "app_phonebook_new_contact_last_name": "Last name", "app_phonebook_new_contact_number": "Number", "app_phonebook_new_contact_second_number": "Second number", "app_phonebook_new_contact_email": "Email", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index dcefeaff78725c99095684761c3d541d72ee8d56..93eb28cc8f72fe171bccfd6758c66518a82e9696 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -510,7 +510,7 @@ "app_phonebook_options_forward_namecard": "Reenviar tarjeta de visita", "app_phonebook_options_send_sms": "Enviar por SMS", "app_phonebook_new_contact_first_name": "Nombre", - "app_phonebook_new_contact_second_name": "Apellido", + "app_phonebook_new_contact_last_name": "Apellido", "app_phonebook_new_contact_number": "Número", "app_phonebook_new_contact_second_number": "Número alternativo", "app_phonebook_new_contact_email": "Correo electrónico", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index c6032ee47140712212b16e62014cc04ca7fa26e5..eb799569edc8c6c67c74cef3f07ed7a453606510 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -479,7 +479,7 @@ "app_phonebook_options_forward_namecard": "Transférer la carte de visite", "app_phonebook_options_send_sms": "Envoyer via SMS", "app_phonebook_new_contact_first_name": "Pénom", - "app_phonebook_new_contact_second_name": "Nom", + "app_phonebook_new_contact_last_name": "Nom", "app_phonebook_new_contact_number": "Numéro", "app_phonebook_new_contact_second_number": "Second numéro", "app_phonebook_new_contact_email": "Email", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index 978862c3afdfbfaa917d80ab73b8e863fa321467..97229910f220ea49eb6d6ee987dcb02b9b55dc4b 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -510,7 +510,7 @@ "app_phonebook_options_forward_namecard": "Prześlij dalej wizytówkę", "app_phonebook_options_send_sms": "Wyślij SMS-em", "app_phonebook_new_contact_first_name": "Imię", - "app_phonebook_new_contact_second_name": "Nazwisko", + "app_phonebook_new_contact_last_name": "Nazwisko", "app_phonebook_new_contact_number": "Numer", "app_phonebook_new_contact_second_number": "Drugi numer", "app_phonebook_new_contact_email": "E-mail", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index aacdd4992266ee22f5d1ebaa59a7c624a3f534ed..07d44146a10f929e0141608d7133385b1a99b924 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -396,7 +396,7 @@ "app_phonebook_options_forward_namecard": "Vidarebefordra kontaktuppgifter", "app_phonebook_options_send_sms": "Skicka över SMS", "app_phonebook_new_contact_first_name": "Förnamn", - "app_phonebook_new_contact_second_name": "Efternamn", + "app_phonebook_new_contact_last_name": "Efternamn", "app_phonebook_new_contact_number": "Nummer", "app_phonebook_new_contact_second_number": "Alternativnummer", "app_phonebook_new_contact_email": "Mail", diff --git a/module-apps/application-phonebook/data/PhonebookStyle.hpp b/module-apps/application-phonebook/data/PhonebookStyle.hpp index c97729257f25b89db17801d242b9c1d25ab76977..f624e5ec2bfed6018014df13b2bf24faadb4b7c9 100644 --- a/module-apps/application-phonebook/data/PhonebookStyle.hpp +++ b/module-apps/application-phonebook/data/PhonebookStyle.hpp @@ -110,12 +110,12 @@ namespace phonebookStyle namespace inputLinesWithLabelWidget { inline constexpr uint32_t w = style::window::default_body_width; - inline constexpr uint32_t h = 63; - inline constexpr uint32_t title_label_h = 24; + inline constexpr uint32_t h = 67; + inline constexpr uint32_t title_label_h = 26; inline constexpr uint32_t input_text_h = 33; - inline constexpr uint32_t span_size = 6; + inline constexpr uint32_t span_size = 8; inline constexpr uint32_t line_spacing = 15; - inline constexpr int32_t underline_padding = 2; + inline constexpr int32_t underline_padding = 4; } // namespace inputLinesWithLabelWidget namespace outputLinesTextWithLabelWidget diff --git a/module-apps/application-phonebook/models/NewContactModel.cpp b/module-apps/application-phonebook/models/NewContactModel.cpp index 7e8412b208c754a675183c218a9aad6d6385e80d..f43de02596d3bfef49bfaafcba1f83340734b05d 100644 --- a/module-apps/application-phonebook/models/NewContactModel.cpp +++ b/module-apps/application-phonebook/models/NewContactModel.cpp @@ -75,13 +75,13 @@ void NewContactModel::createData() [app]() { app->getCurrentWindow()->selectSpecialCharacter(); }, [this]() { this->ContactDataChanged(); })); - internalData.back()->setMargins(gui::Margins(style::widgets::leftMargin, style::margins::very_big, 0, 0)); - internalData.push_back(new gui::InputBoxWithLabelAndIconWidget( phonebookInternals::ListItemName::AddToFavourites, [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); })); + internalData.back()->setMargins(gui::Margins(style::widgets::leftMargin, style::margins::very_big, 0, 0)); + internalData.push_back(new gui::InputBoxWithLabelAndIconWidget( phonebookInternals::ListItemName::AddToICE, [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, diff --git a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp index 4bf864347d56185f53c629de6ff5779a3bd2bed5..8842fd3758c81e1f9adb482f5aeeda7c2c378002 100644 --- a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp +++ b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp @@ -25,7 +25,7 @@ namespace gui phonebookStyle::inputLinesWithLabelWidget::span_size + phonebookStyle::inputLinesWithLabelWidget::input_text_h * lines + (phonebookStyle::inputLinesWithLabelWidget::line_spacing * (lines - 1))); - setMargins(gui::Margins(style::widgets::leftMargin, style::margins::huge, 0, 0)); + setMargins(gui::Margins(style::widgets::leftMargin, style::margins::large, 0, 0)); vBox = new VBox(this, 0, 0, 0, 0); vBox->setEdges(RectangleEdge::None); @@ -140,7 +140,7 @@ namespace gui } void InputLinesWithLabelIWidget::secondNameHandler() { - titleLabel->setText(utils::translate("app_phonebook_new_contact_second_name")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_last_name")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { diff --git a/module-gui/gui/widgets/Style.hpp b/module-gui/gui/widgets/Style.hpp index b4bfced40628943060c3668374733361aae98962..af10ad6ec13c5844e40f63f6cc861c3878f32c01 100644 --- a/module-gui/gui/widgets/Style.hpp +++ b/module-gui/gui/widgets/Style.hpp @@ -284,6 +284,7 @@ namespace style inline constexpr auto small = 6U; inline constexpr auto big = 8U; inline constexpr auto very_big = 12U; + inline constexpr auto large = 20U; inline constexpr auto huge = 24U; } // namespace margins