From 508d6b8e965c390dae5748b5a9010f96204420fc Mon Sep 17 00:00:00 2001
From: Pawel Olejniczak <pawel.olejniczak@mudita.com>
Date: Wed, 11 May 2022 19:21:13 +0200
Subject: [PATCH] [MOS-417] Change empty contact selection window in messages

Adding a contact from the contact selection window in the messages app
is not allowed. This commit deletes misleading information
about the possibility to add a new contact from this window.
---
 image/assets/lang/Deutsch.json                              | 3 ++-
 image/assets/lang/English.json                              | 1 +
 image/assets/lang/Espanol.json                              | 3 ++-
 image/assets/lang/Francais.json                             | 3 ++-
 image/assets/lang/Polski.json                               | 1 +
 image/assets/lang/Svenska.json                              | 3 ++-
 .../application-phonebook/windows/PhonebookMainWindow.cpp   | 6 +++++-
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json
index 093832a0274e3d8af37dbe8f42a9890959e6edba..4fc7c9052e0b0aed43752db091f39179c22c13ac 100644
--- a/image/assets/lang/Deutsch.json
+++ b/image/assets/lang/Deutsch.json
@@ -187,7 +187,8 @@
   "app_calllog_options_delete_call": "Anruf löschen",
   "app_calllog_delete_call_confirmation": "Diesen Anruf aus der Liste löschen?",
   "app_calllog_no_calls": "Noch keine Anrufe.",
-  "app_phonebook_no_contacts": "Noch keine Kontakte.<p>Drücken Sie <b>Pfeil nach links</b>, um neue hinzuzufügen.</p>",
+  "app_phonebook_no_contacts": "<text align='center' color='4'>Noch keine Kontakte.<p>Drücken Sie <b>Pfeil nach links</b>, um neue hinzuzufügen.</p></text>",
+  "app_phonebook_no_contacts_yet": "<text align='center' color='4'>Noch keine Kontakte.</text>",
   "app_music_player_artists": "<text color='9'>Künstler</text>",
   "app_music_player_albums": "<text color='9'>Alben</text>",
   "app_music_player_playlists": "<text color='9'>Wiedergabelisten</text>",
diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index f9aa14b34a4afafe2afed8733b05e53f69291188..0d9af25277c98b724031696c0a6546b7a3bd83c6 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -499,6 +499,7 @@
   "common_search_results": "Search results",
   "app_phonebook_search_no_results": "No contacts found.",
   "app_phonebook_no_contacts": "<text align='center' color='4'>No contacts yet.<p>Press <b>left arrow</b> to add new.</p></text>",
+  "app_phonebook_no_contacts_yet": "<text align='center' color='4'>No contacts yet.</text>",
   "app_phonebook_contact_title": "Add contact",
   "app_phonebook_contact_no_name": "no name",
   "app_phonebook_contact_information": "Information",
diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json
index c7666aeca3ffa4d8bd444e5b74aba48416157372..e9658e27e2642f22df4bde8817d6616348f04740 100644
--- a/image/assets/lang/Espanol.json
+++ b/image/assets/lang/Espanol.json
@@ -187,7 +187,8 @@
   "app_calllog_options_delete_call": "Eliminar llamada",
   "app_calllog_delete_call_confirmation": "¿Eliminar esta llamada de la lista?",
   "app_calllog_no_calls": "Aún no hay llamadas.",
-  "app_phonebook_no_contacts": "Aún no hay contactos. <p> Presiona la <b> flecha izquierda </b> para agregar nuevos. </p>",
+  "app_phonebook_no_contacts": "<text align='center' color='4'>Aún no hay contactos. <p> Presiona la <b> flecha izquierda </b> para agregar nuevos. </p></text>",
+  "app_phonebook_no_contacts_yet": "<text align='center' color='4'>Aún no hay contactos.</text>",
   "app_music_player_artists": "<text color = '9'> Artistas </text>",
   "app_music_player_albums": "<text color = '9'> Álbumes </text>",
   "app_music_player_playlists": "<text color = '9'> Listas de reproducción </text>",
diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json
index 05d2d866060d4f6df2881de94fb42e2e94d65ecc..58795558e51ce9d0d69d3dd5df9712134c634013 100644
--- a/image/assets/lang/Francais.json
+++ b/image/assets/lang/Francais.json
@@ -156,7 +156,8 @@
   "app_calllog_options_delete_call": "Supprimer l'appel",
   "app_calllog_delete_call_confirmation": "Supprimer cet appel de la liste?",
   "app_calllog_no_calls": "Pas encore d'appels.",
-  "app_phonebook_no_contacts": "Aucun contact pour le moment.<p>Appuyez sur la <b>flèche gauche</b> pour en ajouter un nouveau.</p>",
+  "app_phonebook_no_contacts": "<text align='center' color='4'>Aucun contact pour le moment.<p>Appuyez sur la <b>flèche gauche</b> pour en ajouter un nouveau.</p></text>",
+  "app_phonebook_no_contacts": "<text align='center' color='4'>Aucun contact pour le moment.</text>",
   "app_music_player_artists": "<text color='9'>Artistes</text>",
   "app_music_player_albums": "<text color='9'>Albums</text>",
   "app_music_player_playlists": "<text color='9'>Listes de lecture</text>",
diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json
index 21fa00c0ae85d61ebd5dfadf61dfc96f44749230..4cc733be42f7e6d1a81a23e2f207919572e11211 100644
--- a/image/assets/lang/Polski.json
+++ b/image/assets/lang/Polski.json
@@ -543,6 +543,7 @@
   "common_search_results": "Wyniki wyszukiwania",
   "app_phonebook_search_no_results": "Nie znaleziono kontaktów",
   "app_phonebook_no_contacts": "<text align='center' color='4'>Brak kontaktów.<p>Naciśnij <b>'w lewo'</b> by dodać kontakt.</p></text>",
+  "app_phonebook_no_contacts_yet": "<text align='center' color='4'>Brak kontaktów.</text>",
   "app_phonebook_contact_title": "Dodaj kontakt",
   "app_phonebook_contact_no_name": "brak nazwy",
   "app_phonebook_contact_information": "Informacje",
diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json
index 0b7a104227b9765dc03117349cb52c0afca4e091..3ab78926ed5c9237dfc04150d755f6ca53131cc2 100644
--- a/image/assets/lang/Svenska.json
+++ b/image/assets/lang/Svenska.json
@@ -140,7 +140,8 @@
   "app_calllog_options_delete_call": "Radera samtal",
   "app_calllog_delete_call_confirmation": "Ta bort det här samtalet från listan?",
   "app_calllog_no_calls": "Inga samtal ännu.",
-  "app_phonebook_no_contacts": "Inga kontakter ännu.<p>Tryck på <b>vänsterpil</b> för att lägga till nya.</p>",
+  "app_phonebook_no_contacts": "<text align='center' color='4'>Inga kontakter ännu.<p>Tryck på <b>vänsterpil</b> för att lägga till nya.</p></text>",
+  "app_phonebook_no_contacts_yet": "<text align='center' color='4'>Inga kontakter ännu.</text>",
   "app_music_player_artists": "<text color='9'>Artister</text>",
   "app_music_player_albums": "<text color='9'>Album</text>",
   "app_music_player_playlists": "<text color='9'>Spellistor</text>",
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
index e648c426b290d9fc315ab9d4588f6ac7ad5d3007..a14ff1e5106b342e18a54e915b95c76c6465c141 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
@@ -90,7 +90,7 @@ namespace gui
         auto contactRequest = dynamic_cast<PhonebookSearchRequest *>(data);
         model->setRequested(contactRequest != nullptr);
         if (model->requestedSearch()) {
-            enableNewContact                       = false;
+            enableNewContact = false;
             phonebookModel->activateContactSelectCallback();
 
             navBar->setActive(nav_bar::Side::Left, false);
@@ -166,6 +166,10 @@ namespace gui
     {
         navBar->setActive(gui::nav_bar::Side::Left, false);
         navBar->setActive(gui::nav_bar::Side::Center, false);
+        if (model->requestedSearch()) {
+            emptyListIcon->text->setRichText(utils::translate("app_phonebook_no_contacts_yet"));
+            emptyListIcon->image->setVisible(false);
+        }
         emptyListIcon->setVisible(true);
         header->navigationIndicatorRemove(gui::header::BoxSelection::Right);
         application->refreshWindow(RefreshModes::GUI_REFRESH_DEEP);