From 70c265656aeb4ed03dd8d136abbd607b1892d54f Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 19 Apr 2017 11:55:33 +0200
Subject: [PATCH] fix(ui/modules/Linphone/Calls/CallStatistics): better style
 and reworking

---
 .../modules/Linphone/Calls/CallStatistics.qml | 21 +++++++++++++------
 .../Styles/Calls/CallStatisticsStyle.qml      | 14 +++++++------
 .../ui/views/App/Calls/Incall.qml             |  4 +---
 .../ui/views/App/Styles/Calls/CallStyle.qml   |  4 ++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml b/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
index a1ac03b24..755e5dfaf 100644
--- a/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
+++ b/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
@@ -15,7 +15,7 @@ AbstractDropDownMenu {
   // ---------------------------------------------------------------------------
 
   function _computeHeight () {
-    return callStatistics.height
+    return CallStatisticsStyle.height
   }
 
   // ---------------------------------------------------------------------------
@@ -25,14 +25,16 @@ AbstractDropDownMenu {
 
     RowLayout {
       spacing: CallStatisticsStyle.spacing
+      width: parent.width
 
-      // ---------------------------------------------------------------------------
+      // -----------------------------------------------------------------------
 
       Text {
         Layout.preferredWidth: CallStatisticsStyle.key.width
 
         color: CallStatisticsStyle.key.color
         elide: Text.ElideRight
+
         font {
           pointSize: CallStatisticsStyle.key.fontSize
           bold: true
@@ -44,10 +46,11 @@ AbstractDropDownMenu {
         text: modelData.key
       }
 
-      // ---------------------------------------------------------------------------
+      // -----------------------------------------------------------------------
 
       Text {
         Layout.fillWidth: true
+
         color: CallStatisticsStyle.value.color
         elide: Text.ElideRight
         font.pointSize: CallStatisticsStyle.value.fontSize
@@ -63,17 +66,20 @@ AbstractDropDownMenu {
     id: media
 
     Column {
-      width: parent.width
-
       Text {
-        width: parent.width
         color: CallStatisticsStyle.title.color
+
         font {
           bold: true
           pointSize: CallStatisticsStyle.title.fontSize
         }
+
+        elide: Text.ElideRight
         horizontalAlignment: Text.AlignHCenter
         text: $label
+
+        height: contentHeight + CallStatisticsStyle.title.bottomMargin
+        width: parent.width
       }
 
       Repeater {
@@ -92,6 +98,7 @@ AbstractDropDownMenu {
     Row {
       anchors {
         fill: parent
+        topMargin: CallStatisticsStyle.topMargin
         leftMargin: CallStatisticsStyle.leftMargin
         rightMargin: CallStatisticsStyle.rightMargin
       }
@@ -99,6 +106,7 @@ AbstractDropDownMenu {
       Loader {
         property string $label: qsTr("audioStatsLabel")
         property var $data: callStatistics.call.audioStats
+
         sourceComponent: media
         width: parent.width / 2
       }
@@ -106,6 +114,7 @@ AbstractDropDownMenu {
       Loader {
         property string $label: qsTr("videoStatsLabel")
         property var $data: callStatistics.call.videoStats
+
         sourceComponent: media
         width: parent.width / 2
       }
diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
index 32fe29b01..b1ca3a69c 100644
--- a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
+++ b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
@@ -7,24 +7,26 @@ import Common 1.0
 
 QtObject {
   property color color: Colors.e
-  property int height: 60
+  property int height: 250
   property int leftMargin: 12
   property int rightMargin: 12
-  property int width: 240
+  property int spacing: 8
+  property int topMargin: 10
 
   property QtObject title: QtObject {
-    property color color: Colors.l
+    property color color: Colors.d
+    property int bottomMargin: 20
     property int fontSize: 16
   }
 
   property QtObject key: QtObject {
-    property int width: 200
-    property color color: Colors.l
+    property color color: Colors.d
     property int fontSize: 10
+    property int width: 200
   }
 
   property QtObject value: QtObject {
-    property color color: Colors.l
+    property color color: Colors.d
     property int fontSize: 10
   }
 }
diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml
index 45317eb9d..3128c0522 100644
--- a/linphone-desktop/ui/views/App/Calls/Incall.qml
+++ b/linphone-desktop/ui/views/App/Calls/Incall.qml
@@ -87,14 +87,12 @@ Rectangle {
           id: callStatistics
 
           call: incall.call
-
-          height: container.height
           width: container.width
 
           launcher: callQuality
 
           relativeTo: callQuality
-          relativeY: info.height + elapsedTime.height * 2
+          relativeY: CallStyle.header.stats.relativeY
         }
       }
 
diff --git a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
index 0136d92b2..2c2d797df 100644
--- a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
+++ b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
@@ -66,5 +66,9 @@ QtObject {
       property int fontSize: 10
       property int fullscreenFontSize: 12
     }
+
+    property QtObject stats: QtObject {
+      property int relativeY: 90
+    }
   }
 }