12 files changed, 23 insertions(+), 15 deletions(-)

M image/assets/lang/Deutsch.json
M image/assets/lang/English.json
M image/assets/lang/Espanol.json
M image/assets/lang/Francais.json
M image/assets/lang/Polski.json
M image/assets/lang/Svenska.json
M module-apps/application-messages/windows/NewMessage.cpp
M module-apps/application-phonebook/data/PhonebookStyle.hpp
M module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp
M module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
M module-apps/application-settings/windows/network/SimContactsImportWindow.cpp
M module-gui/gui/widgets/Style.hpp

@@ 12,6 12,7 @@
   "common_ok": "BESTÄTIGEN",
   "common_back": "ZURÜCK",
   "common_skip": "ÜBERSPRINGEN",
+  "common_contacts": "KONTAKTE",
   "common_set": "EINSTELLEN",
   "common_yes": "Ja",
   "common_no": "Nein",

@@ 13,6 13,7 @@
   "common_ok": "OK",
   "common_back": "BACK",
   "common_skip": "SKIP",
+  "common_contacts": "CONTACTS",
   "common_set": "SET",
   "common_show": "SHOW",
   "common_yes": "Yes",


@@ 287,7 288,7 @@
   "app_messages_title_main": "Messages",
   "app_messages_no_messages": "<text align='center' color='9'>No messages yet.<p>Press <b>left arrow</b> to add new.</p></text>",
   "app_messages_thread_delete_confirmation": "Delete this conversation?",
-  "app_messages_message_delete_confirmation": "<text align='center'><p>Do you really want to <text weight='bold'>delete</text></p>this message?</text>",
+  "app_messages_message_delete_confirmation": "Delete this message?",
   "app_messages_thread_no_result": "There are no results",
   "app_messages_message": "Message",
   "app_messages_templates": "Templates",


@@ 543,7 544,7 @@
   "app_music_player_music_empty_window_notification": "<text color='5'>No songs yet</text>",
   "app_special_input_window": "Special characters",
   "app_emoji_input_window": "Emoji",
-  "sms_add_rec_num": "Add recipient or type a number",
+  "sms_add_rec_num": "Add contact or type a number",
   "sms_title_message": "New message",
   "sms_call_text": "Call ",
   "sms_resend_failed": "Send again",

@@ 12,6 12,7 @@
   "common_ok": "OK",
   "common_back": "ATRÁS",
   "common_skip": "OMITIR",
+  "common_contacts": "CONTACTOS",
   "common_set": "ESTABLECER",
   "common_yes": "Sí",
   "common_no": "No",

@@ 12,6 12,7 @@
   "common_ok": "OK",
   "common_back": "RETOUR",
   "common_skip": "SAUTER",
+  "common_contacts": "CONTACTS",
   "common_set": "DÉFINIR",
   "common_yes": "Oui",
   "common_no": "Non",

@@ 12,6 12,7 @@
   "common_ok": "OK",
   "common_back": "WRÓĆ",
   "common_skip": "POMIŃ",
+  "common_contacts": "KONTAKTY",
   "common_set": "USTAW",
   "common_yes": "Tak",
   "common_no": "Nie",

@@ 11,6 11,7 @@
   "common_use": "ANVÄND",
   "common_ok": "OK",
   "common_back": "TILLBAKA",
+  "common_contacts": "KONTAKTER",
   "common_set": "VÄLJ",
   "common_yes": "Ja",
   "common_no": "Nej",

@@ 170,7 170,7 @@ namespace gui
         if (getFocusItem() == recipient) {
             bottomBar->setActive(BottomBar::Side::LEFT, false);
             if (recipient->getText().empty()) {
-                bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select));
+                bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::contacts));
                 return;
             }
             bottomBar->setActive(BottomBar::Side::CENTER, false);

@@ 98,10 98,6 @@ namespace phonebookStyle
         inline constexpr uint32_t input_box_h           = h;
         inline constexpr int32_t input_box_right_margin = 20;
 
-        inline constexpr uint32_t description_label_w           = 280;
-        inline constexpr uint32_t description_label_h           = 33;
-        inline constexpr int32_t description_label_right_margin = 40;
-
         inline constexpr int32_t tick_image_left_margin  = -64;
         inline constexpr int32_t tick_image_right_margin = 32;
 

@@ 50,10 50,8 @@ namespace gui
         tickImage->activeItem = false;
 
         descriptionLabel = new gui::Label(hBox, 0, 0, 0, 0);
-        descriptionLabel->setMaximumSize(phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_w,
-                                         phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_h);
-        descriptionLabel->setMargins(
-            gui::Margins(0, 0, phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_right_margin, 0));
+        descriptionLabel->setMaximumSize(phonebookStyle::inputBoxWithLabelAndIconIWidget::w,
+                                         phonebookStyle::inputBoxWithLabelAndIconIWidget::h);
         descriptionLabel->setEdges(gui::RectangleEdge::None);
         descriptionLabel->setAlignment(Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
         descriptionLabel->setFont(style::window::font::medium);

@@ 99,6 99,10 @@ namespace gui
                     std::make_unique<app::manager::SwitchBackRequest>(application->GetName(), std::move(data)));
             };
 
+            bottomBar->setActive(BottomBar::Side::LEFT, false);
+            bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::add));
+            bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back));
+
             header->navigationIndicatorRemove(gui::header::BoxSelection::Left);
             header->navigationIndicatorRemove(gui::header::BoxSelection::Right);
         }


@@ 181,10 185,13 @@ namespace gui
 
     void PhonebookMainWindow::onListFilled()
     {
-        bottomBar->setActive(gui::BottomBar::Side::LEFT, true);
-        bottomBar->setActive(gui::BottomBar::Side::CENTER, true);
+        if (!isSearchRequested()) {
+            bottomBar->setActive(gui::BottomBar::Side::LEFT, true);
+            bottomBar->setActive(gui::BottomBar::Side::CENTER, true);
+            header->navigationIndicatorAdd(new gui::header::SearchAction(), gui::header::BoxSelection::Right);
+        }
+
         emptyListIcon->setVisible(false);
-        header->navigationIndicatorAdd(new gui::header::SearchAction(), gui::header::BoxSelection::Right);
         application->refreshWindow(RefreshModes::GUI_REFRESH_DEEP);
     }
 } /* namespace gui */

@@ 163,7 163,7 @@ namespace gui
         emptyListIcon->image->set("success_icon_W_G");
         bottomBar->setActive(BottomBar::Side::RIGHT, false);
         bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::ok));
-        bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate("app_desktop_menu_contacts"));
+        bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::contacts));
 
         onLFInputCallback = [&]() {
             app::manager::Controller::sendAction(application, app::manager::actions::ShowContacts);

@@ 176,6 176,7 @@ namespace style
             inline constexpr auto ok             = "common_ok";
             inline constexpr auto back           = "common_back";
             inline constexpr auto skip           = "common_skip";
+            inline constexpr auto contacts       = "common_contacts";
             inline constexpr auto set            = "common_set";
             inline constexpr auto show           = "common_show";
             inline constexpr auto yes            = "common_yes";