iot-sensortag: Fix UI based on findings on Android device

Minor changes done to UI based on findings on Nexus 7.

Change-Id: I3e7496578a03ab059e0ba0b99f7f97ac2c91a8e5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>

4 files changed, 15 insertions, 19 deletions

diff --git a/tradeshow/iot-sensortag/resources/base/AccelChart.qml b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
index 9beca22..92f8b50 100644
--- a/tradeshow/iot-sensortag/resources/base/AccelChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
@@ -97,9 +97,7 @@ BaseChart {
 
                         Text {
                             id: accelMainText
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            anchors.bottom: parent.verticalCenter
-                            anchors.bottomMargin: -12
+                            anchors.centerIn: parent
                             text: (index == 0) ? acceXValue : ((index == 1) ? acceYValue : acceZValue)
                             color: "white"
                         }
diff --git a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
index 2b0d4de..f144a8f 100644
--- a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
@@ -92,7 +92,7 @@ BaseChart {
 
             source: pathPrefix + "Humidity/Hum_combined_all.png"
             anchors.left: parent.left
-            anchors.leftMargin: 16
+            anchors.leftMargin: 12
             anchors.top: parent.top
             anchors.topMargin: -8
 
@@ -111,20 +111,18 @@ BaseChart {
         Text {
             anchors.left: humidityMainImg.right
             anchors.top: humidityMainImg.top
-            anchors.topMargin: 47
+            anchors.topMargin: 27
             text: "Max\n" + maxHumi.toFixed(0) + " %"
             lineHeight: 0.8
-            font.pixelSize: 16
             color: "white"
         }
 
         Text {
             anchors.left: humidityMainImg.right
             anchors.bottom: humidityMainImg.bottom
-            anchors.bottomMargin: 53
+            anchors.bottomMargin: 33
             text: "Min\n" + minHumi.toFixed(0) + " %"
             lineHeight: 0.8
-            font.pixelSize: 16
             color: "white"
         }
     }
diff --git a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
index 5c1cfc7..f06f165 100644
--- a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
@@ -86,7 +86,7 @@ BaseChart {
         }
 
         Text {
-            text: (minValue !== Number.MAX_VALUE ? minValue : "--") + "\nLowest"
+            text: (minValue !== Number.MAX_VALUE ? minValue : "--") + "\nLo"
             lineHeight: 0.7
             width: 60
             horizontalAlignment: Text.Center
@@ -104,7 +104,7 @@ BaseChart {
         }
 
         Text {
-            text: "Highest\n" + (maxValue !== Number.MIN_VALUE ? maxValue : "--")
+            text: "Hi\n" + (maxValue !== Number.MIN_VALUE ? maxValue : "--")
             lineHeight: 0.8
             width: 60
             horizontalAlignment: Text.Center
diff --git a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
index a7c3ab6..dab2479 100644
--- a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
@@ -113,16 +113,17 @@ BaseChart {
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             height: parent.height - 32
+            width: reading.width + avgText.width
 
             Text {
                 id: highValue
 
-                text: "Highest\n" + (maxValue !== Number.MIN_VALUE ? maxValue.toFixed(1) : "--")
+                text: "Hi " + (maxValue !== Number.MIN_VALUE ? maxValue.toFixed(1) : "--")
                 lineHeight: 0.7
                 width: contentWidth
                 height: contentHeight
                 horizontalAlignment: Text.Center
-                anchors.right: reading.left
+                anchors.horizontalCenter: reading.horizontalCenter
                 anchors.top: parent.top
                 color: "white"
             }
@@ -144,13 +145,13 @@ BaseChart {
             Text {
                 id: lowValue
 
-                text: (minValue !== Number.MAX_VALUE ? minValue.toFixed(1) : "--") + "\nLowest"
+                text: "Lo " + (minValue !== Number.MAX_VALUE ? minValue.toFixed(1) : "--")
                 lineHeight: 0.8
                 width: contentWidth
                 horizontalAlignment: Text.Center
                 color: "white"
                 anchors.bottom: parent.bottom
-                anchors.right: reading.left
+                anchors.horizontalCenter: reading.horizontalCenter
             }
 
             Text {
@@ -183,27 +184,26 @@ BaseChart {
             id: chartView
 
             anchors.top: valueReading.top
-            anchors.topMargin: 34
+            anchors.topMargin: 25
             height: reading.height
-            anchors.bottom: valueReading.bottom
-            anchors.bottomMargin: 34
             anchors.left: parent.left
             anchors.leftMargin: 15
             anchors.right: valueReading.left
-            anchors.rightMargin: 112
+            anchors.rightMargin: -27
             antialiasing: true
             backgroundColor: "transparent"
             legend.visible: false
             margins.top: 0
             margins.bottom: 0
             margins.left: 0
+            margins.right: 0
 
             // Hide the value axis labels; labels are drawn separately.
             ValueAxis {
                 id: valueAxisX
 
                 min: 0
-                max: maxNumOfTempReadings + 1
+                max: maxNumOfTempReadings - 1
                 visible: false
             }