From b1349b029e52663dd193d9dca8b2b3c5a1385231 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 19 Sep 2016 11:52:50 +0200
Subject: [PATCH] fix(mainWindow/home): better code

---
 tests/resources.qrc                       |  1 +
 tests/ui/components/form/CheckBoxText.qml |  1 -
 tests/ui/views/mainWindow/home.qml        | 80 ++++++++++-------------
 tests/ui/views/mainWindow/mainWindow.qml  |  2 +-
 4 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/tests/resources.qrc b/tests/resources.qrc
index 941fd287a..1e9677ab3 100644
--- a/tests/resources.qrc
+++ b/tests/resources.qrc
@@ -34,6 +34,7 @@
     <file>ui/views/mainWindow/mainWindow.qml</file>
     <file>ui/views/mainWindow/contacts.qml</file>
     <file>ui/views/mainWindow/home.qml</file>
+    <file>ui/views/mainWindow/contact.qml</file>
     <file>ui/views/mainWindow/conversation.qml</file>
     <file>imgs/lost_outgoing_call.svg</file>
     <file>imgs/led_disconnected.svg</file>
diff --git a/tests/ui/components/form/CheckBoxText.qml b/tests/ui/components/form/CheckBoxText.qml
index 11e574dac..b741acc05 100644
--- a/tests/ui/components/form/CheckBoxText.qml
+++ b/tests/ui/components/form/CheckBoxText.qml
@@ -9,7 +9,6 @@ CheckBox {
     contentItem: Text {
         color: checkBox.down ? '#FE5E00' : '#8E8E8E'
         font: checkBox.font
-        horizontalAlignment: Text.AlignHCenter
         leftPadding: checkBox.indicator.width + checkBox.spacing
         text: checkBox.text
         verticalAlignment: Text.AlignVCenter
diff --git a/tests/ui/views/mainWindow/home.qml b/tests/ui/views/mainWindow/home.qml
index 904fae5d3..c9b3fa116 100644
--- a/tests/ui/views/mainWindow/home.qml
+++ b/tests/ui/views/mainWindow/home.qml
@@ -1,69 +1,61 @@
 import QtQuick 2.7
-import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 
 import 'qrc:/ui/components/form'
 
+// ===================================================================
+
 ColumnLayout {
     spacing: 0
 
-    Item {
-        Layout.fillWidth: true
+    ColumnLayout {
+        Layout.alignment: Qt.AlignTop
         Layout.fillHeight: true
+        Layout.fillWidth: true
+        Layout.leftMargin: 50
+        Layout.topMargin: 50
+        spacing: 30
 
-        Item {
-            anchors.fill: parent
-            anchors.leftMargin: 50
-            anchors.topMargin: 50
+        // Invit friends.
+        Column {
+            spacing: 8
 
-            Column {
-                spacing: 30
+            Text {
+                color: '#5A585B'
+                font.bold: true
+                font.pointSize: 11
+                text: qsTr('invitContactQuestion')
+            }
 
-                // Invit friends.
-                Column {
-                    spacing: 8
+            LightButton {
+                text: qsTr('invitContact')
+            }
+        }
 
-                    Text {
-                        text: qsTr('invitContactQuestion')
-                        font.weight: Font.DemiBold
-                        color: '#5A585B'
-                        font.pointSize: 11
-                    }
+        // Add contacts.
+        Column {
+            spacing: 8
 
-                    LightButton {
-                        text: qsTr('invitContact')
-                    }
-                }
+            Text {
+                color: '#5A585B'
+                font.bold: true
+                font.pointSize: 11
+                text: qsTr('addContactQuestion')
+            }
 
-                // Add contacts.
-                Column {
-                    spacing: 8
-
-                    Text {
-                        text: qsTr('addContactQuestion')
-                        font.weight: Font.DemiBold
-                        color: '#5A585B'
-                        font.pointSize: 11
-                    }
-
-                    LightButton {
-                        text: qsTr('addContact')
-                    }
-                }
+            LightButton {
+                text: qsTr('addContact')
             }
         }
     }
 
     // Tooltip checkbox area.
-    Item {
+    CheckBoxText {
+        Layout.alignment: Qt.AlignBottom
         Layout.fillWidth: true
+        Layout.leftMargin: 50
         Layout.preferredHeight: 70
 
-        CheckBoxText {
-            anchors.left: parent.left
-            anchors.leftMargin: 50
-            anchors.verticalCenter: parent.verticalCenter
-            text: qsTr('displayTooltip')
-        }
+        text: qsTr('displayTooltip')
     }
 }
diff --git a/tests/ui/views/mainWindow/mainWindow.qml b/tests/ui/views/mainWindow/mainWindow.qml
index 24f05f30b..272cca599 100644
--- a/tests/ui/views/mainWindow/mainWindow.qml
+++ b/tests/ui/views/mainWindow/mainWindow.qml
@@ -121,7 +121,7 @@ ApplicationWindow {
         Loader {
             Layout.fillHeight: true
             Layout.fillWidth: true
-            source: 'qrc:/ui/views/mainWindow/conversation.qml'
+            source: 'qrc:/ui/views/mainWindow/home.qml'
         }
     }
 }