From 03d0b5d9db6098a858aa27759971214bfcfa1f5c Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 20 Sep 2016 15:01:10 +0200
Subject: [PATCH] chore(app): rename `ShortContactDescription` in
 `ContactDescription`

---
 tests/languages/en.ts                                    | 7 +++++++
 tests/languages/fr.ts                                    | 7 +++++++
 tests/resources.qrc                                      | 2 +-
 tests/ui/components/chat/OutgoingMessage.qml             | 1 -
 tests/ui/components/contact/Contact.qml                  | 2 +-
 ...hortContactDescription.qml => ContactDescription.qml} | 0
 tests/ui/components/timeline/Timeline.qml                | 9 ++++-----
 tests/ui/views/mainWindow/contact.qml                    | 4 ++--
 tests/ui/views/mainWindow/conversation.qml               | 2 +-
 tests/ui/views/mainWindow/mainWindow.qml                 | 4 ++--
 10 files changed, 25 insertions(+), 13 deletions(-)
 rename tests/ui/components/contact/{ShortContactDescription.qml => ContactDescription.qml} (100%)

diff --git a/tests/languages/en.ts b/tests/languages/en.ts
index dca2d144d..53e28870f 100644
--- a/tests/languages/en.ts
+++ b/tests/languages/en.ts
@@ -38,6 +38,13 @@
         <translation>Lost outgoing call</translation>
     </message>
 </context>
+<context>
+    <name>ListForm</name>
+    <message>
+        <source>fillPlaceholder</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SelectContact</name>
     <message>
diff --git a/tests/languages/fr.ts b/tests/languages/fr.ts
index 08863c7cc..a8cdb8c3c 100644
--- a/tests/languages/fr.ts
+++ b/tests/languages/fr.ts
@@ -38,6 +38,13 @@
         <translation>Appel sortant manqué</translation>
     </message>
 </context>
+<context>
+    <name>ListForm</name>
+    <message>
+        <source>fillPlaceholder</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SelectContact</name>
     <message>
diff --git a/tests/resources.qrc b/tests/resources.qrc
index 8361da54d..c2c5401e4 100644
--- a/tests/resources.qrc
+++ b/tests/resources.qrc
@@ -14,7 +14,7 @@
     <file>ui/components/chat/Event.qml</file>
     <file>ui/components/chat/Message.qml</file>
     <file>ui/components/contact/Contact.qml</file>
-    <file>ui/components/contact/ShortContactDescription.qml</file>
+    <file>ui/components/contact/ContactDescription.qml</file>
     <file>ui/components/contact/Avatar.qml</file>
     <file>ui/components/dialog/ConfirmDialog.qml</file>
     <file>ui/components/dialog/DialogDescription.qml</file>
diff --git a/tests/ui/components/chat/OutgoingMessage.qml b/tests/ui/components/chat/OutgoingMessage.qml
index 5972ea8ed..8065af77e 100644
--- a/tests/ui/components/chat/OutgoingMessage.qml
+++ b/tests/ui/components/chat/OutgoingMessage.qml
@@ -5,7 +5,6 @@ import 'qrc:/ui/components/image'
 
 Message {
     backgroundColor: '#E4E4E4'
-    id: message
 
     Item {
         height: 30
diff --git a/tests/ui/components/contact/Contact.qml b/tests/ui/components/contact/Contact.qml
index 6ea1e0c82..6806d2402 100644
--- a/tests/ui/components/contact/Contact.qml
+++ b/tests/ui/components/contact/Contact.qml
@@ -28,7 +28,7 @@ Item {
             username: contact.username
         }
 
-        ShortContactDescription {
+        ContactDescription {
             Layout.fillHeight: true
             Layout.fillWidth: true
             id: contactDescription
diff --git a/tests/ui/components/contact/ShortContactDescription.qml b/tests/ui/components/contact/ContactDescription.qml
similarity index 100%
rename from tests/ui/components/contact/ShortContactDescription.qml
rename to tests/ui/components/contact/ContactDescription.qml
diff --git a/tests/ui/components/timeline/Timeline.qml b/tests/ui/components/timeline/Timeline.qml
index c340cb5b5..c5b7f84ca 100644
--- a/tests/ui/components/timeline/Timeline.qml
+++ b/tests/ui/components/timeline/Timeline.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 
 import 'qrc:/ui/components/contact'
+import 'qrc:/ui/components/image'
 import 'qrc:/ui/components/scrollBar'
 
 ColumnLayout {
@@ -10,10 +11,8 @@ ColumnLayout {
         Layout.preferredHeight: 35
         spacing: 30
 
-        Image {
-            fillMode: Image.PreserveAspectFit
-            height: parent.height
-            width: 20
+        Icon {
+            iconSize: 20
         }
 
         Text {
@@ -26,9 +25,9 @@ ColumnLayout {
     }
 
     Rectangle {
-        color: '#DEDEDE'
         Layout.fillWidth: true
         Layout.preferredHeight: 1
+        color: '#DEDEDE'
     }
 
     ListView {
diff --git a/tests/ui/views/mainWindow/contact.qml b/tests/ui/views/mainWindow/contact.qml
index c0dc0b904..4cd194e84 100644
--- a/tests/ui/views/mainWindow/contact.qml
+++ b/tests/ui/views/mainWindow/contact.qml
@@ -33,8 +33,8 @@ ColumnLayout  {
             }
 
             // TODO: Replace by text edit.
-            // Component: EditableShortContactDescription.
-            ShortContactDescription {
+            // Component: EditableContactDescription.
+            ContactDescription {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 username: 'Cameron Andrews' // TODO: Use C++.
diff --git a/tests/ui/views/mainWindow/conversation.qml b/tests/ui/views/mainWindow/conversation.qml
index d29910db9..68209dc4f 100644
--- a/tests/ui/views/mainWindow/conversation.qml
+++ b/tests/ui/views/mainWindow/conversation.qml
@@ -38,7 +38,7 @@ ColumnLayout  {
                 Layout.fillWidth: true
 
                 // Contact description.
-                ShortContactDescription {
+                ContactDescription {
                     height: parent.height * 0.60
                     sipAddress: 'cam.andrews@sip.linphone.org' // TODO: Use C++.
                     username: 'Cameron Andrews' // TODO: Use C++.
diff --git a/tests/ui/views/mainWindow/mainWindow.qml b/tests/ui/views/mainWindow/mainWindow.qml
index 419bbee74..5737ccb94 100644
--- a/tests/ui/views/mainWindow/mainWindow.qml
+++ b/tests/ui/views/mainWindow/mainWindow.qml
@@ -42,7 +42,7 @@ ApplicationWindow {
             }
 
             // User info.
-            ShortContactDescription {
+            ContactDescription {
                 Layout.fillHeight: parent.height
                 Layout.preferredWidth: 200
                 sipAddress: 'e.miller@sip-linphone.org'
@@ -124,7 +124,7 @@ ApplicationWindow {
         Loader {
             Layout.fillHeight: true
             Layout.fillWidth: true
-            source: 'qrc:/ui/views/mainWindow/contact.qml'
+            source: 'qrc:/ui/views/mainWindow/conversation.qml'
         }
     }